refactor: change namesapce: fedb -> openmldb (#101)

* Change name: fedb -> openmldb

* clang format

* NOLINT

Author: altale

src/CMakeLists.txt

@@ -103,7 +103,7 @@ endif()
 add_executable(parse_log tools/parse_log.cc  $<TARGET_OBJECTS:fedb_proto>)
 target_link_libraries(parse_log log fedb_proto base protobuf glog gflags unwind ssl crypto z snappy dl pthread)
 
-add_executable(fedb cmd/fedb.cc base/status.cc proto/client.pb.cc base/linenoise.cc)
-target_link_libraries(fedb ${BIN_LIBS})
+add_executable(openmldb cmd/openmldb.cc base/status.cc proto/client.pb.cc base/linenoise.cc)
+target_link_libraries(openmldb ${BIN_LIBS})
 
 add_subdirectory(sdk)

src/apiserver/api_server_impl.cc

@@ -23,14 +23,14 @@
 #include "apiserver/interface_provider.h"
 #include "brpc/server.h"
 
-namespace fedb {
+namespace openmldb {
 namespace http {
 
 APIServerImpl::~APIServerImpl() = default;
 
 bool APIServerImpl::Init(const sdk::ClusterOptions& options) {
     // If cluster sdk is needed, use ptr, don't own it. SQLClusterRouter owns it.
-    auto cluster_sdk = new ::fedb::sdk::ClusterSDK(options);
+    auto cluster_sdk = new ::openmldb::sdk::ClusterSDK(options);
     bool ok = cluster_sdk->Init();
     if (!ok) {
         LOG(ERROR) << "Fail to connect to db";
@@ -39,10 +39,10 @@ bool APIServerImpl::Init(const sdk::ClusterOptions& options) {
     return Init(cluster_sdk);
 }
 
-bool APIServerImpl::Init(::fedb::sdk::ClusterSDK* cluster) {
+bool APIServerImpl::Init(::openmldb::sdk::ClusterSDK* cluster) {
     // If cluster sdk is needed, use ptr, don't own it. SQLClusterRouter owns it.
     cluster_sdk_ = cluster;
-    auto router = std::make_shared<::fedb::sdk::SQLClusterRouter>(cluster_sdk_);
+    auto router = std::make_shared<::openmldb::sdk::SQLClusterRouter>(cluster_sdk_);
     if (!router->Init()) {
         LOG(ERROR) << "Fail to connect to db";
         return false;
@@ -75,7 +75,7 @@ void APIServerImpl::Process(google::protobuf::RpcController* cntl_base, const Ht
 
 bool APIServerImpl::Json2SQLRequestRow(const butil::rapidjson::Value& non_common_cols_v,
                                        const butil::rapidjson::Value& common_cols_v,
-                                       std::shared_ptr<fedb::sdk::SQLRequestRow> row) {
+                                       std::shared_ptr<openmldb::sdk::SQLRequestRow> row) {
     auto sch = row->GetSchema();
 
     // scan all strings to init the total string length
@@ -172,7 +172,7 @@ bool APIServerImpl::AppendJsonValue(const butil::rapidjson::Value& v, hybridse::
                 return false;
             }
             std::vector<std::string> parts;
-            ::fedb::base::SplitString(v.GetString(), "-", parts);
+            ::openmldb::base::SplitString(v.GetString(), "-", parts);
             if (parts.size() != 3) {
                 return false;
             }
@@ -315,7 +315,7 @@ void APIServerImpl::RegisterExecSP() {
         const auto& schema_impl = dynamic_cast<const ::hybridse::sdk::SchemaImpl&>(sp_info->GetInputSchema());
         // Hard copy, and RequestRow needs shared schema
         auto input_schema = std::make_shared<::hybridse::sdk::SchemaImpl>(schema_impl.GetSchema());
-        auto common_column_indices = std::make_shared<fedb::sdk::ColumnIndicesSet>(input_schema);
+        auto common_column_indices = std::make_shared<openmldb::sdk::ColumnIndicesSet>(input_schema);
         decltype(common_cols_v.Size()) expected_common_size = 0;
         for (int i = 0; i < input_schema->GetColumnCnt(); ++i) {
             if (input_schema->IsConstant(i)) {
@@ -435,7 +435,7 @@ void APIServerImpl::RegisterGetTable() {
                       writer.Member("msg") & std::string("ok");
                       writer.Member("tables");
                       writer.StartArray();
-                      for (std::shared_ptr<::fedb::nameserver::TableInfo> table : tables) {
+                      for (std::shared_ptr<::openmldb::nameserver::TableInfo> table : tables) {
                           writer << table;
                       }
                       writer.EndArray();
@@ -648,15 +648,15 @@ JsonWriter& operator&(JsonWriter& ar, GetSPResp& s) {  // NOLINT
 }
 
 JsonWriter& operator&(JsonWriter& ar,  // NOLINT
-                      const ::google::protobuf::RepeatedPtrField<::fedb::common::ColumnDesc>& column_desc) {
+                      const ::google::protobuf::RepeatedPtrField<::openmldb::common::ColumnDesc>& column_desc) {
     ar.StartArray();
     for (auto column : column_desc) {
         ar.StartObject();
         if (column.has_name()) {
             ar.Member("name") & column.name();
         }
         if (column.has_data_type()) {
-            ar.Member("data_type") & ::fedb::type::DataType_Name(column.data_type());
+            ar.Member("data_type") & ::openmldb::type::DataType_Name(column.data_type());
         }
         if (column.has_not_null()) {
             ar.Member("not_null") & column.not_null();
@@ -670,7 +670,7 @@ JsonWriter& operator&(JsonWriter& ar,  // NOLINT
 }
 
 JsonWriter& operator&(JsonWriter& ar,  // NOLINT
-                      const ::google::protobuf::RepeatedPtrField<::fedb::common::ColumnKey>& column_key) {
+                      const ::google::protobuf::RepeatedPtrField<::openmldb::common::ColumnKey>& column_key) {
     ar.StartArray();
     for (auto key : column_key) {
         ar.StartObject();
@@ -695,7 +695,7 @@ JsonWriter& operator&(JsonWriter& ar,  // NOLINT
             auto& ttl = key.ttl();
             ar.StartObject();
             if (ttl.has_ttl_type()) {
-                ar.Member("ttl_type") & ::fedb::type::TTLType_Name(ttl.ttl_type());
+                ar.Member("ttl_type") & ::openmldb::type::TTLType_Name(ttl.ttl_type());
             }
             if (ttl.has_abs_ttl()) {
                 ar.Member("abs_ttl") & ttl.abs_ttl();
@@ -711,7 +711,7 @@ JsonWriter& operator&(JsonWriter& ar,  // NOLINT
 }
 
 JsonWriter& operator&(JsonWriter& ar,  // NOLINT
-                      const ::google::protobuf::RepeatedPtrField<::fedb::common::VersionPair>& schema_versions) {
+                      const ::google::protobuf::RepeatedPtrField<::openmldb::common::VersionPair>& schema_versions) {
     ar.StartArray();
     for (auto version : schema_versions) {
         ar.StartObject();
@@ -726,7 +726,7 @@ JsonWriter& operator&(JsonWriter& ar,  // NOLINT
     return ar.EndArray();
 }
 
-JsonWriter& operator&(JsonWriter& ar, std::shared_ptr<::fedb::nameserver::TableInfo> info) {  // NOLINT
+JsonWriter& operator&(JsonWriter& ar, std::shared_ptr<::openmldb::nameserver::TableInfo> info) {  // NOLINT
     ar.StartObject();
     if (info->has_name()) {
         ar.Member("name") & info->name();
@@ -745,7 +745,7 @@ JsonWriter& operator&(JsonWriter& ar, std::shared_ptr<::fedb::nameserver::TableI
         ar.Member("replica_num") & info->replica_num();
     }
     if (info->has_compress_type()) {
-        ar.Member("compress_type") & ::fedb::type::CompressType_Name(info->compress_type());
+        ar.Member("compress_type") & ::openmldb::type::CompressType_Name(info->compress_type());
     }
     if (info->has_key_entry_max_height()) {
         ar.Member("key_entry_max_height") & info->key_entry_max_height();
@@ -776,4 +776,4 @@ JsonWriter& operator&(JsonWriter& ar, std::shared_ptr<::fedb::nameserver::TableI
 }
 
 }  // namespace http
-}  // namespace fedb
+}  // namespace openmldb

src/apiserver/api_server_impl.h

@@ -28,14 +28,14 @@
 #include "proto/http.pb.h"
 #include "sdk/sql_cluster_router.h"
 
-namespace fedb {
+namespace openmldb {
 namespace http {
 
 using butil::rapidjson::Document;
 using butil::rapidjson::StringBuffer;
 using butil::rapidjson::Writer;
 
-// APIServer is a service for brpc::Server. The entire implement is `StartAPIServer()` in src/cmd/fedb.cc
+// APIServer is a service for brpc::Server. The entire implement is `StartAPIServer()` in src/cmd/openmldb.cc
 // Every request is handled by `Process()`, we will choose the right method of the request by `InterfaceProvider`.
 // InterfaceProvider's url parser supports to parse urls like "/a/:arg1/b/:arg2/:arg3", but doesn't support wildcards.
 // Methods should be registered in `InterfaceProvider` in the init phase.
@@ -45,7 +45,7 @@ class APIServerImpl : public APIServer {
     APIServerImpl() = default;
     ~APIServerImpl() override;
     bool Init(const sdk::ClusterOptions& options);
-    bool Init(::fedb::sdk::ClusterSDK* cluster);
+    bool Init(::openmldb::sdk::ClusterSDK* cluster);
     void Process(google::protobuf::RpcController* cntl_base, const HttpRequest*, HttpResponse*,
                  google::protobuf::Closure* done) override;
 
@@ -58,7 +58,7 @@ class APIServerImpl : public APIServer {
 
     static bool Json2SQLRequestRow(const butil::rapidjson::Value& non_common_cols_v,
                                    const butil::rapidjson::Value& common_cols_v,
-                                   std::shared_ptr<fedb::sdk::SQLRequestRow> row);
+                                   std::shared_ptr<openmldb::sdk::SQLRequestRow> row);
     template <typename T>
     static bool AppendJsonValue(const butil::rapidjson::Value& v, hybridse::sdk::DataType type, bool is_not_null,
                                 T row);
@@ -67,7 +67,7 @@ class APIServerImpl : public APIServer {
     std::shared_ptr<sdk::SQLRouter> sql_router_;
     InterfaceProvider provider_;
     // cluster_sdk_ is not owned by this class.
-    ::fedb::sdk::ClusterSDK* cluster_sdk_;
+    ::openmldb::sdk::ClusterSDK* cluster_sdk_;
 };
 
 struct PutResp {
@@ -114,14 +114,14 @@ JsonWriter& operator&(JsonWriter& ar, std::shared_ptr<hybridse::sdk::ProcedureIn
 JsonWriter& operator&(JsonWriter& ar, GetSPResp& s);  // NOLINT
 
 JsonWriter& operator&(JsonWriter& ar,  // NOLINT
-                      const ::google::protobuf::RepeatedPtrField<::fedb::common::ColumnDesc>& column_desc);
+                      const ::google::protobuf::RepeatedPtrField<::openmldb::common::ColumnDesc>& column_desc);
 
 JsonWriter& operator&(JsonWriter& ar,  // NOLINT
-                      const ::google::protobuf::RepeatedPtrField<::fedb::common::ColumnKey>& column_key);
+                      const ::google::protobuf::RepeatedPtrField<::openmldb::common::ColumnKey>& column_key);
 
-JsonWriter& operator&(JsonWriter& ar, std::shared_ptr<::fedb::nameserver::TableInfo> info);  // NOLINT
+JsonWriter& operator&(JsonWriter& ar, std::shared_ptr<::openmldb::nameserver::TableInfo> info);  // NOLINT
 
 }  // namespace http
-}  // namespace fedb
+}  // namespace openmldb
 
 #endif  // SRC_APISERVER_API_SERVER_IMPL_H_

src/apiserver/api_server_test.cc

@@ -24,7 +24,7 @@
 #include "json2pb/rapidjson.h"
 #include "sdk/mini_cluster.h"
 
-namespace fedb {
+namespace openmldb {
 namespace http {
 
 class APIServerTestEnv : public testing::Environment {
@@ -45,7 +45,7 @@ class APIServerTestEnv : public testing::Environment {
         cluster_options.zk_cluster = mc->GetZkCluster();
         cluster_options.zk_path = mc->GetZkPath();
         // Owned by queue_svc
-        cluster_sdk = new ::fedb::sdk::ClusterSDK(cluster_options);
+        cluster_sdk = new ::openmldb::sdk::ClusterSDK(cluster_options);
         ASSERT_TRUE(cluster_sdk->Init()) << "Fail to connect to db";
         queue_svc.reset(new APIServerImpl);
         ASSERT_TRUE(queue_svc->Init(cluster_sdk));
@@ -95,7 +95,7 @@ class APIServerTestEnv : public testing::Environment {
     }
 
     std::string db;
-    ::fedb::sdk::ClusterSDK* cluster_sdk;
+    ::openmldb::sdk::ClusterSDK* cluster_sdk;
     std::shared_ptr<sdk::MiniCluster> mc;
     std::shared_ptr<APIServerImpl> queue_svc;
     brpc::Server server;
@@ -639,10 +639,10 @@ TEST_F(APIServerTest, getTables) {
 }
 
 }  // namespace http
-}  // namespace fedb
+}  // namespace openmldb
 
 int main(int argc, char* argv[]) {
-    testing::AddGlobalTestEnvironment(fedb::http::APIServerTestEnv::Instance());
+    testing::AddGlobalTestEnvironment(openmldb::http::APIServerTestEnv::Instance());
     ::testing::InitGoogleTest(&argc, argv);
     ::google::ParseCommandLineFlags(&argc, &argv, true);
     return RUN_ALL_TESTS();

src/apiserver/interface_provider.cc

@@ -27,7 +27,7 @@
 #include "boost/algorithm/string/split.hpp"
 #include "glog/logging.h"
 
-namespace fedb {
+namespace openmldb {
 namespace http {
 
 std::vector<std::unique_ptr<PathPart>> Url::parsePath(bool disableIds) const {
@@ -194,4 +194,4 @@ bool InterfaceProvider::handle(const std::string& path, const brpc::HttpMethod&
     return true;
 }
 }  // namespace http
-}  // namespace fedb
+}  // namespace openmldb

src/apiserver/interface_provider.h

@@ -34,7 +34,7 @@
 #include "butil/iobuf.h"       // IOBuf
 #include "proto/http.pb.h"
 
-namespace fedb {
+namespace openmldb {
 namespace http {
 
 class PathPart;
@@ -183,4 +183,4 @@ Archiver& operator&(Archiver& ar, GeneralError& s) {  // NOLINT
 }
 
 }  // namespace http
-}  // namespace fedb
+}  // namespace openmldb

src/apiserver/json_helper.cc

@@ -20,7 +20,7 @@
 
 #include "json2pb/rapidjson.h"  // rapidjson's DOM-style API
 
-namespace fedb {
+namespace openmldb {
 namespace http {
 
 using butil::rapidjson::Document;
@@ -323,4 +323,4 @@ JsonWriter& JsonWriter::SetNull() {
     return *this;
 }
 }  // namespace http
-}  // namespace fedb
+}  // namespace openmldb

src/apiserver/json_helper.h

@@ -20,7 +20,7 @@
 #include <cstddef>
 #include <string>
 
-namespace fedb {
+namespace openmldb {
 namespace http {
 
 /**
@@ -138,6 +138,6 @@ JsonWriter& operator<<(JsonWriter& ar, T& s) {
 }
 
 }  // namespace http
-}  // namespace fedb
+}  // namespace openmldb
 
 #endif  // SRC_APISERVER_JSON_HELPER_H_

src/base/count_down_latch.h

@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-
 #ifndef SRC_BASE_COUNT_DOWN_LATCH_H_
 #define SRC_BASE_COUNT_DOWN_LATCH_H_
-#include <condition_variable> // NOLINT
-#include <mutex> // NOLINT
+#include <condition_variable>  // NOLINT
+#include <mutex>               // NOLINT
 
-namespace fedb {
+namespace openmldb {
 namespace base {
 
 class CountDownLatch {
@@ -64,5 +63,5 @@ class CountDownLatch {
 };
 
 }  // namespace base
-}  // namespace fedb
+}  // namespace openmldb
 #endif  // SRC_BASE_COUNT_DOWN_LATCH_H_

src/base/count_down_latch_test.cc

@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-
 #include "base/count_down_latch.h"
+
 #include "boost/bind.hpp"
-#include "gtest/gtest.h"
 #include "common/thread_pool.h"
-
+#include "gtest/gtest.h"
 
 using ::baidu::common::ThreadPool;
 
-namespace fedb {
+namespace openmldb {
 namespace base {
 
 class CountDownLatchTest : public ::testing::Test {
@@ -63,7 +62,7 @@ TEST_F(CountDownLatchTest, MultiIsDone) {
 }
 
 }  // namespace base
-}  // namespace fedb
+}  // namespace openmldb
 
 int main(int argc, char** argv) {
     ::testing::InitGoogleTest(&argc, argv);