You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@resilientdb.apache.org by sa...@apache.org on 2024/04/18 01:21:21 UTC
(incubator-resilientdb) branch QueccBranch updated (d891b4ae -> 7a364f53)
This is an automated email from the ASF dual-hosted git repository.
saipranav pushed a change to branch QueccBranch
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git
from d891b4ae "Added processing of wait points and verifies"
new 199c613f "Fixed bazel dependency issue"
add 7d478836 add GetRequestFromReplica interface (#133)
add a6b6bbcf change the script path in start_contract_service.sh
add a145249f Fix incorrect comment intervals in Prometheus config (#135)
add c3953f90 kv-service python api (#136)
add ca0ac0f9 update kv_operation.py route to bazel-out and update readme (#137)
add 69ef5830 ResView Branch (#138)
add 69069c87 "Fixed issue with data carryover between instances" (#139)
add fe73ffa2 add poe (#140)
add d2225665 Update CHANGELOG.md
add 3037f80e Update CHANGELOG.md (#141)
new 914a7ce8 Merge branch 'master' into QueccBranch
new 7a364f53 Made changes due to different proto file
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.md | 12 ++
WORKSPACE | 25 ++-
api/BUILD | 19 ++
api/README.md | 47 +++++
api/ip_address.config | 1 +
api/kv_operation.py | 27 +++
api/pybind_kv_service.cpp | 50 ++++++
benchmark/protocols/{quecc => poe}/BUILD | 13 +-
.../protocols/poe/kv_server_performance.cpp | 65 ++++---
common/BUILD | 7 +
documents/file/prometheus.yml | 4 +-
executor/kv/quecc_executor.cpp | 10 +-
interface/common/resdb_txn_accessor.cpp | 34 ++++
interface/common/resdb_txn_accessor.h | 2 +
interface/common/resdb_txn_accessor_test.cpp | 5 +-
monitoring/prometheus/prometheus.yml | 10 +-
.../consensus/execution/transaction_executor.cpp | 4 +-
platform/consensus/ordering/common/algorithm/BUILD | 12 ++
.../ordering/common/algorithm/protocol_base.cpp | 53 ++++++
.../ordering/common/algorithm/protocol_base.h | 64 +++++++
.../ordering/common/{ => framework}/BUILD | 39 +++--
.../ordering/common/framework/consensus.cpp | 181 +++++++++++++++++++
.../{poe/mac => common/framework}/consensus.h | 57 +++---
.../common/{ => framework}/performance_manager.cpp | 132 +++++++++-----
.../common/{ => framework}/performance_manager.h | 23 ++-
.../common/{ => framework}/response_manager.cpp | 188 ++++++++++----------
.../common/{ => framework}/response_manager.h | 34 ++--
.../common/framework/transaction_utils.cpp | 41 ++---
.../framework/transaction_utils.h} | 20 +--
platform/consensus/ordering/pbft/BUILD | 1 +
platform/consensus/ordering/pbft/commitment.cpp | 18 +-
.../ordering/pbft/consensus_manager_pbft.cpp | 1 +
.../consensus/ordering/pbft/response_manager.cpp | 96 ++++++++++
.../consensus/ordering/pbft/response_manager.h | 27 +++
.../consensus/ordering/pbft/viewchange_manager.cpp | 6 +
.../consensus/ordering/pbft/viewchange_manager.h | 2 +
platform/consensus/ordering/poe/algorithm/BUILD | 15 ++
platform/consensus/ordering/poe/algorithm/poe.cpp | 75 ++++++++
platform/consensus/ordering/poe/algorithm/poe.h | 40 +++++
platform/consensus/ordering/poe/framework/BUILD | 16 ++
.../consensus/ordering/poe/framework/consensus.cpp | 105 +++++++++++
.../consensus.h} | 37 ++--
.../ordering/poe/framework/consensus_test.cpp | 179 +++++++++++++++++++
platform/consensus/ordering/poe/proto/BUILD | 13 +-
.../consensus/ordering/poe/proto/proposal.proto | 28 +++
platform/networkstrate/replica_communicator.cpp | 2 +-
platform/proto/replica_info.proto | 2 +
platform/proto/resdb.proto | 7 +-
platform/statistic/BUILD | 7 +
platform/statistic/stats.cpp | 195 ++++++++++++++++++++-
platform/statistic/stats.h | 56 +++++-
script.js | 103 +++++++++++
scripts/deploy/config/kv_performance_server.conf | 10 +-
scripts/deploy/config/poe.config | 10 ++
scripts/deploy/config/template.config | 2 +-
scripts/deploy/performance/pbft_performance.sh | 2 +
scripts/deploy/performance/poe_performance.sh | 4 +
scripts/deploy/performance/run_performance.sh | 2 -
service/tools/config/server/server.config | 5 +-
.../service_tools/start_contract_service.sh | 6 +-
third_party/BUILD | 7 +
61 files changed, 1920 insertions(+), 338 deletions(-)
create mode 100644 api/BUILD
create mode 100644 api/README.md
create mode 100644 api/ip_address.config
create mode 100644 api/kv_operation.py
create mode 100644 api/pybind_kv_service.cpp
copy benchmark/protocols/{quecc => poe}/BUILD (56%)
copy service/kv/quecc_kv_service.cpp => benchmark/protocols/poe/kv_server_performance.cpp (64%)
create mode 100644 platform/consensus/ordering/common/algorithm/BUILD
create mode 100644 platform/consensus/ordering/common/algorithm/protocol_base.cpp
create mode 100644 platform/consensus/ordering/common/algorithm/protocol_base.h
copy platform/consensus/ordering/common/{ => framework}/BUILD (62%)
create mode 100644 platform/consensus/ordering/common/framework/consensus.cpp
copy platform/consensus/ordering/{poe/mac => common/framework}/consensus.h (51%)
copy platform/consensus/ordering/common/{ => framework}/performance_manager.cpp (64%)
copy platform/consensus/ordering/common/{ => framework}/performance_manager.h (85%)
copy platform/consensus/ordering/common/{ => framework}/response_manager.cpp (58%)
copy platform/consensus/ordering/common/{ => framework}/response_manager.h (77%)
copy common/crypto/hash_test.cpp => platform/consensus/ordering/common/framework/transaction_utils.cpp (60%)
copy platform/consensus/ordering/{poe/common/transaction_state.h => common/framework/transaction_utils.h} (76%)
create mode 100644 platform/consensus/ordering/poe/algorithm/BUILD
create mode 100644 platform/consensus/ordering/poe/algorithm/poe.cpp
create mode 100644 platform/consensus/ordering/poe/algorithm/poe.h
create mode 100644 platform/consensus/ordering/poe/framework/BUILD
create mode 100644 platform/consensus/ordering/poe/framework/consensus.cpp
copy platform/consensus/ordering/poe/{mac/lock_free_collector_pool.h => framework/consensus.h} (58%)
create mode 100644 platform/consensus/ordering/poe/framework/consensus_test.cpp
create mode 100644 platform/consensus/ordering/poe/proto/proposal.proto
create mode 100644 script.js
create mode 100644 scripts/deploy/config/poe.config
create mode 100755 scripts/deploy/performance/pbft_performance.sh
create mode 100755 scripts/deploy/performance/poe_performance.sh
(incubator-resilientdb) 02/03: Merge branch 'master' into QueccBranch
Posted by sa...@apache.org.
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 914a7ce859d934e48a203bbc12d214d11809ac43
Merge: 199c613f 3037f80e
Author: Saipranav Kotamreddy <sa...@gmail.com>
AuthorDate: Wed Apr 17 17:56:25 2024 -0700
Merge branch 'master' into QueccBranch
CHANGELOG.md | 12 +
WORKSPACE | 21 ++
api/BUILD | 19 ++
api/README.md | 47 ++++
api/ip_address.config | 1 +
api/kv_operation.py | 27 ++
api/pybind_kv_service.cpp | 50 ++++
benchmark/protocols/poe/BUILD | 16 ++
benchmark/protocols/poe/kv_server_performance.cpp | 89 +++++++
common/BUILD | 7 +
documents/file/prometheus.yml | 4 +-
interface/common/resdb_txn_accessor.cpp | 34 +++
interface/common/resdb_txn_accessor.h | 2 +
interface/common/resdb_txn_accessor_test.cpp | 5 +-
monitoring/prometheus/prometheus.yml | 10 +-
.../consensus/execution/transaction_executor.cpp | 4 +-
platform/consensus/ordering/common/algorithm/BUILD | 12 +
.../ordering/common/algorithm/protocol_base.cpp | 53 ++++
.../ordering/common/algorithm/protocol_base.h | 64 +++++
platform/consensus/ordering/common/framework/BUILD | 49 ++++
.../ordering/common/framework/consensus.cpp | 181 +++++++++++++
.../ordering/common/framework/consensus.h | 83 ++++++
.../common/framework/performance_manager.cpp | 289 +++++++++++++++++++++
.../common/framework/performance_manager.h | 103 ++++++++
.../framework}/response_manager.cpp | 157 ++++-------
.../ordering/common/framework/response_manager.h | 85 ++++++
.../common/framework/transaction_utils.cpp | 49 ++++
.../ordering/common/framework/transaction_utils.h | 45 ++++
platform/consensus/ordering/pbft/BUILD | 1 +
platform/consensus/ordering/pbft/commitment.cpp | 18 +-
.../ordering/pbft/consensus_manager_pbft.cpp | 1 +
.../consensus/ordering/pbft/response_manager.cpp | 96 +++++++
.../consensus/ordering/pbft/response_manager.h | 27 ++
.../consensus/ordering/pbft/viewchange_manager.cpp | 6 +
.../consensus/ordering/pbft/viewchange_manager.h | 2 +
platform/consensus/ordering/poe/algorithm/BUILD | 15 ++
platform/consensus/ordering/poe/algorithm/poe.cpp | 75 ++++++
platform/consensus/ordering/poe/algorithm/poe.h | 40 +++
platform/consensus/ordering/poe/framework/BUILD | 16 ++
.../consensus/ordering/poe/framework/consensus.cpp | 105 ++++++++
.../consensus/ordering/poe/framework/consensus.h | 59 +++++
.../ordering/poe/framework/consensus_test.cpp | 179 +++++++++++++
platform/consensus/ordering/poe/proto/BUILD | 13 +-
.../consensus/ordering/poe/proto/proposal.proto | 28 ++
platform/networkstrate/replica_communicator.cpp | 2 +-
platform/proto/replica_info.proto | 2 +
platform/proto/resdb.proto | 7 +-
platform/statistic/BUILD | 7 +
platform/statistic/stats.cpp | 195 +++++++++++++-
platform/statistic/stats.h | 56 +++-
script.js | 103 ++++++++
scripts/deploy/config/kv_performance_server.conf | 10 +-
scripts/deploy/config/poe.config | 10 +
scripts/deploy/config/template.config | 2 +-
scripts/deploy/performance/pbft_performance.sh | 2 +
scripts/deploy/performance/poe_performance.sh | 4 +
scripts/deploy/performance/run_performance.sh | 2 -
service/tools/config/server/server.config | 5 +-
.../service_tools/start_contract_service.sh | 6 +-
third_party/BUILD | 7 +
60 files changed, 2473 insertions(+), 146 deletions(-)
(incubator-resilientdb) 03/03: Made changes due to different proto file
Posted by sa...@apache.org.
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 7a364f536b99cd582a9a505dfcbd4736f9f51259
Author: Saipranav Kotamreddy <sa...@gmail.com>
AuthorDate: Wed Apr 17 18:21:12 2024 -0700
Made changes due to different proto file
---
executor/kv/quecc_executor.cpp | 10 +++++-----
platform/statistic/stats.cpp | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/executor/kv/quecc_executor.cpp b/executor/kv/quecc_executor.cpp
index d92b3a3b..83560fa8 100644
--- a/executor/kv/quecc_executor.cpp
+++ b/executor/kv/quecc_executor.cpp
@@ -156,7 +156,7 @@ void QueccExecutor::PlannerThread(const int thread_number) {
//it could cause a cascading abort and is therefore recorded as a wait point
int txn_id=0;
set<int> range_used_list = set<int>();
- for(int i=0; i<multi_op_batch.size(); i++){
+ for(size_t i=0; i<multi_op_batch.size(); i++){
txn_id=multi_op_id[i];
range_used_list.clear();
for(const auto& request_operation: multi_op_batch[i].ops()){
@@ -201,12 +201,12 @@ void QueccExecutor::PlannerThread(const int thread_number) {
for (int priority = 0; priority < thread_count_; priority++) {
std::vector<KVOperation>& range_ops =
this->sorted_transactions_[priority][range_being_executed];
- for (int op_count; op_count<range_ops.size(); op_count++) {
+ for (size_t op_count=0; op_count<range_ops.size(); op_count++) {
KVOperation op = range_ops[op_count];
//If past wait point, check for next wait point
while(op.transaction_number>wait_point_list_[wait_point_vector][wait_point_position]){
wait_point_position++;
- if(wait_point_position==wait_point_list_[wait_point_vector].size()){
+ if(wait_point_position==(int)wait_point_list_[wait_point_vector].size()){
wait_point_position=0;
wait_point_vector++;
}
@@ -215,7 +215,7 @@ void QueccExecutor::PlannerThread(const int thread_number) {
//If it succeeds, all subsequent operations in txn can skip this step
//If it fails, then it goes into if, sses operations_checked is negative, and skips the operation, as txn was aborted
if(op.transaction_number==wait_point_list_[wait_point_vector][wait_point_position] && operations_checked_[op.transaction_number].load()!=transaction_tracker_[op.transaction_number]){
- if(operations_checked_.find(op.transaction_number)==operations_checked.end()){
+ if(operations_checked_.find(op.transaction_number)==operations_checked_.end()){
}
if(operations_checked_[op.transaction_number].load()<0){
continue;
@@ -362,7 +362,7 @@ std::unique_ptr<BatchUserResponse> QueccExecutor::ExecuteBatch(
int count_per_split=0;
int op_batch_number=0;
//Send multi operation transactions to thread to gauge if they require waits
- for(int i=0; i<multi_op_transactions_numbers_.size(); i++){
+ for(size_t i=0; i<multi_op_transactions_numbers_.size(); i++){
multi_op_ready_.store(true);
multi_op_batches_[op_batch_number].push_back(multi_op_transactions_[i]);
multi_op_number_batches_[op_batch_number].push_back(multi_op_transactions_numbers_[i]);
diff --git a/platform/statistic/stats.cpp b/platform/statistic/stats.cpp
index d8de42a7..0041d47a 100644
--- a/platform/statistic/stats.cpp
+++ b/platform/statistic/stats.cpp
@@ -189,19 +189,19 @@ void Stats::GetTransactionDetails(BatchUserRequest batch_request){
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());
- } else if (kv_request.cmd() == KVRequest::GET) {
+ } else if (kv_request.cmd() == Operation::GET) {
transaction_summary_.txn_command.push_back("GET");
transaction_summary_.txn_key.push_back(kv_request.key());
transaction_summary_.txn_value.push_back("");
- } else if (kv_request.cmd() == KVRequest::GETALLVALUES) {
+ } else if (kv_request.cmd() == Operation::GETALLVALUES) {
transaction_summary_.txn_command.push_back("GETALLVALUES");
transaction_summary_.txn_key.push_back(kv_request.key());
transaction_summary_.txn_value.push_back("");
- } else if (kv_request.cmd() == KVRequest::GETRANGE) {
+ } else if (kv_request.cmd() == Operation::GETRANGE) {
transaction_summary_.txn_command.push_back("GETRANGE");
transaction_summary_.txn_key.push_back(kv_request.key());
transaction_summary_.txn_value.push_back(kv_request.value());
(incubator-resilientdb) 01/03: "Fixed bazel dependency issue"
Posted by sa...@apache.org.
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 199c613f39eef55a3cf6c8a73abbe3ae65c9f6dd
Author: Saipranav Kotamreddy <sa...@gmail.com>
AuthorDate: Wed Apr 17 17:53:23 2024 -0700
"Fixed bazel dependency issue"
---
WORKSPACE | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/WORKSPACE b/WORKSPACE
index a6ec678d..f50fabdc 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -205,8 +205,8 @@ http_archive(
http_archive(
name = "pybind11_bazel",
- strip_prefix = "pybind11_bazel-master",
- urls = ["https://github.com/pybind/pybind11_bazel/archive/master.zip"],
+ strip_prefix = "pybind11_bazel-2.11.1.bzl.1",
+ urls = ["https://github.com/pybind/pybind11_bazel/archive/refs/tags/v2.11.1.bzl.1.zip"]
)
http_archive(