Compatible with zilliz cloud instance, connect with uri (#435)

yhmo · web-flow · commit bcfc5e9ec6f0 · 2026-01-20T10:41:27.000+08:00
Signed-off-by: yhmo &lt;yihua.mo@zilliz.com&gt;
diff --git a/examples/src/v2/add_field.cpp b/examples/src/v2/add_field.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/array.cpp b/examples/src/v2/array.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/db.cpp b/examples/src/v2/db.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
@@ -236,9 +236,9 @@ main(int argc, char* argv[]) {
         }
     }
 
-    // now we switch back to our database, since some interfaces no db_name parameter
-    status = client->UseDatabase(my_db_name);
-    util::CheckStatus("switch database: " + my_db_name, status);
+    // now we switch back to our database
+    status = client->Connect(milvus::ConnectParam("http://localhost:19530", "root:Milvus").WithDbName(my_db_name));
+    util::CheckStatus("connect to database: " + my_db_name, status);
     client->CurrentUsedDatabase(current_db_name);
     std::cout << "Current in-used database: " << current_db_name << std::endl;
 
@@ -276,7 +276,7 @@ main(int argc, char* argv[]) {
     util::CheckStatus("drop collection: " + collection_name, status);
 
     // now we switch back to the default database, prepare to delete our empty database
-    status = client->UseDatabase(my_db_name);
+    status = client->UseDatabase("");
     util::CheckStatus("switch default database", status);
     client->CurrentUsedDatabase(current_db_name);
     std::cout << "Current in-used database: " << current_db_name << std::endl;
diff --git a/examples/src/v2/default_value.cpp b/examples/src/v2/default_value.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/dml.cpp b/examples/src/v2/dml.cpp
@@ -260,7 +260,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/dynamic_field.cpp b/examples/src/v2/dynamic_field.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/filter_template.cpp b/examples/src/v2/filter_template.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/full_text_match.cpp b/examples/src/v2/full_text_match.cpp
@@ -133,7 +133,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/general.cpp b/examples/src/v2/general.cpp
@@ -81,8 +81,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
-    auto status = client->Connect(connect_param);
+    auto status = client->Connect(milvus::ConnectParam("http://localhost:19530").WithToken("root:Milvus"));
     util::CheckStatus("connect milvus server", status);
 
     milvus::CheckHealthResponse resp_health;
diff --git a/examples/src/v2/geometry_field.cpp b/examples/src/v2/geometry_field.cpp
@@ -93,7 +93,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/group_by.cpp b/examples/src/v2/group_by.cpp
@@ -78,7 +78,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/hybrid_search.cpp b/examples/src/v2/hybrid_search.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/iterator_query.cpp b/examples/src/v2/iterator_query.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/iterator_search.cpp b/examples/src/v2/iterator_search.cpp
@@ -178,7 +178,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/json.cpp b/examples/src/v2/json.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/multi_analyzer.cpp b/examples/src/v2/multi_analyzer.cpp
@@ -203,7 +203,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/nullable_field.cpp b/examples/src/v2/nullable_field.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/partition_key.cpp b/examples/src/v2/partition_key.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/rbac.cpp b/examples/src/v2/rbac.cpp
@@ -78,7 +78,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
@@ -143,7 +143,7 @@ main(int argc, char* argv[]) {
         milvus::UpdatePasswordRequest().WithUserName(user_name).WithOldPassword("aaaaaa").WithNewPassword("123456"));
     util::CheckStatus("update password for user: " + user_name, status);
 
-    client->GrantRole(milvus::GrantRoleRequest().WithUserName(user_name).WithRoleName(role_name));
+    status = client->GrantRole(milvus::GrantRoleRequest().WithUserName(user_name).WithRoleName(role_name));
     util::CheckStatus("grant role: " + role_name + " to user: " + user_name, status);
 
     milvus::DescribeUserResponse resp_desc_user;
diff --git a/examples/src/v2/rerank_function.cpp b/examples/src/v2/rerank_function.cpp
@@ -128,7 +128,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/run_analyzer.cpp b/examples/src/v2/run_analyzer.cpp
@@ -56,7 +56,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/simple.cpp b/examples/src/v2/simple.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/struct_field.cpp b/examples/src/v2/struct_field.cpp
@@ -36,7 +36,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/text_match.cpp b/examples/src/v2/text_match.cpp
@@ -164,7 +164,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/timestamptz_field.cpp b/examples/src/v2/timestamptz_field.cpp
@@ -149,7 +149,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/vector_binary.cpp b/examples/src/v2/vector_binary.cpp
@@ -67,7 +67,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/vector_fp16.cpp b/examples/src/v2/vector_fp16.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/vector_int8.cpp b/examples/src/v2/vector_int8.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/examples/src/v2/vector_sparse.cpp b/examples/src/v2/vector_sparse.cpp
@@ -27,7 +27,7 @@ main(int argc, char* argv[]) {
 
     auto client = milvus::MilvusClientV2::Create();
 
-    milvus::ConnectParam connect_param{"localhost", 19530, "root", "Milvus"};
+    milvus::ConnectParam connect_param{"http://localhost:19530", "root:Milvus"};
     auto status = client->Connect(connect_param);
     util::CheckStatus("connect milvus server", status);
 
diff --git a/src/impl/MilvusClientV2Impl.cpp b/src/impl/MilvusClientV2Impl.cpp
@@ -2304,9 +2304,6 @@ MilvusClientV2Impl::getCollectionDesc(const std::string& db_name, const std::str
     // if connection is connected to "A" but the input db_name is "", actual_db is "A"
     // if connection is connected to "A" but the input db_name is "A", actual_db is "A"
     auto actual_db = connection_.CurrentDbName(db_name);
-    if (actual_db.empty()) {
-        actual_db = "default";
-    }
 
     // this lock locks the entire section, including the call of DescribeCollection()
     // the reason is: describeCollection() could be limited by server-side(DDL request throttling is enabled)
@@ -2347,9 +2344,6 @@ MilvusClientV2Impl::removeCollectionDesc(const std::string& db_name, const std::
     // if connection is connected to "A" but the input db_name is "", actual_db is "A"
     // if connection is connected to "A" but the input db_name is "A", actual_db is "A"
     auto actual_db = connection_.CurrentDbName(db_name);
-    if (actual_db.empty()) {
-        actual_db = "default";
-    }
 
     auto name = combineDbCollectionName(actual_db, collection_name);
     std::lock_guard<std::mutex> lock(collection_desc_cache_mtx_);
diff --git a/src/impl/MilvusConnection.cpp b/src/impl/MilvusConnection.cpp
@@ -24,6 +24,7 @@
 #include "MilvusInterceptor.h"
 #include "grpcpp/security/credentials.h"
 #include "utils/Constants.h"
+#include "utils/Uri.h"
 
 using grpc::Channel;
 using grpc::ClientContext;
@@ -94,36 +95,48 @@ Status
 MilvusConnection::Connect(const ConnectParam& param) {
     param_ = param;
 
-    std::shared_ptr<grpc::ChannelCredentials> credentials{nullptr};
-    auto uri = param.Uri();
+    try {
+        // ParseURI() might throw exceptions when the uri/port is invalid
+        std::shared_ptr<grpc::ChannelCredentials> credentials{nullptr};
+        auto uri = ParseURI(param.Uri());
+        auto address = uri.host + ":" + std::to_string(uri.port);
+
+        ::grpc::ChannelArguments args;
+        args.SetMaxSendMessageSize(-1);     // max send message size: 2GB
+        args.SetMaxReceiveMessageSize(-1);  // max receive message size: 2GB
+        args.SetInt(GRPC_ARG_KEEPALIVE_TIME_MS, param.KeepaliveTimeMs());
+        args.SetInt(GRPC_ARG_KEEPALIVE_TIMEOUT_MS, param.KeepaliveTimeoutMs());
+        args.SetInt(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS, param.KeepaliveWithoutCalls() ? 1 : 0);
+
+        if (param.TlsEnabled() || uri.scheme == "https") {
+            if (!param.ServerName().empty()) {
+                args.SetSslTargetNameOverride(param.ServerName());
+            }
+            credentials = createTlsCredentials(param.Cert(), param.Key(), param.CaCert());
+        } else {
+            credentials = ::grpc::InsecureChannelCredentials();
+        }
 
-    ::grpc::ChannelArguments args;
-    args.SetMaxSendMessageSize(-1);     // max send message size: 2GB
-    args.SetMaxReceiveMessageSize(-1);  // max receive message size: 2GB
-    args.SetInt(GRPC_ARG_KEEPALIVE_TIME_MS, param.KeepaliveTimeMs());
-    args.SetInt(GRPC_ARG_KEEPALIVE_TIMEOUT_MS, param.KeepaliveTimeoutMs());
-    args.SetInt(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS, param.KeepaliveWithoutCalls() ? 1 : 0);
+        std::unordered_map<std::string, std::string> metadata;
+        metadata["authorization"] = param.Authorizations();
 
-    if (param.TlsEnabled()) {
-        if (!param.ServerName().empty()) {
-            args.SetSslTargetNameOverride(param.ServerName());
+        // param.DbName() might throw exceptions because it internally calls ParseURI()
+        auto db_name = param.DbName();
+        if (!db_name.empty()) {
+            metadata["dbname"] = db_name;
         }
-        credentials = createTlsCredentials(param.Cert(), param.Key(), param.CaCert());
-    } else {
-        credentials = ::grpc::InsecureChannelCredentials();
-    }
 
-    std::unordered_map<std::string, std::string> metadata;
-    metadata["authorization"] = param.Authorizations();
-    if (!param.DbName().empty()) {
-        metadata["dbname"] = param.DbName();
+        channel_ = CreateChannelWithHeaderInterceptor(address, credentials, args, metadata);
+    } catch (const std::exception& ex) {
+        std::string reason = "Exception caught when creating grpc channel: ";
+        reason += ex.what();
+        return {StatusCode::NOT_CONNECTED, reason};
     }
 
-    channel_ = CreateChannelWithHeaderInterceptor(uri, credentials, args, metadata);
     auto connected = channel_->WaitForConnected(std::chrono::system_clock::now() +
                                                 std::chrono::milliseconds{param.ConnectTimeout()});
     if (!connected) {
-        std::string reason = "Failed to create grpc channel to the uri: " + uri;
+        std::string reason = "Failed to create grpc channel to the uri: " + param.Uri();
         return {StatusCode::NOT_CONNECTED, reason};
     }
 
diff --git a/src/impl/types/ConnectParam.cpp b/src/impl/types/ConnectParam.cpp
diff --git a/src/impl/utils/DqlUtils.cpp b/src/impl/utils/DqlUtils.cpp
diff --git a/src/impl/utils/Uri.cpp b/src/impl/utils/Uri.cpp
diff --git a/src/impl/utils/Uri.h b/src/impl/utils/Uri.h
diff --git a/src/include/milvus/types/ConnectParam.h b/src/include/milvus/types/ConnectParam.h
