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

saipranav pushed a commit to branch QueccBranch
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git

commit b16213fdb370cc2b7ceac207cbfa6a95bd4906bb
Merge: a519bd6b 9dc93e9e
Author: Saipranav Kotamreddy <[email protected]>
AuthorDate: Sat May 4 16:40:07 2024 -0700

    Merge branch 'master' into QueccBranch

 .bazelversion                                      |    2 +-
 .github/workflows/license.yml                      |   18 +
 .github/workflows/loc.yml                          |   14 +-
 .gitignore                                         |    4 +-
 .licenserc.yaml                                    |   33 +
 BUILD.bazel                                        |   19 +
 INSTALL.sh                                         |   21 +-
 INSTALL_MAC.sh                                     |   19 +
 LICENSE                                            |   65 ++
 NOTICE                                             |    3 +-
 WORKSPACE                                          |    4 +-
 api/BUILD                                          |   25 +-
 api/kv_operation.py                                |   19 +
 api/pybind_kv_service.cpp                          |   66 +-
 benchmark/protocols/pbft/BUILD                     |   18 +
 benchmark/protocols/poe/BUILD                      |   19 +-
 benchmark/protocols/poe/kv_server_performance.cpp  |   36 +-
 chain/state/BUILD                                  |   18 +
 chain/storage/BUILD                                |   18 +
 chain/storage/proto/BUILD                          |   18 +
 chain/storage/proto/kv.proto                       |   19 +
 chain/storage/proto/leveldb_config.proto           |   19 +
 chain/storage/proto/rocksdb_config.proto           |   19 +
 chain/storage/setting/BUILD                        |   18 +
 common/BUILD                                       |   24 +-
 common/crypto/BUILD                                |   19 +
 common/crypto/hash.cpp                             |   34 +-
 common/crypto/hash.h                               |   34 +-
 common/crypto/hash_test.cpp                        |   34 +-
 common/crypto/key_generator.cpp                    |   34 +-
 common/crypto/key_generator.h                      |   34 +-
 common/crypto/mock_signature_verifier.h            |   34 +-
 common/crypto/signature_utils.cpp                  |   34 +-
 common/crypto/signature_utils.h                    |   34 +-
 common/crypto/signature_verifier.cpp               |   34 +-
 common/crypto/signature_verifier.h                 |   34 +-
 common/crypto/signature_verifier_interface.cpp     |   34 +-
 common/crypto/signature_verifier_interface.h       |   34 +-
 common/crypto/signature_verifier_test.cpp          |   34 +-
 common/proto/BUILD                                 |   18 +
 common/proto/signature_info.proto                  |   19 +
 common/test/BUILD                                  |   19 +
 common/test/json_test.cpp                          |   34 +-
 common/test/test.proto                             |   19 +
 common/test/test_macros.h                          |   34 +-
 common/utils/BUILD                                 |   18 +
 common/utils/utils.cpp                             |   34 +-
 common/utils/utils.h                               |   34 +-
 entrypoint.sh                                      |   21 +-
 executor/common/BUILD                              |   18 +
 executor/contract/executor/BUILD                   |   18 +
 executor/contract/executor/test_data/BUILD         |   18 +
 executor/contract/manager/BUILD                    |   18 +
 executor/contract/manager/test_data/BUILD          |   18 +
 executor/kv/BUILD                                  |   18 +
 executor/utxo/executor/BUILD                       |   18 +
 executor/utxo/manager/BUILD                        |   18 +
 interface/common/BUILD                             |   19 +
 interface/common/resdb_txn_accessor.cpp            |   18 +-
 interface/common/resdb_txn_accessor_test.cpp       |    6 +-
 interface/contract/BUILD                           |   18 +
 interface/kv/BUILD                                 |   18 +
 interface/rdbc/BUILD                               |   18 +
 interface/utxo/BUILD                               |   18 +
 node_modules/@actions/core/README.md               |  146 ---
 node_modules/@actions/core/lib/command.d.ts        |   16 -
 node_modules/@actions/core/lib/command.js          |   78 --
 node_modules/@actions/core/lib/command.js.map      |    1 -
 node_modules/@actions/core/lib/core.d.ts           |  116 --
 node_modules/@actions/core/lib/core.js             |  209 ----
 node_modules/@actions/core/lib/core.js.map         |    1 -
 node_modules/@actions/core/package.json            |   67 --
 node_modules/badgen/LICENSE.md                     |    5 -
 node_modules/badgen/README.md                      |   83 --
 node_modules/badgen/dist/calc-text-width.d.ts      |    1 -
 node_modules/badgen/dist/color-presets.d.ts        |   14 -
 node_modules/badgen/dist/index.d.ts                |   19 -
 node_modules/badgen/dist/index.js                  |    2 -
 node_modules/badgen/dist/index.js.map              |    1 -
 node_modules/badgen/package.json                   |   65 --
 node_modules/badgen/tsconfig.json                  |   18 -
 node_modules/balanced-match/.npmignore             |    5 -
 node_modules/balanced-match/LICENSE.md             |   21 -
 node_modules/balanced-match/README.md              |   91 --
 node_modules/balanced-match/index.js               |   59 -
 node_modules/balanced-match/package.json           |   77 --
 node_modules/brace-expansion/LICENSE               |   21 -
 node_modules/brace-expansion/README.md             |  129 ---
 node_modules/brace-expansion/index.js              |  201 ----
 node_modules/brace-expansion/package.json          |   75 --
 node_modules/concat-map/.travis.yml                |    4 -
 node_modules/concat-map/LICENSE                    |   18 -
 node_modules/concat-map/README.markdown            |   62 -
 node_modules/concat-map/example/map.js             |    6 -
 node_modules/concat-map/index.js                   |   13 -
 node_modules/concat-map/package.json               |   88 --
 node_modules/concat-map/test/map.js                |   39 -
 node_modules/fs.realpath/LICENSE                   |   43 -
 node_modules/fs.realpath/README.md                 |   33 -
 node_modules/fs.realpath/index.js                  |   66 --
 node_modules/fs.realpath/old.js                    |  303 -----
 node_modules/fs.realpath/package.json              |   59 -
 node_modules/glob-gitignore/HISTORY.md             |    1 -
 node_modules/glob-gitignore/LICENSE                |   21 -
 node_modules/glob-gitignore/README.md              |  121 --
 node_modules/glob-gitignore/package.json           |   85 --
 node_modules/glob-gitignore/src/glob.js            |   68 --
 node_modules/glob-gitignore/src/index.js           |   15 -
 node_modules/glob-gitignore/src/sync.js            |   50 -
 node_modules/glob-gitignore/src/util.js            |  137 ---
 node_modules/glob/LICENSE                          |   21 -
 node_modules/glob/README.md                        |  375 -------
 node_modules/glob/changelog.md                     |   67 --
 node_modules/glob/common.js                        |  240 ----
 node_modules/glob/glob.js                          |  790 -------------
 node_modules/glob/package.json                     |   80 --
 node_modules/glob/sync.js                          |  486 --------
 node_modules/ignore/CHANGELOG.md                   |   32 -
 node_modules/ignore/LICENSE-MIT                    |   21 -
 node_modules/ignore/README.md                      |  386 -------
 node_modules/ignore/index.d.ts                     |   63 --
 node_modules/ignore/index.js                       |  568 ----------
 node_modules/ignore/legacy.js                      |  476 --------
 node_modules/ignore/package.json                   |   98 --
 node_modules/inflight/LICENSE                      |   15 -
 node_modules/inflight/README.md                    |   37 -
 node_modules/inflight/inflight.js                  |   54 -
 node_modules/inflight/package.json                 |   58 -
 node_modules/inherits/LICENSE                      |   16 -
 node_modules/inherits/README.md                    |   42 -
 node_modules/inherits/inherits.js                  |    9 -
 node_modules/inherits/inherits_browser.js          |   27 -
 node_modules/inherits/package.json                 |   61 -
 node_modules/lodash.difference/LICENSE             |   47 -
 node_modules/lodash.difference/README.md           |   18 -
 node_modules/lodash.difference/index.js            | 1170 -------------------
 node_modules/lodash.difference/package.json        |   69 --
 node_modules/lodash.union/LICENSE                  |   47 -
 node_modules/lodash.union/README.md                |   18 -
 node_modules/lodash.union/index.js                 | 1181 --------------------
 node_modules/lodash.union/package.json             |   69 --
 node_modules/make-array/README.md                  |   61 -
 node_modules/make-array/index.js                   |   71 --
 node_modules/make-array/package.json               |   69 --
 node_modules/minimatch/LICENSE                     |   15 -
 node_modules/minimatch/README.md                   |  209 ----
 node_modules/minimatch/minimatch.js                |  923 ---------------
 node_modules/minimatch/package.json                |   63 --
 node_modules/once/LICENSE                          |   15 -
 node_modules/once/README.md                        |   79 --
 node_modules/once/once.js                          |   42 -
 node_modules/once/package.json                     |   67 --
 node_modules/path-is-absolute/index.js             |   20 -
 node_modules/path-is-absolute/license              |   21 -
 node_modules/path-is-absolute/package.json         |   75 --
 node_modules/path-is-absolute/readme.md            |   59 -
 node_modules/util.inherits/HISTORY.md              |    1 -
 node_modules/util.inherits/README.md               |   45 -
 node_modules/util.inherits/index.js                |   47 -
 node_modules/util.inherits/package.json            |   81 --
 node_modules/wrappy/LICENSE                        |   15 -
 node_modules/wrappy/README.md                      |   36 -
 node_modules/wrappy/package.json                   |   59 -
 node_modules/wrappy/wrappy.js                      |   33 -
 platform/common/data_comm/BUILD                    |   18 +
 platform/common/network/BUILD                      |   18 +
 platform/common/queue/BUILD                        |   18 +
 platform/config/BUILD                              |   18 +
 platform/consensus/checkpoint/BUILD                |   18 +
 platform/consensus/execution/BUILD                 |   18 +
 platform/consensus/ordering/common/BUILD           |   18 +
 platform/consensus/ordering/common/algorithm/BUILD |   19 +-
 .../ordering/common/algorithm/protocol_base.cpp    |   64 +-
 .../ordering/common/algorithm/protocol_base.h      |   83 +-
 platform/consensus/ordering/common/framework/BUILD |   19 +-
 .../ordering/common/framework/consensus.cpp        |   87 +-
 .../ordering/common/framework/consensus.h          |   47 +-
 .../common/framework/performance_manager.cpp       |   81 +-
 .../common/framework/performance_manager.h         |   36 +-
 .../ordering/common/framework/response_manager.cpp |   36 +-
 .../ordering/common/framework/response_manager.h   |   38 +-
 .../common/framework/transaction_utils.cpp         |   34 +-
 .../ordering/common/framework/transaction_utils.h  |   34 +-
 platform/consensus/ordering/geo_pbft/BUILD         |   18 +
 platform/consensus/ordering/pbft/BUILD             |   19 +
 .../consensus/ordering/pbft/checkpoint_manager.cpp |    6 +-
 platform/consensus/ordering/pbft/commitment.cpp    |   27 +-
 .../ordering/pbft/consensus_manager_pbft.cpp       |    2 +-
 .../consensus/ordering/pbft/message_manager.cpp    |    5 +-
 .../ordering/pbft/performance_manager.cpp          |   11 +-
 platform/consensus/ordering/pbft/query.cpp         |   61 +-
 platform/consensus/ordering/pbft/query_test.cpp    |   10 +-
 .../consensus/ordering/pbft/response_manager.cpp   |   47 +-
 .../consensus/ordering/pbft/response_manager.h     |    2 +-
 .../consensus/ordering/pbft/viewchange_manager.cpp |    8 +-
 platform/consensus/ordering/poe/algorithm/BUILD    |   24 +-
 platform/consensus/ordering/poe/algorithm/poe.cpp  |   32 +-
 platform/consensus/ordering/poe/algorithm/poe.h    |   25 +-
 platform/consensus/ordering/poe/framework/BUILD    |   19 +-
 .../consensus/ordering/poe/framework/consensus.cpp |   43 +-
 .../consensus/ordering/poe/framework/consensus.h   |   36 +-
 .../ordering/poe/framework/consensus_test.cpp      |  179 ---
 platform/consensus/ordering/poe/proto/BUILD        |   18 +
 .../consensus/ordering/poe/proto/proposal.proto    |   18 +
 platform/consensus/recovery/BUILD                  |   18 +
 platform/consensus/recovery/recovery.cpp           |    5 +-
 platform/networkstrate/BUILD                       |   18 +
 platform/networkstrate/async_acceptor.cpp          |    2 +-
 platform/networkstrate/consensus_manager.cpp       |  137 ++-
 platform/networkstrate/consensus_manager.h         |    4 +
 platform/networkstrate/replica_communicator.cpp    |    2 +-
 platform/proto/BUILD                               |   18 +
 platform/proto/broadcast.proto                     |   19 +
 platform/proto/checkpoint_info.proto               |   19 +
 platform/proto/client_test.proto                   |   19 +
 platform/proto/logging.proto                       |   19 +
 platform/proto/network_type.proto                  |   19 +
 platform/proto/replica_info.proto                  |   19 +
 platform/proto/resdb.proto                         |   24 +
 platform/proto/system_info_data.proto              |   19 +
 platform/proto/viewchange_message.proto            |   19 +
 platform/rdbc/BUILD                                |   18 +
 platform/statistic/BUILD                           |   30 +-
 platform/statistic/stats.cpp                       |  261 +++--
 platform/statistic/stats.h                         |   77 +-
 platform/statistic/test_server.sh                  |    8 -
 platform/test/BUILD                                |   19 +
 platform/test/proto/BUILD                          |   19 +
 platform/test/proto/resdb_test.proto               |   19 +
 platform/test/test_data/BUILD                      |   19 +
 proto/contract/BUILD                               |   19 +
 proto/contract/account.proto                       |   19 +
 proto/contract/contract.proto                      |   19 +
 proto/contract/func_params.proto                   |   19 +
 proto/contract/rpc.proto                           |   19 +
 proto/kv/BUILD                                     |   18 +
 proto/kv/kv.proto                                  |   19 +
 proto/utxo/BUILD                                   |   19 +
 proto/utxo/config.proto                            |   19 +
 proto/utxo/rpc.proto                               |   19 +
 proto/utxo/utxo.proto                              |   19 +
 script.js                                          |   20 +
 scripts/deploy/config/kv_server.conf               |    8 +-
 scripts/deploy/performance/pbft_performance.sh     |   19 +
 scripts/deploy/performance/poe_performance.sh      |   19 +
 scripts/deploy/performance/run_performance.sh      |   19 +
 scripts/deploy/script/deploy.sh                    |   42 +-
 scripts/deploy/script/env.sh                       |   19 +-
 scripts/deploy/script/generate_config.sh           |   18 +
 scripts/deploy/script/generate_key.sh              |   19 +-
 scripts/deploy/script/load_config.sh               |   18 +
 scripts/format.sh                                  |   20 +
 service/contract/BUILD                             |   18 +
 service/kv/BUILD                                   |   19 +
 service/kv/kv_service.cpp                          |    1 +
 service/tools/contract/api_tools/BUILD             |   19 +
 .../contract/api_tools/example_contract/compile.sh |   18 +
 .../service_tools/start_contract_service.sh        |   18 +
 service/tools/kv/api_tools/BUILD                   |   19 +
 service/tools/kv/api_tools/kv_client_txn_tools.cpp |    2 -
 service/tools/kv/server_tools/start_kv_service.sh  |   18 +
 .../kv/server_tools/start_kv_service_monitoring.sh |   18 +
 .../tools/utxo/service_tools/start_utxo_service.sh |   18 +
 service/tools/utxo/wallet_tool/cpp/BUILD           |   19 +
 service/tools/utxo/wallet_tool/cpp/addr_utils.cpp  |   33 +-
 service/tools/utxo/wallet_tool/cpp/addr_utils.h    |   33 +-
 service/tools/utxo/wallet_tool/cpp/key_utils.cpp   |   33 +-
 service/tools/utxo/wallet_tool/cpp/key_utils.h     |   33 +-
 service/tools/utxo/wallet_tool/py/BUILD            |   19 +
 service/tools/utxo/wallet_tool/pybind/BUILD        |   19 +
 .../utxo/wallet_tool/pybind/wallet_tools_py.cpp    |   33 +-
 service/tools/utxo/wallet_tool/test/BUILD          |   19 +
 service/utils/BUILD                                |   19 +
 service/utxo/BUILD                                 |   19 +
 service/utxo/start_contract_server.sh              |   18 +
 third_party/BUILD                                  |   21 +-
 action.yml => third_party/loc_script/action.yml    |    0
 {src => third_party/loc_script/src}/index.js       |    0
 tools/BUILD                                        |   19 +
 tools/generate_certificate.sh                      |   18 +
 tools/generate_client.sh                           |   18 +
 tools/generate_cluster.sh                          |   19 +-
 tools/generate_key.sh                              |   18 +
 283 files changed, 3357 insertions(+), 12822 deletions(-)

diff --cc platform/statistic/stats.cpp
index 0041d47a,200ea527..ad461281
--- a/platform/statistic/stats.cpp
+++ b/platform/statistic/stats.cpp
@@@ -186,10 -206,10 +206,10 @@@ void Stats::GetTransactionDetails(Batch
    transaction_summary_.txn_value.clear();
    for (auto& sub_request : batch_request.user_requests()) {
      KVRequest kv_request;
-     if(!kv_request.ParseFromString(sub_request.request().data())){
+     if (!kv_request.ParseFromString(sub_request.request().data())) {
        break;
      }
 -    if (kv_request.cmd() == KVRequest::SET) {
 +    if (kv_request.cmd() == Operation::SET) {
        transaction_summary_.txn_command.push_back("SET");
        transaction_summary_.txn_key.push_back(kv_request.key());
        transaction_summary_.txn_value.push_back(kv_request.value());

Reply via email to