This is an automated email from the ASF dual-hosted git repository. junchao pushed a commit to branch poc_merge in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git
commit 5d961d0f2d85843a9040d2e8d089363d16cfcd9f Merge: 8fd19e12 8416beb3 Author: cjcchen <[email protected]> AuthorDate: Sun Dec 28 06:53:17 2025 +0000 merge INSTALL.sh | 2 + chain/storage/kv_storage_test.cpp | 99 +++++++++++-- chain/storage/leveldb.cpp | 140 ++++++++++++++++-- chain/storage/leveldb.h | 15 +- chain/storage/memory_db.cpp | 59 ++++++-- chain/storage/memory_db.h | 13 +- chain/storage/mock_storage.h | 19 ++- chain/storage/proto/kv.proto | 1 + chain/storage/storage.h | 14 +- executor/common/transaction_manager.cpp | 15 ++ executor/common/transaction_manager.h | 12 +- executor/kv/kv_executor.cpp | 27 ++-- executor/kv/kv_executor.h | 2 - interface/kv/kv_client.cpp | 12 -- interface/kv/kv_client.h | 1 - platform/config/resdb_config_utils.cpp | 35 +++-- platform/consensus/checkpoint/checkpoint.h | 1 + platform/consensus/checkpoint/mock_checkpoint.h | 1 + .../consensus/execution/transaction_executor.cpp | 59 +++++--- .../consensus/execution/transaction_executor.h | 5 +- platform/consensus/ordering/pbft/BUILD | 2 +- .../consensus/ordering/pbft/checkpoint_manager.cpp | 164 +++++++++++++-------- .../consensus/ordering/pbft/checkpoint_manager.h | 19 ++- .../ordering/pbft/consensus_manager_pbft.cpp | 106 ++++++++++++- .../ordering/pbft/consensus_manager_pbft.h | 10 ++ .../ordering/pbft/lock_free_collector_pool.cpp | 12 ++ .../ordering/pbft/lock_free_collector_pool.h | 1 + .../consensus/ordering/pbft/message_manager.cpp | 32 +--- platform/consensus/ordering/pbft/message_manager.h | 8 +- platform/consensus/ordering/pbft/query.cpp | 48 +++--- platform/consensus/ordering/pbft/query.h | 6 +- platform/consensus/ordering/pbft/query_test.cpp | 4 +- .../ordering/pbft/transaction_collector.cpp | 4 +- platform/consensus/recovery/recovery.cpp | 109 +++++++++++++- platform/consensus/recovery/recovery.h | 16 +- platform/consensus/recovery/recovery_test.cpp | 21 ++- platform/networkstrate/replica_communicator.cpp | 1 - platform/proto/resdb.proto | 4 +- scripts/deploy/config/kv_server.conf | 10 +- scripts/deploy/script/deploy.sh | 5 +- scripts/format.sh | 1 + service/kv/kv_service.cpp | 13 +- service/tools/config/interface/service.config | 10 +- service/tools/kv/api_tools/kv_service_tools.cpp | 5 - tools/generate_region_config.py | 1 + 45 files changed, 861 insertions(+), 283 deletions(-) diff --cc executor/kv/kv_executor.cpp index d0482f1d,719093a4..6c520a16 --- a/executor/kv/kv_executor.cpp +++ b/executor/kv/kv_executor.cpp @@@ -25,8 -25,8 +25,13 @@@ namespace resdb { ++<<<<<<< HEAD +KVExecutor::KVExecutor(std::unique_ptr<Storage> storage) + : storage_(std::move(storage)) { ++======= + KVExecutor::KVExecutor(std::unique_ptr<Storage> storage) { + storage_ = std::move(storage); ++>>>>>>> master contract_manager_ = std::make_unique<resdb::contract::ContractTransactionManager>( storage_.get()); @@@ -97,7 -97,6 +102,10 @@@ std::unique_ptr<std::string> KVExecutor return nullptr; } ++<<<<<<< HEAD + LOG(ERROR) << " execute cmd:" << kv_request.cmd(); ++======= ++>>>>>>> master if (kv_request.cmd() == KVRequest::SET) { Set(kv_request.key(), kv_request.value()); } else if (kv_request.cmd() == KVRequest::GET) { diff --cc platform/networkstrate/replica_communicator.cpp index f4f9c24d,4205796a..9bea6e3b --- a/platform/networkstrate/replica_communicator.cpp +++ b/platform/networkstrate/replica_communicator.cpp @@@ -167,7 -167,8 +167,6 @@@ void ReplicaCommunicator::StartSingleIn LOG(ERROR) << "broadcast request fail:"; } // LOG(ERROR)<<" send to ip:"<<replica_info.ip()<<" - // port:"<<replica_info.port()<<" bq size:"<<batch_req.size()<<" done"; - // port:"<<replica_info.port()<<" bq size:"<<batch_req.size()<<" - // done"; } }, single_bq_[std::make_pair(ip, port)].get(), replica_info));
