From d5a7e32c9e53f2f03cdfb352c9c244dfc6e5da93 Mon Sep 17 00:00:00 2001 From: yhmo Date: Tue, 12 Aug 2025 14:52:58 +0800 Subject: [PATCH] Add a method to return the current used database name Signed-off-by: yhmo --- .github/mergify.yml | 30 +++++++++++++++++-- .../io/milvus/v2/client/MilvusClientV2.java | 10 ++++++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 91b29232e..6fdae6b21 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,5 +1,31 @@ pull_request_rules: - - name: Test passed for code changed + - name: Add needs-dco label when DCO check failed + conditions: + - or: + - base=master + - base~=2\.\d + - -status-success=DCO + actions: + label: + remove: + - dco-passed + add: + - needs-dco + + - name: Add dco-passed label when DCO check passed + conditions: + - or: + - base=master + - base~=2\.\d + - status-success=DCO + actions: + label: + remove: + - needs-dco + add: + - dco-passed + + - name: Add ci-passed when test passed conditions: - or: - base=master @@ -10,7 +36,7 @@ pull_request_rules: add: - ci-passed - - name: Remove ci-passed when code check failed + - name: Remove ci-passed when test failed conditions: - or: - base=master diff --git a/sdk-core/src/main/java/io/milvus/v2/client/MilvusClientV2.java b/sdk-core/src/main/java/io/milvus/v2/client/MilvusClientV2.java index 0a70dff2f..74eab7dce 100644 --- a/sdk-core/src/main/java/io/milvus/v2/client/MilvusClientV2.java +++ b/sdk-core/src/main/java/io/milvus/v2/client/MilvusClientV2.java @@ -53,6 +53,7 @@ import io.milvus.v2.utils.RpcUtils; import lombok.NonNull; import lombok.Setter; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,7 +86,6 @@ public MilvusClientV2(ConnectConfig connectConfig) { connect(connectConfig); initServices(connectConfig.getDbName()); - } } @@ -191,6 +191,14 @@ public MilvusClientV2 withTimeout(long timeout, TimeUnit timeoutUnit) { return this; } + public String currentUsedDatabase() { + String dbName = this.connectConfig.getDbName(); + if (StringUtils.isEmpty(dbName)) { + return "default"; + } + return dbName; + } + ///////////////////////////////////////////////////////////////////////////////////////////// // Database Operations /////////////////////////////////////////////////////////////////////////////////////////////