Merge branch 'apache:master' into fix_slog_gc_crash

apache · Feb 7, 2024 · 52395b5 · 52395b5
2 parents 775ced8 + 858433d
commit 52395b5
Show file tree

Hide file tree

Showing 37 changed files with 459 additions and 518 deletions.
diff --git a/scripts/pack_tools.sh b/scripts/pack_tools.sh
@@ -140,11 +140,8 @@ pack_tools_lib() {
     pack_system_lib "${pack}/lib" shell "$1"
 }
 
-pack_tools_lib snappy
 pack_tools_lib crypto
 pack_tools_lib ssl
-pack_tools_lib zstd
-pack_tools_lib lz4
 
 chmod -x ${pack}/lib/*
 

diff --git a/src/base/pegasus_const.cpp b/src/base/pegasus_const.cpp
diff --git a/src/base/pegasus_const.h b/src/base/pegasus_const.h
diff --git a/src/client_lib/pegasus_client_impl.cpp b/src/client_lib/pegasus_client_impl.cpp
@@ -26,7 +26,8 @@
 #include <type_traits>
 #include <utility>
 
-#include "base/pegasus_const.h"
+#include "absl/strings/string_view.h"
+#include "common/common.h"
 #include "common/replication_other_types.h"
 #include "common/serialization_helper/dsn.layer2_types.h"
 #include "pegasus/client.h"
@@ -40,10 +41,8 @@
 #include "runtime/task/task_code.h"
 #include "utils/error_code.h"
 #include "utils/fmt_logging.h"
-#include "absl/strings/string_view.h"
 #include "utils/synchronize.h"
 #include "utils/threadpool_code.h"
-#include "utils/utils.h"
 
 namespace dsn {
 class message_ex;
@@ -65,7 +64,7 @@ pegasus_client_impl::pegasus_client_impl(const char *cluster_name, const char *a
 {
     std::vector<dsn::rpc_address> meta_servers;
     dsn::replication::replica_helper::load_meta_servers(
-        meta_servers, PEGASUS_CLUSTER_SECTION_NAME.c_str(), cluster_name);
+        meta_servers, dsn::PEGASUS_CLUSTER_SECTION_NAME.c_str(), cluster_name);
     CHECK_GT(meta_servers.size(), 0);
     _meta_server.assign_group("meta-servers");
     _meta_server.group_address()->add_list(meta_servers);

diff --git a/src/client_lib/pegasus_scanner_impl.cpp b/src/client_lib/pegasus_scanner_impl.cpp
@@ -27,7 +27,6 @@
 #include <utility>
 #include <vector>
 
-#include "base/pegasus_const.h"
 #include "common/gpid.h"
 #include "pegasus/client.h"
 #include "pegasus/error.h"
@@ -52,6 +51,13 @@ using namespace pegasus;
 namespace pegasus {
 namespace client {
 
+// TODO(yingchun): There are duplicate variables in src/server/pegasus_scan_context.h,
+// because this is in client library, it's better to avoid including too many headers.
+// We can move it to thrift which would be included by both server and client.
+static const int SCAN_CONTEXT_ID_VALID_MIN = 0;
+static const int SCAN_CONTEXT_ID_COMPLETED = -1;
+static const int SCAN_CONTEXT_ID_NOT_EXIST = -2;
+
 pegasus_client_impl::pegasus_scanner_impl::pegasus_scanner_impl(::dsn::apps::rrdb_client *client,
                                                                 std::vector<uint64_t> &&hash,
                                                                 const scan_options &options,

diff --git a/src/common/common.cpp b/src/common/common.cpp
@@ -29,4 +29,6 @@ DSN_DEFINE_string(replication, cluster_name, "", "name of this cluster");
     CHECK(!utils::is_empty(FLAGS_cluster_name), "cluster_name is not set");
     return FLAGS_cluster_name;
 }
+
+const std::string PEGASUS_CLUSTER_SECTION_NAME("pegasus.clusters");
 } // namespace dsn
diff --git a/src/common/common.h b/src/common/common.h
@@ -19,10 +19,14 @@
 
 #pragma once
 
+#include <string>
+
 namespace dsn {
 /// Returns the cluster name (i.e, "onebox") if it's configured under
 /// "replication" section:
 ///    [replication]
 ///      cluster_name = "onebox"
 extern const char *get_current_cluster_name();
+
+extern const std::string PEGASUS_CLUSTER_SECTION_NAME;
 } // namespace dsn