You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@resilientdb.apache.org by ju...@apache.org on 2026/09/02 16:54:35 UTC

(incubator-resilientdb) branch thun_merge updated (dd436ad25 -> 8733ec21b)

This is an automated email from the ASF dual-hosted git repository.

cjcchen pushed a change to branch thun_merge
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git


    from dd436ad25 fix build
     add 8733ec21b fix build

No new revisions were added by this update.

Summary of changes:
 benchmark/bin/thunderbolt/kv_server.cpp            |   1 -
 executor/common/transaction_manager.h              |   4 +-
 .../ordering/thunderbolt/executor/common/BUILD     |  15 +-
 .../executor/common/contract_execute_info.h        |   4 +-
 .../rws_types.h}                                   |  27 +-
 .../ordering/thunderbolt/executor/eo_service/BUILD |   2 +-
 .../eo_service/contract_transaction_manager.cpp    |   2 +-
 .../contract_transaction_manager_test.cpp          |   4 +-
 .../ordering/thunderbolt/executor/manager/BUILD    |   1 +
 .../executor/manager/concurrency_controller.h      |  30 +-
 .../executor/manager/contract_executor.h           |   2 +-
 .../thunderbolt/executor/manager/d_storage.cpp     |  14 +-
 .../thunderbolt/executor/manager/data_storage.cpp  |  14 +-
 .../executor/manager/level_d_storage.cpp           |  26 +-
 .../thunderbolt/executor/manager/leveldb.cpp       |   3 +-
 .../thunderbolt/executor/manager/leveldb.h         |   2 +-
 .../executor/manager/leveldb_d_storage.cpp         |  28 +-
 .../executor/manager/leveldb_d_storage.h           |   2 +-
 .../executor/manager/leveldb_storage.cpp           |  16 +-
 .../thunderbolt/executor/manager/leveldb_storage.h |   2 +-
 .../executor/manager/sequential_cc_controller.cpp  |   4 +-
 .../executor/manager/sequential_cc_controller.h    |   4 +-
 .../manager/sequential_concurrency_committer.cpp   |   4 +-
 .../manager/sequential_concurrency_committer.h     |   2 +-
 .../sequential_concurrency_committer_test.cpp      |  17 +-
 .../executor/manager/streaming_controller.cpp      |   2 +
 .../executor/manager/streaming_controller.h        |   2 +-
 .../executor/manager/test_committer.cpp            |   2 +-
 .../thunderbolt/executor/manager/test_committer.h  |   2 +-
 .../executor/manager/two_phase_controller.cpp      |   8 +-
 .../executor/manager/two_phase_ooo_controller.cpp  |   4 +-
 .../thunderbolt/executor/manager/x_committer.cpp   |   2 +-
 .../thunderbolt/executor/manager/x_controller.cpp  |   2 +
 .../thunderbolt/executor/manager/x_controller.h    |   4 +-
 .../ordering/thunderbolt/executor/paral_sm/BUILD   |  42 +++
 .../executor/paral_sm/address_manager.cpp          |   6 +-
 .../executor/paral_sm/address_manager.h            |   6 +-
 .../executor/paral_sm/address_manager_test.cpp     |   2 +-
 .../executor/paral_sm/contract_deployer.cpp        |   8 +-
 .../executor/paral_sm/contract_deployer.h          |   8 +-
 .../executor/paral_sm/contract_deployer_test.cpp   |   8 +-
 .../executor/paral_sm/contract_executor_test.cpp   |   8 +-
 .../executor/paral_sm/contract_manager.cpp         |  10 +-
 .../executor/paral_sm/contract_manager.h           |  12 +-
 .../executor/paral_sm/contract_manager_test.cpp    |   6 +-
 .../thunderbolt/executor/paral_sm/d_storage.cpp    |  18 +-
 .../thunderbolt/executor/paral_sm/data_storage.cpp |  12 +-
 .../thunderbolt/executor/paral_sm/db_view.h        |   3 +-
 .../{x_manager => paral_sm}/executor_state.cpp     |   6 +-
 .../thunderbolt/executor/paral_sm/leveldb.cpp      |   5 +-
 .../thunderbolt/executor/paral_sm/leveldb.h        |   4 +-
 .../executor/paral_sm/local_view_test.cpp          |   4 +-
 .../thunderbolt/executor/paral_sm/mock_d_storage.h |   6 +-
 .../executor/paral_sm/mock_data_storage.h          |   2 +-
 .../executor/paral_sm/mock_e_controller.h          |   6 +-
 .../executor/paral_sm/streaming_e_committer.cpp    |   8 +-
 .../executor/paral_sm/streaming_e_committer.h      |  16 +-
 .../paral_sm/streaming_e_committer_test.cpp        |  20 +-
 .../executor/paral_sm/streaming_e_controller.cpp   |  16 +-
 .../executor/paral_sm/streaming_e_controller.h     |  10 +-
 .../executor/paral_sm/test_committer.cpp           |   2 +-
 .../thunderbolt/executor/paral_sm/test_committer.h |   8 +-
 .../executor/paral_sm/test_controller.cpp          |   2 +-
 .../executor/paral_sm/test_controller.h            |   2 +-
 .../thunderbolt/executor/paral_sm/xcommitter.h     |  16 +-
 .../thunderbolt/executor/paral_sm/xexecutor.cpp    | 172 ++++-----
 .../thunderbolt/executor/paral_sm/xexecutor.h      |   2 +-
 .../executor/x_manager/2pl_controller.cpp          |   8 +-
 .../executor/x_manager/2pl_controller.h            |   4 +-
 .../ordering/thunderbolt/executor/x_manager/BUILD  |  19 +-
 .../executor/x_manager/address_manager_test.cpp    |   3 +-
 .../executor/x_manager/concurrency_controller.h    |  33 +-
 .../executor/x_manager/contract_deployer_test.cpp  |   7 +-
 .../executor/x_manager/contract_executor.h         |   2 +-
 .../executor/x_manager/contract_executor_test.cpp  |   7 +-
 .../executor/x_manager/contract_manager_test.cpp   |   5 +-
 .../thunderbolt/executor/x_manager/d_storage.cpp   |  17 +-
 .../executor/x_manager/data_storage.cpp            |  16 +-
 .../executor/x_manager/dx_controller.cpp           |  14 +-
 .../executor/x_manager/e_controller.cpp            |  14 +-
 .../thunderbolt/executor/x_manager/e_controller.h  |   4 +-
 .../executor/x_manager/fx_committer.cpp            |   2 +-
 .../executor/x_manager/fx_controller.cpp           |  20 +-
 .../thunderbolt/executor/x_manager/leveldb.cpp     |   7 +-
 .../thunderbolt/executor/x_manager/leveldb.h       |   4 +-
 .../executor/x_manager/leveldb_d_storage.cpp       |  32 +-
 .../executor/x_manager/leveldb_d_storage.h         |   2 +-
 .../executor/x_manager/leveldb_storage.cpp         |  18 +-
 .../executor/x_manager/leveldb_storage.h           |   2 +-
 .../executor/x_manager/local_view_test.cpp         |   5 +-
 .../executor/x_manager/seq_controller.cpp          |  14 +-
 .../executor/x_manager/streaming_e_controller.cpp  |  14 +-
 .../executor/x_manager/streaming_e_controller.h    |   4 +-
 .../executor/x_manager/test_committer.cpp          |   2 +-
 .../executor/x_manager/test_committer.h            |   8 +-
 .../executor/x_manager/test_controller.cpp         |   2 +-
 .../executor/x_manager/test_controller.h           |   2 +-
 .../executor/x_manager/x_controller.cpp            |  14 +-
 .../ordering/thunderbolt/proto/proposal.proto      |   3 +-
 .../thunderbolt/protocol/transaction_collector.cpp |   2 +-
 platform/proto/BUILD                               |   1 +
 platform/proto/resdb.proto                         |   3 +
 platform/statistic/stats.h                         |  14 +
 proto/contract/func_params.proto                   |   2 +-
 proto/contract/rpc.proto                           |  18 +
 .../contract/benchmark/generator}/BUILD            |  26 +-
 .../contract/benchmark/generator/generator.h       |   9 +-
 .../benchmark/generator/string_generator.cpp       |  17 +-
 .../benchmark/generator/string_generator.h         |  21 +-
 .../benchmark/generator/zipfian_generator.cpp      |  58 +--
 .../benchmark/generator/zipfian_generator.h        |  16 +-
 service/contract/thunderbolt_service/BUILD         |   4 +-
 .../thunderbolt_service/contract_server.cpp        |   6 +-
 .../contract_transaction_manager.cpp               | 396 +++++----------------
 .../contract_transaction_manager.h                 |  50 ++-
 .../thunderbolt_service/execution_helper.h         |   6 +
 116 files changed, 752 insertions(+), 919 deletions(-)
 copy platform/consensus/ordering/thunderbolt/executor/{paral_sm/concurrency_controller.h => common/rws_types.h} (76%)
 copy platform/consensus/ordering/thunderbolt/executor/{x_manager => paral_sm}/executor_state.cpp (95%)
 copy {ecosystem/graphql/third_party => service/contract/benchmark/generator}/BUILD (72%)
 copy common/utils/utils.h => service/contract/benchmark/generator/generator.h (88%)
 copy platform/consensus/ordering/poc/pow/miner_manager.cpp => service/contract/benchmark/generator/string_generator.cpp (67%)
 copy executor/common/custom_query.h => service/contract/benchmark/generator/string_generator.h (72%)
 copy platform/common/network/socket.h => service/contract/benchmark/generator/zipfian_generator.cpp (54%)
 copy platform/consensus/ordering/poc/pow/miner_manager.h => service/contract/benchmark/generator/zipfian_generator.h (77%)