modify sdk

core/src/sdk/examples/partition/src/ClientTest.cpp

@@ -31,45 +31,45 @@
 
 namespace {
 
-const char* TABLE_NAME = milvus_sdk::Utils::GenTableName().c_str();
-
-constexpr int64_t TABLE_DIMENSION = 512;
-constexpr int64_t TABLE_INDEX_FILE_SIZE = 1024;
-constexpr milvus::MetricType TABLE_METRIC_TYPE = milvus::MetricType::L2;
-constexpr int64_t BATCH_ROW_COUNT = 10000;
-constexpr int64_t NQ = 5;
-constexpr int64_t TOP_K = 10;
-constexpr int64_t NPROBE = 32;
-constexpr int64_t SEARCH_TARGET = 5000;  // change this value, result is different
-constexpr milvus::IndexType INDEX_TYPE = milvus::IndexType::IVFSQ8;
-constexpr int32_t N_LIST = 15000;
-constexpr int32_t PARTITION_COUNT = 5;
-constexpr int32_t TARGET_PARTITION = 3;
-
-milvus::TableSchema
-BuildTableSchema() {
-    milvus::TableSchema tb_schema = {TABLE_NAME, TABLE_DIMENSION, TABLE_INDEX_FILE_SIZE, TABLE_METRIC_TYPE};
-    return tb_schema;
-}
+    const char *TABLE_NAME = milvus_sdk::Utils::GenTableName().c_str();
+
+    constexpr int64_t TABLE_DIMENSION = 512;
+    constexpr int64_t TABLE_INDEX_FILE_SIZE = 1024;
+    constexpr milvus::MetricType TABLE_METRIC_TYPE = milvus::MetricType::L2;
+    constexpr int64_t BATCH_ROW_COUNT = 10000;
+    constexpr int64_t NQ = 5;
+    constexpr int64_t TOP_K = 10;
+    constexpr int64_t NPROBE = 32;
+    constexpr int64_t SEARCH_TARGET = 5000;  // change this value, result is different
+    constexpr milvus::IndexType INDEX_TYPE = milvus::IndexType::IVFSQ8;
+    constexpr int32_t N_LIST = 15000;
+    constexpr int32_t PARTITION_COUNT = 5;
+    constexpr int32_t TARGET_PARTITION = 3;
+
+    milvus::TableSchema
+    BuildTableSchema() {
+        milvus::TableSchema tb_schema = {TABLE_NAME, TABLE_DIMENSION, TABLE_INDEX_FILE_SIZE, TABLE_METRIC_TYPE};
+        return tb_schema;
+    }
 
-milvus::PartitionParam
-BuildPartitionParam(int32_t index) {
-    std::string tag = std::to_string(index);
-    std::string partition_name = std::string(TABLE_NAME) + "_" + tag;
-    milvus::PartitionParam partition_param = {TABLE_NAME, partition_name, tag};
-    return partition_param;
-}
+    milvus::PartitionParam
+    BuildPartitionParam(int32_t index) {
+        std::string tag = std::to_string(index);
+        std::string partition_name = std::string(TABLE_NAME) + "_" + tag;
+        milvus::PartitionParam partition_param = {TABLE_NAME, partition_name, tag};
+        return partition_param;
+    }
 
-milvus::IndexParam
-BuildIndexParam() {
-    milvus::IndexParam index_param = {TABLE_NAME, INDEX_TYPE, N_LIST};
-    return index_param;
-}
+    milvus::IndexParam
+    BuildIndexParam() {
+        milvus::IndexParam index_param = {TABLE_NAME, INDEX_TYPE, N_LIST};
+        return index_param;
+    }
 
 }  // namespace
 
 void
