This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new c4481ba2a refator(FQDN): Rename variables to indicate type and remove
useless function (#1953)
c4481ba2a is described below
commit c4481ba2aae2b90b8c7590445c694ccb18831886
Author: Yingchun Lai <[email protected]>
AuthorDate: Fri Apr 12 11:05:13 2024 +0800
refator(FQDN): Rename variables to indicate type and remove useless
function (#1953)
---
src/runtime/rpc/serialization.h | 3 ---
src/server/pegasus_server_impl.cpp | 14 +++++++-------
src/server/pegasus_server_impl.h | 2 +-
src/server/pegasus_server_impl_init.cpp | 2 +-
src/server/pegasus_write_service_impl.h | 16 ++++++++--------
src/server/test/pegasus_server_write_test.cpp | 2 +-
src/server/test/pegasus_write_service_test.cpp | 2 +-
7 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/src/runtime/rpc/serialization.h b/src/runtime/rpc/serialization.h
index 598dd0163..7aa5738a1 100644
--- a/src/runtime/rpc/serialization.h
+++ b/src/runtime/rpc/serialization.h
@@ -104,7 +104,4 @@ inline void unmarshall(dsn::message_ex *msg, /*out*/ T &val)
unmarshall(reader, val,
(dsn_msg_serialize_format)msg->header->context.u.serialize_format);
}
-template <>
-inline void unmarshall(dsn::message_ex *msg, /*out*/ partition_configuration
&val);
-
} // namespace dsn
diff --git a/src/server/pegasus_server_impl.cpp
b/src/server/pegasus_server_impl.cpp
index 11adaa6f0..a12ec788a 100644
--- a/src/server/pegasus_server_impl.cpp
+++ b/src/server/pegasus_server_impl.cpp
@@ -418,7 +418,7 @@ void pegasus_server_impl::on_get(get_rpc rpc)
auto &resp = rpc.response();
resp.app_id = _gpid.get_app_id();
resp.partition_index = _gpid.get_partition_index();
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
if (dsn_unlikely(FLAGS_inject_read_error_for_test !=
rocksdb::Status::kOk)) {
resp.error = FLAGS_inject_read_error_for_test;
@@ -496,7 +496,7 @@ void pegasus_server_impl::on_multi_get(multi_get_rpc rpc)
auto &resp = rpc.response();
resp.app_id = _gpid.get_app_id();
resp.partition_index = _gpid.get_partition_index();
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
CHECK_READ_THROTTLING();
@@ -906,7 +906,7 @@ void pegasus_server_impl::on_batch_get(batch_get_rpc rpc)
auto &response = rpc.response();
response.app_id = _gpid.get_app_id();
response.partition_index = _gpid.get_partition_index();
- response.server = _primary_address;
+ response.server = _primary_host_port;
CHECK_READ_THROTTLING();
@@ -1018,7 +1018,7 @@ void
pegasus_server_impl::on_sortkey_count(sortkey_count_rpc rpc)
auto &resp = rpc.response();
resp.app_id = _gpid.get_app_id();
resp.partition_index = _gpid.get_partition_index();
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
CHECK_READ_THROTTLING();
@@ -1091,7 +1091,7 @@ void pegasus_server_impl::on_ttl(ttl_rpc rpc)
auto &resp = rpc.response();
resp.app_id = _gpid.get_app_id();
resp.partition_index = _gpid.get_partition_index();
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
CHECK_READ_THROTTLING();
@@ -1151,7 +1151,7 @@ void pegasus_server_impl::on_get_scanner(get_scanner_rpc
rpc)
auto &resp = rpc.response();
resp.app_id = _gpid.get_app_id();
resp.partition_index = _gpid.get_partition_index();
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
CHECK_READ_THROTTLING();
@@ -1398,7 +1398,7 @@ void pegasus_server_impl::on_scan(scan_rpc rpc)
auto &resp = rpc.response();
resp.app_id = _gpid.get_app_id();
resp.partition_index = _gpid.get_partition_index();
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
CHECK_READ_THROTTLING();
diff --git a/src/server/pegasus_server_impl.h b/src/server/pegasus_server_impl.h
index 69d02d061..361d9cbba 100644
--- a/src/server/pegasus_server_impl.h
+++ b/src/server/pegasus_server_impl.h
@@ -478,7 +478,7 @@ private:
static const std::string COMPRESSION_HEADER;
dsn::gpid _gpid;
- std::string _primary_address;
+ std::string _primary_host_port;
// slow query time threshold. exceed this threshold will be logged.
uint64_t _slow_query_threshold_ns;
diff --git a/src/server/pegasus_server_impl_init.cpp
b/src/server/pegasus_server_impl_init.cpp
index 73bab5192..2e2472b64 100644
--- a/src/server/pegasus_server_impl_init.cpp
+++ b/src/server/pegasus_server_impl_init.cpp
@@ -628,7 +628,7 @@
pegasus_server_impl::pegasus_server_impl(dsn::replication::replica *r)
METRIC_VAR_INIT_replica(rdb_bloom_filter_point_lookup_positives),
METRIC_VAR_INIT_replica(rdb_bloom_filter_point_lookup_true_positives)
{
- _primary_address = dsn_primary_host_port().to_string();
+ _primary_host_port = dsn_primary_host_port().to_string();
_gpid = get_gpid();
_read_hotkey_collector =
diff --git a/src/server/pegasus_write_service_impl.h
b/src/server/pegasus_write_service_impl.h
index df57c59be..f551b1b55 100644
--- a/src/server/pegasus_write_service_impl.h
+++ b/src/server/pegasus_write_service_impl.h
@@ -91,7 +91,7 @@ class pegasus_write_service::impl : public
dsn::replication::replica_base
public:
explicit impl(pegasus_server_impl *server)
: replica_base(server),
- _primary_address(server->_primary_address),
+ _primary_host_port(server->_primary_host_port),
_pegasus_data_version(server->_pegasus_data_version)
{
_rocksdb_wrapper = std::make_unique<rocksdb_wrapper>(server);
@@ -117,7 +117,7 @@ public:
resp.app_id = get_gpid().get_app_id();
resp.partition_index = get_gpid().get_partition_index();
resp.decree = decree;
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
if (update.kvs.empty()) {
LOG_ERROR_PREFIX("invalid argument for multi_put: decree = {},
error = {}",
@@ -152,7 +152,7 @@ public:
resp.app_id = get_gpid().get_app_id();
resp.partition_index = get_gpid().get_partition_index();
resp.decree = decree;
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
if (update.sort_keys.empty()) {
LOG_ERROR_PREFIX("invalid argument for multi_remove: decree = {},
error = {}",
@@ -186,7 +186,7 @@ public:
resp.app_id = get_gpid().get_app_id();
resp.partition_index = get_gpid().get_partition_index();
resp.decree = decree;
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
absl::string_view raw_key = update.key.to_string_view();
int64_t new_value = 0;
@@ -270,7 +270,7 @@ public:
resp.app_id = get_gpid().get_app_id();
resp.partition_index = get_gpid().get_partition_index();
resp.decree = decree;
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
if (!is_check_type_supported(update.check_type)) {
LOG_ERROR_PREFIX("invalid argument for check_and_set: decree = {},
error = {}",
@@ -366,7 +366,7 @@ public:
resp.app_id = get_gpid().get_app_id();
resp.partition_index = get_gpid().get_partition_index();
resp.decree = decree;
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
if (update.mutate_list.empty()) {
LOG_ERROR_PREFIX("invalid argument for check_and_mutate: decree =
{}, error = {}",
@@ -562,7 +562,7 @@ private:
resp.app_id = get_gpid().get_app_id();
resp.partition_index = get_gpid().get_partition_index();
resp.decree = decree;
- resp.server = _primary_address;
+ resp.server = _primary_host_port;
for (dsn::apps::update_response *uresp : _update_responses) {
*uresp = resp;
}
@@ -696,7 +696,7 @@ private:
FRIEND_TEST(pegasus_write_service_impl_test, put_verify_timetag);
FRIEND_TEST(pegasus_write_service_impl_test,
verify_timetag_compatible_with_version_0);
- const std::string _primary_address;
+ const std::string _primary_host_port;
const uint32_t _pegasus_data_version;
std::unique_ptr<rocksdb_wrapper> _rocksdb_wrapper;
diff --git a/src/server/test/pegasus_server_write_test.cpp
b/src/server/test/pegasus_server_write_test.cpp
index b240ae535..556cd9d7f 100644
--- a/src/server/test/pegasus_server_write_test.cpp
+++ b/src/server/test/pegasus_server_write_test.cpp
@@ -133,7 +133,7 @@ public:
ASSERT_EQ(response.app_id, _gpid.get_app_id());
ASSERT_EQ(response.partition_index, _gpid.get_partition_index());
ASSERT_EQ(response.decree, decree);
- ASSERT_EQ(response.server,
_server_write->_write_svc->_impl->_primary_address);
+ ASSERT_EQ(response.server,
_server_write->_write_svc->_impl->_primary_host_port);
}
};
diff --git a/src/server/test/pegasus_write_service_test.cpp
b/src/server/test/pegasus_write_service_test.cpp
index c78ce1e4f..6e448a4ad 100644
--- a/src/server/test/pegasus_write_service_test.cpp
+++ b/src/server/test/pegasus_write_service_test.cpp
@@ -215,7 +215,7 @@ public:
ASSERT_EQ(response.app_id, _gpid.get_app_id());
ASSERT_EQ(response.partition_index, _gpid.get_partition_index());
ASSERT_EQ(response.decree, decree);
- ASSERT_EQ(response.server, _write_svc->_impl->_primary_address);
+ ASSERT_EQ(response.server, _write_svc->_impl->_primary_host_port);
ASSERT_EQ(_write_svc->_impl->_rocksdb_wrapper->_write_batch->Count(),
0);
ASSERT_EQ(_write_svc->_impl->_update_responses.size(), 0);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
