This is an automated email from the ASF dual-hosted git repository.
wangdan 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 1dacb92ad refactor(macro): use CHECK_EQ to replace dassert_eq* (#1212)
1dacb92ad is described below
commit 1dacb92add63758b866538c0215f3ca8f05366a8
Author: Yingchun Lai <[email protected]>
AuthorDate: Fri Oct 28 15:49:41 2022 +0800
refactor(macro): use CHECK_EQ to replace dassert_eq* (#1212)
---
src/aio/aio_task.cpp | 2 +-
src/base/pegasus_value_schema.h | 2 +-
src/block_service/test/fds_service_test.cpp | 4 ++--
src/client/partition_resolver_simple.cpp | 2 +-
src/client/replication_ddl_client.cpp | 6 +++---
src/common/fs_manager.cpp | 2 +-
src/geo/lib/latlng_codec.cpp | 4 ++--
src/geo/test/geo_test.cpp | 2 +-
src/http/http_call_registry.h | 2 +-
src/http/http_message_parser.cpp | 2 +-
src/http/uri_decoder.cpp | 2 +-
src/meta/backup_engine.cpp | 8 ++++----
src/meta/meta_backup_service.cpp | 2 +-
src/meta/server_load_balancer.cpp | 2 +-
src/replica/duplication/duplication_pipeline.cpp | 2 +-
src/replica/duplication/replica_duplicator_manager.cpp | 2 +-
src/replica/mutation_log.cpp | 14 +++++++-------
src/replica/replica.cpp | 2 +-
src/replica/replica_backup.cpp | 2 +-
src/replica/replica_config.cpp | 2 +-
src/replica/replica_init.cpp | 2 +-
src/replica/replication_app_base.cpp | 8 ++++----
src/replica/split/replica_split_manager.cpp | 14 +++++++-------
src/replica/test/mock_utils.h | 4 ++--
src/runtime/rpc/network.cpp | 2 +-
src/runtime/rpc/thrift_message_parser.cpp | 4 ++--
src/runtime/security/kinit_context.cpp | 2 +-
src/server/hotspot_partition_calculator.cpp | 2 +-
src/server/meta_store.cpp | 18 +++++++++---------
src/server/pegasus_server_impl.cpp | 18 +++++++++---------
src/test/function_test/restore_test/test_restore.cpp | 2 +-
src/test/function_test/utils/utils.h | 2 +-
src/test/kill_test/killer_handler_shell.cpp | 4 ++--
src/test/kill_test/process_kill_testor.cpp | 2 +-
src/utils/fmt_logging.h | 4 ++--
35 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/src/aio/aio_task.cpp b/src/aio/aio_task.cpp
index 2488999af..019074e09 100644
--- a/src/aio/aio_task.cpp
+++ b/src/aio/aio_task.cpp
@@ -51,7 +51,7 @@ void aio_task::collapse()
::memcpy(dest, b.buffer, b.size);
dest += b.size;
}
- dcheck_eq(dest - buffer.get(), _aio_ctx->buffer_size);
+ CHECK_EQ(dest - buffer.get(), _aio_ctx->buffer_size);
_aio_ctx->buffer = buffer.get();
_merged_write_buffer_holder.assign(std::move(buffer), 0,
_aio_ctx->buffer_size);
}
diff --git a/src/base/pegasus_value_schema.h b/src/base/pegasus_value_schema.h
index b1283563e..76313d26e 100644
--- a/src/base/pegasus_value_schema.h
+++ b/src/base/pegasus_value_schema.h
@@ -97,7 +97,7 @@ pegasus_extract_user_data(uint32_t version, std::string
&&raw_value, ::dsn::blob
/// Extracts timetag from a v1 value.
inline uint64_t pegasus_extract_timetag(int version, dsn::string_view value)
{
- dcheck_eq(version, 1);
+ CHECK_EQ(version, 1);
dsn::data_input input(value);
input.skip(sizeof(uint32_t));
diff --git a/src/block_service/test/fds_service_test.cpp
b/src/block_service/test/fds_service_test.cpp
index 03e5e64ab..aacb1262a 100644
--- a/src/block_service/test/fds_service_test.cpp
+++ b/src/block_service/test/fds_service_test.cpp
@@ -102,7 +102,7 @@ void FDSClientTest::SetUp()
fclose(fp);
std::stringstream ss;
- dcheck_eq(utils::pipe_execute((std::string("md5sum ") +
f1.filename).c_str(), ss), 0);
+ CHECK_EQ(utils::pipe_execute((std::string("md5sum ") +
f1.filename).c_str(), ss), 0);
ss >> f1.md5;
// well, the string of each line in _test_file is 32
f1.length = 32 * lines;
@@ -118,7 +118,7 @@ void FDSClientTest::SetUp()
fclose(fp);
std::stringstream ss;
- dcheck_eq(utils::pipe_execute((std::string("md5sum ") +
f2.filename).c_str(), ss), 0);
+ CHECK_EQ(utils::pipe_execute((std::string("md5sum ") +
f2.filename).c_str(), ss), 0);
ss >> f2.md5;
// well, the string of each line in _test_file is 32
f2.length = 32 * lines;
diff --git a/src/client/partition_resolver_simple.cpp
b/src/client/partition_resolver_simple.cpp
index 2d39e4fc2..79351ed63 100644
--- a/src/client/partition_resolver_simple.cpp
+++ b/src/client/partition_resolver_simple.cpp
@@ -372,7 +372,7 @@ void
partition_resolver_simple::query_config_reply(error_code err,
if (!reqs2.empty()) {
if (_app_partition_count != -1) {
for (auto &req : reqs2) {
- dcheck_eq(req->partition_index, -1);
+ CHECK_EQ(req->partition_index, -1);
req->partition_index =
get_partition_index(_app_partition_count,
req->partition_hash);
}
diff --git a/src/client/replication_ddl_client.cpp
b/src/client/replication_ddl_client.cpp
index 05c404460..10180a330 100644
--- a/src/client/replication_ddl_client.cpp
+++ b/src/client/replication_ddl_client.cpp
@@ -100,7 +100,7 @@ dsn::error_code
replication_ddl_client::wait_app_ready(const std::string &app_na
<< std::endl;
return query_resp.err;
}
- dcheck_eq(partition_count, query_resp.partition_count);
+ CHECK_EQ(partition_count, query_resp.partition_count);
int ready_count = 0;
for (int i = 0; i < partition_count; i++) {
const partition_configuration &pc = query_resp.partitions[i];
@@ -385,8 +385,8 @@ dsn::error_code replication_ddl_client::list_apps(const
dsn::app_status::type st
LOG_ERROR("list app(%s) failed, err = %s",
info.app_name.c_str(), r.to_string());
return r;
}
- dcheck_eq(info.app_id, app_id);
- dcheck_eq(info.partition_count, partition_count);
+ CHECK_EQ(info.app_id, app_id);
+ CHECK_EQ(info.partition_count, partition_count);
int fully_healthy = 0;
int write_unhealthy = 0;
int read_unhealthy = 0;
diff --git a/src/common/fs_manager.cpp b/src/common/fs_manager.cpp
index 2e554df5d..ec92caed3 100644
--- a/src/common/fs_manager.cpp
+++ b/src/common/fs_manager.cpp
@@ -171,7 +171,7 @@ dsn::error_code fs_manager::initialize(const
std::vector<std::string> &data_dirs
bool for_test)
{
// create all dir_nodes
- dcheck_eq(data_dirs.size(), tags.size());
+ CHECK_EQ(data_dirs.size(), tags.size());
for (unsigned i = 0; i < data_dirs.size(); ++i) {
std::string norm_path;
utils::filesystem::get_normalized_path(data_dirs[i], norm_path);
diff --git a/src/geo/lib/latlng_codec.cpp b/src/geo/lib/latlng_codec.cpp
index 2f26d6577..87b1f405c 100644
--- a/src/geo/lib/latlng_codec.cpp
+++ b/src/geo/lib/latlng_codec.cpp
@@ -71,7 +71,7 @@ void extract_indices(const std::string &line,
bool latlng_codec::decode_from_value(const std::string &value, S2LatLng
&latlng) const
{
- dcheck_eq(_sorted_indices.size(), 2);
+ CHECK_EQ(_sorted_indices.size(), 2);
std::vector<std::string> data;
extract_indices(value, _sorted_indices, data, '|');
if (data.size() != 2) {
@@ -92,7 +92,7 @@ bool latlng_codec::decode_from_value(const std::string
&value, S2LatLng &latlng)
bool latlng_codec::encode_to_value(double lat_degrees, double lng_degrees,
std::string &value) const
{
- dcheck_eq(_sorted_indices.size(), 2);
+ CHECK_EQ(_sorted_indices.size(), 2);
S2LatLng latlng = S2LatLng::FromDegrees(lat_degrees, lng_degrees);
if (!latlng.is_valid()) {
LOG_ERROR_F("latlng is invalid. lat_degrees={}, lng_degrees={}",
lat_degrees, lng_degrees);
diff --git a/src/geo/test/geo_test.cpp b/src/geo/test/geo_test.cpp
index 27b948880..222296108 100644
--- a/src/geo/test/geo_test.cpp
+++ b/src/geo/test/geo_test.cpp
@@ -45,7 +45,7 @@ public:
CHECK(ok, "load_meta_servers failed");
auto ddl_client = new
dsn::replication::replication_ddl_client(meta_list);
dsn::error_code error = ddl_client->create_app("temp_geo", "pegasus",
4, 3, {}, false);
- dcheck_eq(dsn::ERR_OK, error);
+ CHECK_EQ(dsn::ERR_OK, error);
_geo_client.reset(new pegasus::geo::geo_client("config.ini", "onebox",
"temp", "temp_geo"));
}
diff --git a/src/http/http_call_registry.h b/src/http/http_call_registry.h
index dca1df653..cf5ae11f9 100644
--- a/src/http/http_call_registry.h
+++ b/src/http/http_call_registry.h
@@ -47,7 +47,7 @@ public:
{
auto call = std::shared_ptr<http_call>(call_uptr.release());
std::lock_guard<std::mutex> guard(_mu);
- dcheck_eq(_call_map.count(call->path), 0);
+ CHECK_EQ(_call_map.count(call->path), 0);
_call_map[call->path] = call;
}
diff --git a/src/http/http_message_parser.cpp b/src/http/http_message_parser.cpp
index c20b77973..4b96090a7 100644
--- a/src/http/http_message_parser.cpp
+++ b/src/http/http_message_parser.cpp
@@ -219,7 +219,7 @@ void http_message_parser::prepare_on_send(message_ex *msg)
dsn_size -= buf.length();
++dsn_buf_count;
}
- dcheck_eq(dsn_size, 0);
+ CHECK_EQ(dsn_size, 0);
buffers.resize(dsn_buf_count);
}
diff --git a/src/http/uri_decoder.cpp b/src/http/uri_decoder.cpp
index 1eeeed063..f36c9f9bb 100644
--- a/src/http/uri_decoder.cpp
+++ b/src/http/uri_decoder.cpp
@@ -40,7 +40,7 @@ error_with<char> from_hex(const char c)
error_with<char> decode_char(const string_view &hex)
{
- dcheck_eq(2, hex.size());
+ CHECK_EQ(2, hex.size());
auto high = from_hex(hex[0]);
auto low = from_hex(hex[1]);
diff --git a/src/meta/backup_engine.cpp b/src/meta/backup_engine.cpp
index a205ba622..001b64ab0 100644
--- a/src/meta/backup_engine.cpp
+++ b/src/meta/backup_engine.cpp
@@ -197,8 +197,8 @@ void backup_engine::backup_app_partition(const gpid &pid)
inline void backup_engine::handle_replica_backup_failed(const backup_response
&response,
const gpid pid)
{
- dcheck_eq(response.pid, pid);
- dcheck_eq(response.backup_id, _cur_backup.backup_id);
+ CHECK_EQ(response.pid, pid);
+ CHECK_EQ(response.backup_id, _cur_backup.backup_id);
LOG_ERROR_F("backup_id({}): backup for partition {} failed, response.err:
{}",
_cur_backup.backup_id,
@@ -256,8 +256,8 @@ void backup_engine::on_backup_reply(const error_code err,
};
if (response.progress == cold_backup_constant::PROGRESS_FINISHED) {
- dcheck_eq(response.pid, pid);
- dcheck_eq(response.backup_id, _cur_backup.backup_id);
+ CHECK_EQ(response.pid, pid);
+ CHECK_EQ(response.backup_id, _cur_backup.backup_id);
LOG_INFO_F("backup_id({}): backup for partition {} completed.",
_cur_backup.backup_id,
pid.to_string());
diff --git a/src/meta/meta_backup_service.cpp b/src/meta/meta_backup_service.cpp
index e8ea2bb61..bcc4673c6 100644
--- a/src/meta/meta_backup_service.cpp
+++ b/src/meta/meta_backup_service.cpp
@@ -118,7 +118,7 @@ void policy_context::start_backup_app_meta_unlocked(int32_t
app_id)
LPC_DEFAULT_CALLBACK,
[this, remote_file, buffer, app_id](const
dist::block_service::write_response &resp) {
if (resp.err == dsn::ERR_OK) {
- dcheck_eq(resp.written_size, buffer.length());
+ CHECK_EQ(resp.written_size, buffer.length());
{
zauto_lock l(_lock);
LOG_INFO("%s: successfully backup app metadata to %s",
diff --git a/src/meta/server_load_balancer.cpp
b/src/meta/server_load_balancer.cpp
index 05ca80081..3ed7758e3 100644
--- a/src/meta/server_load_balancer.cpp
+++ b/src/meta/server_load_balancer.cpp
@@ -188,7 +188,7 @@ void server_load_balancer::apply_balancer(meta_view view,
const migration_list &
configuration_balancer_response resp;
for (auto &pairs : ml) {
register_proposals(view, *pairs.second, resp);
- // TODO(yingchun): use dcheck_eq instead
+ // TODO(yingchun): use CHECK_EQ instead
if (resp.err != dsn::ERR_OK) {
const dsn::gpid &pid = pairs.first;
CHECK(false,
diff --git a/src/replica/duplication/duplication_pipeline.cpp
b/src/replica/duplication/duplication_pipeline.cpp
index 060d025d6..c4c395710 100644
--- a/src/replica/duplication/duplication_pipeline.cpp
+++ b/src/replica/duplication/duplication_pipeline.cpp
@@ -89,7 +89,7 @@ void ship_mutation::run(decree &&last_decree,
mutation_tuple_set &&in)
void ship_mutation::update_progress()
{
- dcheck_eq_replica(
+ CHECK_EQ_PREFIX(
_duplicator->update_progress(duplication_progress().set_last_decree(_last_decree)),
error_s::ok());
diff --git a/src/replica/duplication/replica_duplicator_manager.cpp
b/src/replica/duplication/replica_duplicator_manager.cpp
index c261cb084..3b96ffd61 100644
--- a/src/replica/duplication/replica_duplicator_manager.cpp
+++ b/src/replica/duplication/replica_duplicator_manager.cpp
@@ -75,7 +75,7 @@ void replica_duplicator_manager::sync_duplication(const
duplication_entry &ent)
} else {
// update progress
duplication_progress newp =
dup->progress().set_confirmed_decree(it->second);
- dcheck_eq_replica(dup->update_progress(newp), error_s::ok());
+ CHECK_EQ_PREFIX(dup->update_progress(newp), error_s::ok());
dup->update_status_if_needed(next_status);
if (ent.__isset.fail_mode) {
dup->update_fail_mode(ent.fail_mode);
diff --git a/src/replica/mutation_log.cpp b/src/replica/mutation_log.cpp
index 3dca029d7..99cd120f0 100644
--- a/src/replica/mutation_log.cpp
+++ b/src/replica/mutation_log.cpp
@@ -118,7 +118,7 @@ void mutation_log_shared::write_pending_mutations(bool
release_lock_required)
dassert(_pending_write != nullptr, "");
dassert(_pending_write->size() > 0, "pending write size = %d",
(int)_pending_write->size());
auto pr = mark_new_offset(_pending_write->size(), false);
- dcheck_eq(pr.second, _pending_write->start_offset());
+ CHECK_EQ(pr.second, _pending_write->start_offset());
_is_writing.store(true, std::memory_order_release);
@@ -157,7 +157,7 @@ void
mutation_log_shared::commit_pending_mutations(log_file_ptr &lf,
}
if (err == ERR_OK) {
- dcheck_eq(sz, pending->size());
+ CHECK_EQ(sz, pending->size());
if (_force_flush) {
// flush to ensure that shared log data synced to disk
@@ -372,7 +372,7 @@ void mutation_log_private::write_pending_mutations(bool
release_lock_required)
dassert(_pending_write != nullptr, "");
dassert(_pending_write->size() > 0, "pending write size = %d",
(int)_pending_write->size());
auto pr = mark_new_offset(_pending_write->size(), false);
- dcheck_eq_replica(pr.second, _pending_write->start_offset());
+ CHECK_EQ_PREFIX(pr.second, _pending_write->start_offset());
_is_writing.store(true, std::memory_order_release);
@@ -433,7 +433,7 @@ void
mutation_log_private::commit_pending_mutations(log_file_ptr &lf,
}
return;
}
- dcheck_eq(sz, pending->size());
+ CHECK_EQ(sz, pending->size());
// flush to ensure that there is no gap between private log and
in-memory buffer
// so that we can get all mutations in learning process.
@@ -1065,7 +1065,7 @@ void mutation_log::update_max_decree_no_lock(gpid gpid,
decree d)
dassert(false, "replica has not been registered in the log
before");
}
} else {
- dcheck_eq(gpid, _private_gpid);
+ CHECK_EQ(gpid, _private_gpid);
if (d > _private_log_info.max_decree) {
_private_log_info.max_decree = d;
}
@@ -1199,7 +1199,7 @@ void mutation_log::get_parent_mutations_and_logs(gpid pid,
uint64_t &total_file_size)
const
{
dassert(_is_private, "this method is only valid for private logs");
- dcheck_eq(_private_gpid, pid);
+ CHECK_EQ(_private_gpid, pid);
mutation_list.clear();
files.clear();
@@ -1382,7 +1382,7 @@ int mutation_log::garbage_collection(gpid gpid,
for (auto it = files.begin(); it != files.end() && it->second->index() <=
largest_to_delete;
++it) {
log_file_ptr log = it->second;
- dcheck_eq(it->first, log->index());
+ CHECK_EQ(it->first, log->index());
// close first
log->close();
diff --git a/src/replica/replica.cpp b/src/replica/replica.cpp
index 6545f3824..d5c9cd28d 100644
--- a/src/replica/replica.cpp
+++ b/src/replica/replica.cpp
@@ -365,7 +365,7 @@ void replica::execute_mutation(mutation_ptr &mu)
break;
case partition_status::PS_PARTITION_SPLIT:
if (_split_states.is_caught_up) {
- dcheck_eq(_app->last_committed_decree() + 1, d);
+ CHECK_EQ(_app->last_committed_decree() + 1, d);
err = _app->apply_mutation(mu);
}
break;
diff --git a/src/replica/replica_backup.cpp b/src/replica/replica_backup.cpp
index cbb40c091..451df4387 100644
--- a/src/replica/replica_backup.cpp
+++ b/src/replica/replica_backup.cpp
@@ -81,7 +81,7 @@ void replica::on_cold_backup(const backup_request &request,
/*out*/ backup_respo
: _options->cold_backup_root;
}
- dcheck_eq_replica(backup_context->request.policy.policy_name,
policy_name);
+ CHECK_EQ_PREFIX(backup_context->request.policy.policy_name,
policy_name);
cold_backup_status backup_status = backup_context->status();
if (backup_context->request.backup_id < backup_id || backup_status ==
ColdBackupCanceled) {
diff --git a/src/replica/replica_config.cpp b/src/replica/replica_config.cpp
index 6efcbb8de..58ff311a3 100644
--- a/src/replica/replica_config.cpp
+++ b/src/replica/replica_config.cpp
@@ -636,7 +636,7 @@ void replica::update_deny_client(const
std::map<std::string, std::string> &envs)
std::vector<std::string> sub_sargs;
utils::split_args(env_iter->second.c_str(), sub_sargs, '*', true);
- dcheck_eq_replica(sub_sargs.size(), 2);
+ CHECK_EQ_PREFIX(sub_sargs.size(), 2);
_deny_client.reconfig = (sub_sargs[0] == "reconfig");
_deny_client.read = (sub_sargs[1] == "read" || sub_sargs[1] == "all");
diff --git a/src/replica/replica_init.cpp b/src/replica/replica_init.cpp
index d510cd86d..1d90786a7 100644
--- a/src/replica/replica_init.cpp
+++ b/src/replica/replica_init.cpp
@@ -452,7 +452,7 @@ bool replica::replay_mutation(mutation_ptr &mu, bool
is_private)
// prepare
_uniq_timestamp_us.try_update(mu->data.header.timestamp);
error_code err = _prepare_list->prepare(mu, partition_status::PS_INACTIVE);
- dcheck_eq_replica(err, ERR_OK);
+ CHECK_EQ_PREFIX(err, ERR_OK);
return true;
}
diff --git a/src/replica/replication_app_base.cpp
b/src/replica/replication_app_base.cpp
index f77dc248c..de9d1ccc0 100644
--- a/src/replica/replication_app_base.cpp
+++ b/src/replica/replication_app_base.cpp
@@ -80,7 +80,7 @@ error_code write_blob_to_file(const std::string &file, const
blob &data)
file::flush(hfile);
file::close(hfile);
ERR_LOG_AND_RETURN_NOT_OK(err, "write file {} failed", tmp_file);
- dcheck_eq(data.length(), sz);
+ CHECK_EQ(data.length(), sz);
// TODO(yingchun): need fsync too？
ERR_LOG_AND_RETURN_NOT_TRUE(utils::filesystem::rename_path(tmp_file, file),
ERR_FILE_OPERATION_FAILED,
@@ -323,7 +323,7 @@ error_code replication_app_base::open()
argv[idx++] = (char *)(kv.second.c_str());
}
}
- dcheck_eq(argc, idx);
+ CHECK_EQ(argc, idx);
return start(argc, argv);
}
@@ -369,8 +369,8 @@ error_code replication_app_base::apply_mutation(const
mutation *mu)
{
FAIL_POINT_INJECT_F("replication_app_base_apply_mutation", [](string_view)
{ return ERR_OK; });
- dcheck_eq_replica(mu->data.header.decree, last_committed_decree() + 1);
- dcheck_eq_replica(mu->data.updates.size(), mu->client_requests.size());
+ CHECK_EQ_PREFIX(mu->data.header.decree, last_committed_decree() + 1);
+ CHECK_EQ_PREFIX(mu->data.updates.size(), mu->client_requests.size());
dcheck_gt_replica(mu->data.updates.size(), 0);
if (_replica->status() == partition_status::PS_PRIMARY) {
diff --git a/src/replica/split/replica_split_manager.cpp
b/src/replica/split/replica_split_manager.cpp
index 93a4d4d77..0bf043a66 100644
--- a/src/replica/split/replica_split_manager.cpp
+++ b/src/replica/split/replica_split_manager.cpp
@@ -238,7 +238,7 @@ void replica_split_manager::parent_prepare_states(const
std::string &dir) // on
std::make_shared<prepare_list>(_replica, *_replica->_prepare_list);
plist->truncate(last_committed_decree());
- dcheck_eq(last_committed_decree(), checkpoint_decree);
+ CHECK_EQ(last_committed_decree(), checkpoint_decree);
dcheck_ge(mutation_list.size(), 0);
dcheck_ge(files.size(), 0);
LOG_INFO_PREFIX("prepare state succeed: {} mutations, {} private log
files, total file size = "
@@ -724,7 +724,7 @@ void
replica_split_manager::parent_send_update_partition_count_request(
{
FAIL_POINT_INJECT_F("replica_parent_update_partition_count_request",
[](dsn::string_view) {});
- dcheck_eq_replica(status(), partition_status::PS_PRIMARY);
+ CHECK_EQ_PREFIX(status(), partition_status::PS_PRIMARY);
auto request = make_unique<update_child_group_partition_count_request>();
request->new_partition_count = new_partition_count;
@@ -772,7 +772,7 @@ void
replica_split_manager::on_update_child_group_partition_count(
return;
}
- dcheck_eq_replica(_replica->_app_info.partition_count * 2,
request.new_partition_count);
+ CHECK_EQ_PREFIX(_replica->_app_info.partition_count * 2,
request.new_partition_count);
update_local_partition_count(request.new_partition_count);
response.err = ERR_OK;
}
@@ -935,7 +935,7 @@ void replica_split_manager::parent_send_register_request(
{
FAIL_POINT_INJECT_F("replica_parent_send_register_request",
[](dsn::string_view) {});
- dcheck_eq_replica(status(), partition_status::PS_INACTIVE);
+ CHECK_EQ_PREFIX(status(), partition_status::PS_INACTIVE);
LOG_INFO_PREFIX(
"send register child({}) request to meta_server, current ballot = {},
child ballot = {}",
request.child_config.pid,
@@ -1038,7 +1038,7 @@ void
replica_split_manager::on_register_child_on_meta_reply(
enum_to_string(status()));
dcheck_ge_replica(response.parent_config.ballot, get_ballot());
- dcheck_eq_replica(_replica->_app_info.partition_count * 2,
response.app.partition_count);
+ CHECK_EQ_PREFIX(_replica->_app_info.partition_count * 2,
response.app.partition_count);
_stub->split_replica_exec(LPC_PARTITION_SPLIT,
response.child_config.pid,
@@ -1129,8 +1129,8 @@ void replica_split_manager::trigger_primary_parent_split(
const int32_t meta_partition_count,
const split_status::type meta_split_status) // on primary parent partition
{
- dcheck_eq_replica(status(), partition_status::PS_PRIMARY);
- dcheck_eq_replica(_replica->_app_info.partition_count * 2,
meta_partition_count);
+ CHECK_EQ_PREFIX(status(), partition_status::PS_PRIMARY);
+ CHECK_EQ_PREFIX(_replica->_app_info.partition_count * 2,
meta_partition_count);
LOG_INFO_PREFIX(
"app({}) partition count changed, local({}) VS meta({}), split_status
local({}) "
"VS meta({})",
diff --git a/src/replica/test/mock_utils.h b/src/replica/test/mock_utils.h
index 7048d537d..10f9d2a82 100644
--- a/src/replica/test/mock_utils.h
+++ b/src/replica/test/mock_utils.h
@@ -142,8 +142,8 @@ public:
new mutation_log_private(log_dir,
_options->log_private_file_size_mb, get_gpid(), this);
error_code err =
- _private_log->open(nullptr, [this](error_code err) {
dcheck_eq_replica(err, ERR_OK); });
- dcheck_eq_replica(err, ERR_OK);
+ _private_log->open(nullptr, [this](error_code err) {
CHECK_EQ_PREFIX(err, ERR_OK); });
+ CHECK_EQ_PREFIX(err, ERR_OK);
}
void init_private_log(mutation_log_ptr log) { _private_log =
std::move(log); }
diff --git a/src/runtime/rpc/network.cpp b/src/runtime/rpc/network.cpp
index 04603fb4d..2d3eca52d 100644
--- a/src/runtime/rpc/network.cpp
+++ b/src/runtime/rpc/network.cpp
@@ -74,7 +74,7 @@ void rpc_session::set_connected()
{
utils::auto_lock<utils::ex_lock_nr> l(_lock);
- dcheck_eq(_connect_state, SS_CONNECTING);
+ CHECK_EQ(_connect_state, SS_CONNECTING);
_connect_state = SS_CONNECTED;
}
diff --git a/src/runtime/rpc/thrift_message_parser.cpp
b/src/runtime/rpc/thrift_message_parser.cpp
index 2987da143..4838082b6 100644
--- a/src/runtime/rpc/thrift_message_parser.cpp
+++ b/src/runtime/rpc/thrift_message_parser.cpp
@@ -218,7 +218,7 @@ message_ex
*thrift_message_parser::parse_request_body_v0(message_reader *reader,
: HEADER_LENGTH_V0 - reader->_buffer_occupied);
msg->header->body_length = _meta_v0->body_length;
- dcheck_eq(msg->header->body_length, msg->buffers[1].size());
+ CHECK_EQ(msg->header->body_length, msg->buffers[1].size());
msg->header->gpid.set_app_id(_meta_v0->app_id);
msg->header->gpid.set_partition_index(_meta_v0->partition_index);
msg->header->client.timeout_ms = _meta_v0->client_timeout;
@@ -267,7 +267,7 @@ message_ex
*thrift_message_parser::parse_request_body_v1(message_reader *reader,
: HEADER_LENGTH_V1 - reader->_buffer_occupied);
msg->header->body_length = _v1_specific_vars->_body_length;
- dcheck_eq(msg->header->body_length, msg->buffers[1].size());
+ CHECK_EQ(msg->header->body_length, msg->buffers[1].size());
msg->header->gpid.set_app_id(_v1_specific_vars->_meta_v1->app_id);
msg->header->gpid.set_partition_index(_v1_specific_vars->_meta_v1->partition_index);
msg->header->client.timeout_ms =
_v1_specific_vars->_meta_v1->client_timeout;
diff --git a/src/runtime/security/kinit_context.cpp
b/src/runtime/security/kinit_context.cpp
index 39951638c..e42b0abaa 100644
--- a/src/runtime/security/kinit_context.cpp
+++ b/src/runtime/security/kinit_context.cpp
@@ -166,7 +166,7 @@ void kinit_context::init_krb5_ctx()
static std::once_flag once;
std::call_once(once, [&]() {
int64_t err = krb5_init_context(&_krb5_context);
- dcheck_eq(err, 0);
+ CHECK_EQ(err, 0);
});
}
diff --git a/src/server/hotspot_partition_calculator.cpp
b/src/server/hotspot_partition_calculator.cpp
index 52c922e09..3dd2ca607 100644
--- a/src/server/hotspot_partition_calculator.cpp
+++ b/src/server/hotspot_partition_calculator.cpp
@@ -132,7 +132,7 @@ void
hotspot_partition_calculator::stat_histories_analyse(uint32_t data_type,
void hotspot_partition_calculator::update_hot_point(uint32_t data_type,
const std::vector<int>
&hot_points)
{
- dcheck_eq(_hot_points.size(), hot_points.size());
+ CHECK_EQ(_hot_points.size(), hot_points.size());
int size = hot_points.size();
uint32_t hotspot_count = 0;
for (int i = 0; i < size; i++) {
diff --git a/src/server/meta_store.cpp b/src/server/meta_store.cpp
index 71581a4da..ab097140d 100644
--- a/src/server/meta_store.cpp
+++ b/src/server/meta_store.cpp
@@ -43,7 +43,7 @@ uint64_t meta_store::get_last_flushed_decree() const
{
uint64_t last_flushed_decree = 0;
auto ec = get_value_from_meta_cf(true, LAST_FLUSHED_DECREE,
&last_flushed_decree);
- dcheck_eq_replica(::dsn::ERR_OK, ec);
+ CHECK_EQ_PREFIX(::dsn::ERR_OK, ec);
return last_flushed_decree;
}
@@ -51,7 +51,7 @@ uint32_t meta_store::get_data_version() const
{
uint64_t pegasus_data_version = 0;
auto ec = get_value_from_meta_cf(false, DATA_VERSION,
&pegasus_data_version);
- dcheck_eq_replica(::dsn::ERR_OK, ec);
+ CHECK_EQ_PREFIX(::dsn::ERR_OK, ec);
return static_cast<uint32_t>(pegasus_data_version);
}
@@ -60,7 +60,7 @@ uint64_t meta_store::get_last_manual_compact_finish_time()
const
uint64_t last_manual_compact_finish_time = 0;
auto ec = get_value_from_meta_cf(
false, LAST_MANUAL_COMPACT_FINISH_TIME,
&last_manual_compact_finish_time);
- dcheck_eq_replica(::dsn::ERR_OK, ec);
+ CHECK_EQ_PREFIX(::dsn::ERR_OK, ec);
return last_manual_compact_finish_time;
}
@@ -69,7 +69,7 @@ uint64_t meta_store::get_decree_from_readonly_db(rocksdb::DB
*db,
{
uint64_t last_flushed_decree = 0;
auto ec = get_value_from_meta_cf(db, meta_cf, true, LAST_FLUSHED_DECREE,
&last_flushed_decree);
- dcheck_eq_replica(::dsn::ERR_OK, ec);
+ CHECK_EQ_PREFIX(::dsn::ERR_OK, ec);
return last_flushed_decree;
}
@@ -162,25 +162,25 @@ std::string meta_store::get_usage_scenario() const
void meta_store::set_last_flushed_decree(uint64_t decree) const
{
- dcheck_eq_replica(::dsn::ERR_OK, set_value_to_meta_cf(LAST_FLUSHED_DECREE,
decree));
+ CHECK_EQ_PREFIX(::dsn::ERR_OK, set_value_to_meta_cf(LAST_FLUSHED_DECREE,
decree));
}
void meta_store::set_data_version(uint32_t version) const
{
- dcheck_eq_replica(::dsn::ERR_OK, set_value_to_meta_cf(DATA_VERSION,
version));
+ CHECK_EQ_PREFIX(::dsn::ERR_OK, set_value_to_meta_cf(DATA_VERSION,
version));
}
void meta_store::set_last_manual_compact_finish_time(uint64_t
last_manual_compact_finish_time) const
{
- dcheck_eq_replica(
+ CHECK_EQ_PREFIX(
::dsn::ERR_OK,
set_value_to_meta_cf(LAST_MANUAL_COMPACT_FINISH_TIME,
last_manual_compact_finish_time));
}
void meta_store::set_usage_scenario(const std::string &usage_scenario) const
{
- dcheck_eq_replica(::dsn::ERR_OK,
-
set_string_value_to_meta_cf(ROCKSDB_ENV_USAGE_SCENARIO_KEY, usage_scenario));
+ CHECK_EQ_PREFIX(::dsn::ERR_OK,
+
set_string_value_to_meta_cf(ROCKSDB_ENV_USAGE_SCENARIO_KEY, usage_scenario));
}
} // namespace server
diff --git a/src/server/pegasus_server_impl.cpp
b/src/server/pegasus_server_impl.cpp
index 84581cc66..1bad6aea4 100644
--- a/src/server/pegasus_server_impl.cpp
+++ b/src/server/pegasus_server_impl.cpp
@@ -1652,9 +1652,9 @@ dsn::error_code pegasus_server_impl::start(int argc, char
**argv)
LOG_ERROR_PREFIX("rocksdb::DB::Open failed, error = {}",
status.ToString());
return dsn::ERR_LOCAL_APP_FAILURE;
}
- dcheck_eq_replica(2, handles_opened.size());
- dcheck_eq_replica(handles_opened[0]->GetName(), DATA_COLUMN_FAMILY_NAME);
- dcheck_eq_replica(handles_opened[1]->GetName(), META_COLUMN_FAMILY_NAME);
+ CHECK_EQ_PREFIX(2, handles_opened.size());
+ CHECK_EQ_PREFIX(handles_opened[0]->GetName(), DATA_COLUMN_FAMILY_NAME);
+ CHECK_EQ_PREFIX(handles_opened[1]->GetName(), META_COLUMN_FAMILY_NAME);
_data_cf = handles_opened[0];
_meta_cf = handles_opened[1];
@@ -1705,7 +1705,7 @@ dsn::error_code pegasus_server_impl::start(int argc, char
**argv)
release_db();
return err;
}
- dcheck_eq_replica(last_flushed, last_durable_decree());
+ CHECK_EQ_PREFIX(last_flushed, last_durable_decree());
}
LOG_INFO_PREFIX("open app succeed, pegasus_data_version = {},
last_durable_decree = {}",
@@ -1913,7 +1913,7 @@ private:
::dsn::utils::auto_lock<::dsn::utils::ex_lock_nr> l(_checkpoints_lock);
dcheck_gt_replica(last_commit, last_durable_decree());
int64_t last_flushed =
static_cast<int64_t>(_meta_store->get_last_flushed_decree());
- dcheck_eq_replica(last_commit, last_flushed);
+ CHECK_EQ_PREFIX(last_commit, last_flushed);
if (!_checkpoints.empty()) {
dcheck_gt_replica(last_commit, _checkpoints.back());
}
@@ -1946,8 +1946,8 @@ private:
// case 1: last_durable == last_flushed == last_commit
// no need to do checkpoint
if (last_durable == last_commit) {
- dcheck_eq_replica(last_durable, last_flushed);
- dcheck_eq_replica(last_flushed, last_commit);
+ CHECK_EQ_PREFIX(last_durable, last_flushed);
+ CHECK_EQ_PREFIX(last_flushed, last_commit);
LOG_INFO_PREFIX(
"no need to checkpoint because last_durable_decree =
last_committed_decree = {}",
last_durable);
@@ -2116,8 +2116,8 @@ private:
cleanup(true);
return ::dsn::ERR_LOCAL_APP_FAILURE;
}
- dcheck_eq_replica(handles_opened.size(), 2);
- dcheck_eq_replica(handles_opened[1]->GetName(),
META_COLUMN_FAMILY_NAME);
+ CHECK_EQ_PREFIX(handles_opened.size(), 2);
+ CHECK_EQ_PREFIX(handles_opened[1]->GetName(), META_COLUMN_FAMILY_NAME);
uint64_t last_flushed_decree =
_meta_store->get_decree_from_readonly_db(snapshot_db,
handles_opened[1]);
*checkpoint_decree = last_flushed_decree;
diff --git a/src/test/function_test/restore_test/test_restore.cpp
b/src/test/function_test/restore_test/test_restore.cpp
index bb86b9dd0..18d36460d 100644
--- a/src/test/function_test/restore_test/test_restore.cpp
+++ b/src/test/function_test/restore_test/test_restore.cpp
@@ -249,7 +249,7 @@ public:
std::stringstream ss;
int ret = dsn::utils::pipe_execute(cmd.c_str(), ss);
std::cout << cmd << " output: " << ss.str() << std::endl;
- dcheck_eq(ret, 0);
+ CHECK_EQ(ret, 0);
std::string result = ss.str();
// should remove \n character
int32_t index = result.size();
diff --git a/src/test/function_test/utils/utils.h
b/src/test/function_test/utils/utils.h
index 6eba86f5b..d592bf49c 100644
--- a/src/test/function_test/utils/utils.h
+++ b/src/test/function_test/utils/utils.h
@@ -74,7 +74,7 @@ generate_sortkey_value_map(const std::vector<std::string>
sortkeys,
const std::vector<std::string> values)
{
std::map<std::string, std::string> result;
- dcheck_eq(sortkeys.size(), values.size());
+ CHECK_EQ(sortkeys.size(), values.size());
int len = sortkeys.size();
for (int i = 0; i < len; i++) {
result.emplace(std::make_pair(sortkeys[i], values[i]));
diff --git a/src/test/kill_test/killer_handler_shell.cpp
b/src/test/kill_test/killer_handler_shell.cpp
index 4817a2fc8..a18e9d2f7 100644
--- a/src/test/kill_test/killer_handler_shell.cpp
+++ b/src/test/kill_test/killer_handler_shell.cpp
@@ -51,7 +51,7 @@ bool killer_handler_shell::has_meta_dumped_core(int index)
std::stringstream output;
int core_count;
- dcheck_eq(dsn::utils::pipe_execute(find_core, output), 0);
+ CHECK_EQ(dsn::utils::pipe_execute(find_core, output), 0);
output >> core_count;
return core_count != 0;
@@ -68,7 +68,7 @@ bool killer_handler_shell::has_replica_dumped_core(int index)
std::stringstream output;
int core_count;
- dcheck_eq(dsn::utils::pipe_execute(find_core, output), 0);
+ CHECK_EQ(dsn::utils::pipe_execute(find_core, output), 0);
output >> core_count;
return core_count != 0;
diff --git a/src/test/kill_test/process_kill_testor.cpp
b/src/test/kill_test/process_kill_testor.cpp
index c9a67101f..1366970bc 100644
--- a/src/test/kill_test/process_kill_testor.cpp
+++ b/src/test/kill_test/process_kill_testor.cpp
@@ -87,7 +87,7 @@ bool process_kill_testor::verifier_process_alive()
std::stringstream output;
int process_count;
- dcheck_eq(dsn::utils::pipe_execute(command, output), 0);
+ CHECK_EQ(dsn::utils::pipe_execute(command, output), 0);
output >> process_count;
// one for the verifier, one for command
diff --git a/src/utils/fmt_logging.h b/src/utils/fmt_logging.h
index 812673bc7..4f33332e0 100644
--- a/src/utils/fmt_logging.h
+++ b/src/utils/fmt_logging.h
@@ -59,13 +59,13 @@
// Macros to check expected condition. It will abort the application
// and log a fatal message when the condition is not met.
-#define dcheck_eq(var1, var2) CHECK(var1 == var2, "{} vs {}", var1, var2)
+#define CHECK_EQ(var1, var2) CHECK(var1 == var2, "{} vs {}", var1, var2)
#define dcheck_ge(var1, var2) CHECK(var1 >= var2, "{} vs {}", var1, var2)
#define dcheck_le(var1, var2) CHECK(var1 <= var2, "{} vs {}", var1, var2)
#define dcheck_gt(var1, var2) CHECK(var1 > var2, "{} vs {}", var1, var2)
#define dcheck_lt(var1, var2) CHECK(var1 < var2, "{} vs {}", var1, var2)
-#define dcheck_eq_replica(var1, var2) dassert_replica(var1 == var2, "{} vs
{}", var1, var2)
+#define CHECK_EQ_PREFIX(var1, var2) dassert_replica(var1 == var2, "{} vs {}",
var1, var2)
#define dcheck_ge_replica(var1, var2) dassert_replica(var1 >= var2, "{} vs
{}", var1, var2)
#define dcheck_le_replica(var1, var2) dassert_replica(var1 <= var2, "{} vs
{}", var1, var2)
#define dcheck_gt_replica(var1, var2) dassert_replica(var1 > var2, "{} vs {}",
var1, var2)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