-ClientTest::Test(const std::string& address, const std::string& port) {
+ClientTest::Test(const std::string &address, const std::string &port) {
     std::shared_ptr<milvus::Connection> conn = milvus::Connection::Create();
 
     milvus::Status stat;
@@ -78,7 +78,7 @@ ClientTest::Test(const std::string& address, const std::string& port) {
         stat = conn->Connect(param);
         std::cout << "Connect function call status: " << stat.message() << std::endl;
     }
-
+#ifdef yhz
     {  // create table
         milvus::TableSchema tb_schema = BuildTableSchema();
         stat = conn->CreateTable(tb_schema);
@@ -202,4 +202,5 @@ ClientTest::Test(const std::string& address, const std::string& port) {
     }
 
     milvus::Connection::Destroy(conn);
+#endif
 }

core/src/sdk/examples/simple/main.cpp

@@ -36,7 +36,7 @@ main(int argc, char* argv[]) {
                                            {nullptr, 0, nullptr, 0}};
 
     int option_index = 0;
-    std::string address = "127.0.0.1", port = "19530";
+    std::string address = "192.168.1.89", port = "19530";
     app_name = argv[0];
 
     int value;

core/src/sdk/examples/simple/src/ClientTest.cpp

@@ -68,7 +68,7 @@ ClientTest::Test(const std::string& address, const std::string& port) {
         stat = conn->Connect(param);
         std::cout << "Connect function call status: " << stat.message() << std::endl;
     }
-
+#ifdef yhz
     {  // server version
         std::string version = conn->ServerVersion();
         std::cout << "Server version: " << version << std::endl;
@@ -206,4 +206,5 @@ ClientTest::Test(const std::string& address, const std::string& port) {
         std::string status = conn->ServerStatus();
         std::cout << "Server status after disconnect: " << status << std::endl;
     }
+#endif
 }

core/src/sdk/grpc/ClientProxy.cpp

@@ -43,16 +43,28 @@ Status
 ClientProxy::Connect(const ConnectParam& param) {
     std::string uri = param.ip_address + ":" + param.port;
 
-    channel_ = ::grpc::CreateChannel(uri, ::grpc::InsecureChannelCredentials());
-    if (channel_ != nullptr) {
-        connected_ = true;
-        client_ptr_ = std::make_shared<GrpcClient>(channel_);
-        return Status::OK();
+//    channel_ = ::grpc::CreateChannel(uri, ::grpc::InsecureChannelCredentials());
+
+//    channel_ = std::make_shared<grpc_channel>(grpc_insecure_channel_create(uri.c_str(), nullptr, nullptr));
+//    channel_ = std::shared_ptr<grpc_channel>(grpc_insecure_channel_create(uri.c_str(), nullptr, nullptr));
+    auto uri_str = uri.c_str();
+    grpc_channel * channel = grpc_insecure_channel_create(uri_str, nullptr, nullptr);
+//    grpc_insecure_channel_create(uri.c_str(), nullptr, nullptr);
+    auto state = grpc_channel_check_connectivity_state(channel, true);
+    if (state == GRPC_CHANNEL_READY) {
+        std::cout << "Connect " << uri << " successfully";
+    } else {
+        std::cout << "Connect " << uri << " failed.";
     }
-
-    std::string reason = "connect failed!";
-    connected_ = false;
-    return Status(StatusCode::NotConnected, reason);
+//    if (channel_ != nullptr) {
+//        connected_ = true;
+//        client_ptr_ = std::make_shared<GrpcClient>(channel_);
+//        return Status::OK();
+//    }
+
+//    std::string reason = "connect failed!";
+//    connected_ = false;
+//    return Status(StatusCode::NotConnected, reason);
 }
 
 Status

core/src/sdk/grpc/ClientProxy.h

@@ -105,7 +105,7 @@ class ClientProxy : public Connection {
     DropPartition(const PartitionParam& partition_param) override;
 
  private:
-    std::shared_ptr<::grpc::Channel> channel_;
+    std::shared_ptr<grpc_channel> channel_;
 
  private:
     std::shared_ptr<GrpcClient> client_ptr_;