This is an automated email from the ASF dual-hosted git repository.
junchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git
The following commit(s) were added to refs/heads/master by this push:
new 95443cd1 add get block numbers
95443cd1 is described below
commit 95443cd195b9a7ca5a7cd45e5d98a10b38ff44e9
Author: JunchaoChen <[email protected]>
AuthorDate: Mon Jan 15 19:58:21 2024 +0000
add get block numbers
---
interface/common/resdb_state_accessor.cpp | 3 +-
interface/common/resdb_state_accessor_test.cpp | 2 +-
interface/common/resdb_txn_accessor.cpp | 40 ++++++++++++++++++++++++++
interface/common/resdb_txn_accessor.h | 2 ++
platform/networkstrate/consensus_manager.cpp | 6 ++--
platform/proto/resdb.proto | 1 +
6 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/interface/common/resdb_state_accessor.cpp
b/interface/common/resdb_state_accessor.cpp
index 34db7eab..ec7033ea 100644
--- a/interface/common/resdb_state_accessor.cpp
+++ b/interface/common/resdb_state_accessor.cpp
@@ -35,8 +35,7 @@ std::unique_ptr<NetChannel> ResDBStateAccessor::GetNetChannel(
}
// Obtain ReplicaState of each replica.
-absl::StatusOr<ReplicaState>
-ResDBStateAccessor::GetReplicaState() {
+absl::StatusOr<ReplicaState> ResDBStateAccessor::GetReplicaState() {
const auto& client_info = config_.GetReplicaInfos()[0];
Request request;
diff --git a/interface/common/resdb_state_accessor_test.cpp
b/interface/common/resdb_state_accessor_test.cpp
index fad1e460..ad27ca5f 100644
--- a/interface/common/resdb_state_accessor_test.cpp
+++ b/interface/common/resdb_state_accessor_test.cpp
@@ -28,8 +28,8 @@
namespace resdb {
namespace {
-using ::resdb::testing::EqualsProto;
using ::google::protobuf::util::MessageDifferencer;
+using ::resdb::testing::EqualsProto;
using ::testing::ElementsAre;
using ::testing::Invoke;
using ::testing::Test;
diff --git a/interface/common/resdb_txn_accessor.cpp
b/interface/common/resdb_txn_accessor.cpp
index 55ef23b4..c9c2049c 100644
--- a/interface/common/resdb_txn_accessor.cpp
+++ b/interface/common/resdb_txn_accessor.cpp
@@ -147,4 +147,44 @@ absl::StatusOr<std::vector<Request>>
ResDBTxnAccessor::GetRequestFromReplica(
return txn_resp;
}
+absl::StatusOr<uint64_t> ResDBTxnAccessor::GetBlockNumbers() {
+ QueryRequest request;
+ request.set_min_seq(0);
+ request.set_max_seq(0);
+
+ std::vector<std::unique_ptr<NetChannel>> clients;
+ std::vector<std::thread> ths;
+ std::string final_str;
+ std::mutex mtx;
+ std::condition_variable resp_cv;
+
+ std::unique_ptr<NetChannel> client =
+ GetNetChannel(replicas_[0].ip(), replicas_[0].port());
+
+ LOG(ERROR) << "ip:" << replicas_[0].ip() << " port:" << replicas_[0].port();
+
+ std::string response_str;
+ int ret = 0;
+ for (int i = 0; i < 5; ++i) {
+ ret = client->SendRequest(request, Request::TYPE_QUERY);
+ if (ret) {
+ continue;
+ }
+ client->SetRecvTimeout(100000);
+ ret = client->RecvRawMessageStr(&response_str);
+ LOG(ERROR) << "receive str:" << ret << " len:" << response_str.size();
+ if (ret != 0) {
+ continue;
+ }
+ break;
+ }
+
+ QueryResponse resp;
+ if (response_str.empty() || !resp.ParseFromString(response_str)) {
+ LOG(ERROR) << "parse fail len:" << final_str.size();
+ return absl::InternalError("recv data fail.");
+ }
+ return resp.max_seq();
+}
+
} // namespace resdb
diff --git a/interface/common/resdb_txn_accessor.h
b/interface/common/resdb_txn_accessor.h
index 9fab8d22..db5dc042 100644
--- a/interface/common/resdb_txn_accessor.h
+++ b/interface/common/resdb_txn_accessor.h
@@ -40,6 +40,8 @@ class ResDBTxnAccessor {
virtual absl::StatusOr<std::vector<Request>> GetRequestFromReplica(
uint64_t min_seq, uint64_t max_seq, const ReplicaInfo& replica);
+ virtual absl::StatusOr<uint64_t> GetBlockNumbers();
+
protected:
virtual std::unique_ptr<NetChannel> GetNetChannel(const std::string& ip,
int port);
diff --git a/platform/networkstrate/consensus_manager.cpp
b/platform/networkstrate/consensus_manager.cpp
index 0e8667e2..00b70810 100644
--- a/platform/networkstrate/consensus_manager.cpp
+++ b/platform/networkstrate/consensus_manager.cpp
@@ -210,9 +210,9 @@ int
ConsensusManager::ProcessHeartBeat(std::unique_ptr<Context> context,
}
LOG(ERROR) << "receive public size:" << hb_info.public_keys().size()
- << " primary:" << hb_info.primary()
- << " version:" << hb_info.version()
- << " from region:" << request->region_info().region_id();
+ << " primary:" << hb_info.primary()
+ << " version:" << hb_info.version()
+ << " from region:" << request->region_info().region_id();
if (request->region_info().region_id() ==
config_.GetConfigData().self_region_id()) {
diff --git a/platform/proto/resdb.proto b/platform/proto/resdb.proto
index b17b1240..14ad976a 100644
--- a/platform/proto/resdb.proto
+++ b/platform/proto/resdb.proto
@@ -168,6 +168,7 @@ message QueryRequest {
message QueryResponse {
repeated Request transactions = 1;
+ uint64 max_seq = 2;
}
message CustomQueryResponse {
