Skip to content

Don't save deleted records into data_store if mvcc is not enabled on RangePartition #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lzxddz merged 1 commit into from
Oct 11, 2025
Merged

Don't save deleted records into data_store if mvcc is not enabled on RangePartition #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions data_store_service_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ bool DataStoreServiceClient::PutAll(
std::unordered_map<uint32_t, std::vector<std::pair<size_t, size_t>>>
hash_partitions_map;
std::unordered_map<uint32_t, std::vector<size_t>> range_partitions_map;
std::unordered_map<uint32_t, size_t> partition_record_cnt;

size_t flush_task_entry_idx = 0;
for (auto &entry : entries)
Expand All @@ -232,9 +231,6 @@ bool DataStoreServiceClient::PutAll(
}
it->second.emplace_back(
std::make_pair(flush_task_entry_idx, i));

partition_record_cnt.try_emplace(kv_partition_id, 0);
partition_record_cnt[kv_partition_id]++;
}
}
else
Expand All @@ -246,8 +242,6 @@ bool DataStoreServiceClient::PutAll(
auto [it, inserted] =
range_partitions_map.try_emplace(parition_id);
it->second.emplace_back(flush_task_entry_idx);
partition_record_cnt.try_emplace(parition_id, 0);
partition_record_cnt[parition_id] += batch.size();
}
flush_task_entry_idx++;
}
Expand Down Expand Up @@ -4313,6 +4307,9 @@ void DataStoreServiceClient::PrepareRangePartitionBatches(
size_t write_batch_size = 0;
PartitionBatchRequest batch_request;

bool enabled_mvcc =
txservice::Sharder::Instance().GetLocalCcShards()->EnableMvcc();

auto PrepareRecordData = [&](txservice::FlushRecord &ckpt_rec,
size_t &batch_size,
PartitionBatchRequest &batch_request)
Expand All @@ -4336,7 +4333,14 @@ void DataStoreServiceClient::PrepareRangePartitionBatches(
}
batch_size += sizeof(uint64_t);

batch_request.op_types.push_back(WriteOpType::PUT);
if (is_deleted && !enabled_mvcc)
{
batch_request.op_types.push_back(WriteOpType::DELETE);
}
else
{
batch_request.op_types.push_back(WriteOpType::PUT);
}
batch_size += sizeof(WriteOpType);

SerializeTxRecord(is_deleted,
Expand Down
4 changes: 2 additions & 2 deletions eloq_data_store_service/rocksdb_data_store_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,8 +702,8 @@ void RocksDBDataStoreCommon::ScanNext(ScanRequest *scan_req)
query_worker_pool_->SubmitWork(
[this, scan_req]()
{
DLOG(INFO) << "RocksDBDataStoreCommon::ScanNext "
<< scan_req->GetPartitionId();
// DLOG(INFO) << "RocksDBDataStoreCommon::ScanNext "
// << scan_req->GetPartitionId();
PoolableGuard poolable_guard(scan_req);

uint32_t partition_id = scan_req->GetPartitionId();
Expand Down