Skip to content

Commit 2c20f89

Browse files
authored
alias interface support database (milvus-io#1490)
Signed-off-by: lentitude2tk <xushuang.hu@zilliz.com>
1 parent 76d0022 commit 2c20f89

7 files changed

Lines changed: 49 additions & 26 deletions

File tree

sdk-core/src/main/java/io/milvus/v2/service/utility/UtilityService.java

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import io.milvus.v2.service.BaseService;
2727
import io.milvus.v2.service.utility.request.*;
2828
import io.milvus.v2.service.utility.response.*;
29+
import org.apache.commons.lang3.StringUtils;
2930

3031
import java.util.*;
3132
import java.util.stream.Collectors;
@@ -119,61 +120,77 @@ public GetCompactionStateResp getCompactionState(MilvusServiceGrpc.MilvusService
119120
}
120121

121122
public Void createAlias(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, CreateAliasReq request) {
122-
String title = String.format("CreateAlias %s for collection %s", request.getAlias(), request.getCollectionName());
123-
io.milvus.grpc.CreateAliasRequest createAliasRequest = io.milvus.grpc.CreateAliasRequest.newBuilder()
123+
String title = String.format("CreateAlias %s for database %s collection %s", request.getAlias(), request.getDatabaseName(), request.getCollectionName());
124+
CreateAliasRequest.Builder createAliasRequestBuilder = CreateAliasRequest.newBuilder()
124125
.setCollectionName(request.getCollectionName())
125-
.setAlias(request.getAlias())
126-
.build();
127-
io.milvus.grpc.Status status = blockingStub.createAlias(createAliasRequest);
126+
.setAlias(request.getAlias());
127+
if (StringUtils.isNotEmpty(request.getDatabaseName())) {
128+
createAliasRequestBuilder.setDbName(request.getDatabaseName());
129+
}
130+
131+
io.milvus.grpc.Status status = blockingStub.createAlias(createAliasRequestBuilder.build());
128132
rpcUtils.handleResponse(title, status);
129133

130134
return null;
131135
}
132136

133137
public Void dropAlias(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DropAliasReq request) {
134-
String title = String.format("DropAlias %s", request.getAlias());
135-
io.milvus.grpc.DropAliasRequest dropAliasRequest = io.milvus.grpc.DropAliasRequest.newBuilder()
136-
.setAlias(request.getAlias())
137-
.build();
138-
io.milvus.grpc.Status status = blockingStub.dropAlias(dropAliasRequest);
138+
String title = String.format("DropAlias %s for database %s", request.getAlias(), request.getDatabaseName());
139+
DropAliasRequest.Builder dropAliasRequestBuilder = io.milvus.grpc.DropAliasRequest.newBuilder()
140+
.setAlias(request.getAlias());
141+
if (StringUtils.isNotEmpty(request.getDatabaseName())) {
142+
dropAliasRequestBuilder.setDbName(request.getDatabaseName());
143+
}
144+
io.milvus.grpc.Status status = blockingStub.dropAlias(dropAliasRequestBuilder.build());
139145
rpcUtils.handleResponse(title, status);
140146

141147
return null;
142148
}
143149

144150
public Void alterAlias(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, AlterAliasReq request) {
145-
String title = String.format("AlterAlias %s for collection %s", request.getAlias(), request.getCollectionName());
146-
io.milvus.grpc.AlterAliasRequest alterAliasRequest = io.milvus.grpc.AlterAliasRequest.newBuilder()
151+
String title = String.format("AlterAlias %s for database %s collection %s", request.getAlias(), request.getDatabaseName(), request.getCollectionName());
152+
AlterAliasRequest.Builder alterAliasRequestBuilder = AlterAliasRequest.newBuilder()
147153
.setCollectionName(request.getCollectionName())
148-
.setAlias(request.getAlias())
149-
.build();
150-
io.milvus.grpc.Status status = blockingStub.alterAlias(alterAliasRequest);
154+
.setAlias(request.getAlias());
155+
156+
if (StringUtils.isNotEmpty(request.getDatabaseName())) {
157+
alterAliasRequestBuilder.setDbName(request.getDatabaseName());
158+
}
159+
160+
io.milvus.grpc.Status status = blockingStub.alterAlias(alterAliasRequestBuilder.build());
151161
rpcUtils.handleResponse(title, status);
152162

153163
return null;
154164
}
155165

156166
public DescribeAliasResp describeAlias(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DescribeAliasReq request) {
157-
String title = String.format("DescribeAlias %s", request.getAlias());
158-
io.milvus.grpc.DescribeAliasRequest describeAliasRequest = io.milvus.grpc.DescribeAliasRequest.newBuilder()
159-
.setAlias(request.getAlias())
160-
.build();
161-
io.milvus.grpc.DescribeAliasResponse response = blockingStub.describeAlias(describeAliasRequest);
167+
String title = String.format("DescribeAlias %s for database %s", request.getAlias(), request.getDatabaseName());
168+
DescribeAliasRequest.Builder describeAliasRequestBuilder = io.milvus.grpc.DescribeAliasRequest.newBuilder()
169+
.setAlias(request.getAlias());
170+
if (StringUtils.isNotEmpty(request.getDatabaseName())) {
171+
describeAliasRequestBuilder.setDbName(request.getDatabaseName());
172+
}
173+
io.milvus.grpc.DescribeAliasResponse response = blockingStub.describeAlias(describeAliasRequestBuilder.build());
162174

163175
rpcUtils.handleResponse(title, response.getStatus());
164176

165177
return DescribeAliasResp.builder()
178+
.databaseName(response.getDbName())
166179
.collectionName(response.getCollection())
167180
.alias(response.getAlias())
168181
.build();
169182
}
170183

171184
public ListAliasResp listAliases(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, ListAliasesReq request) {
172185
String title = "ListAliases";
173-
io.milvus.grpc.ListAliasesRequest listAliasesRequest = io.milvus.grpc.ListAliasesRequest.newBuilder()
174-
.setCollectionName(request.getCollectionName())
175-
.build();
176-
io.milvus.grpc.ListAliasesResponse response = blockingStub.listAliases(listAliasesRequest);
186+
ListAliasesRequest.Builder listAliasesRequestBuilder = ListAliasesRequest.newBuilder()
187+
.setCollectionName(request.getCollectionName());
188+
189+
if (StringUtils.isNotEmpty(request.getDatabaseName())) {
190+
listAliasesRequestBuilder.setDbName(request.getDatabaseName());
191+
}
192+
193+
io.milvus.grpc.ListAliasesResponse response = blockingStub.listAliases(listAliasesRequestBuilder.build());
177194

178195
rpcUtils.handleResponse(title, response.getStatus());
179196

sdk-core/src/main/java/io/milvus/v2/service/utility/request/AlterAliasReq.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
@Data
2626
@SuperBuilder
2727
public class AlterAliasReq {
28-
private String alias;
28+
private String databaseName;
2929
private String collectionName;
30+
private String alias;
3031
}

sdk-core/src/main/java/io/milvus/v2/service/utility/request/CreateAliasReq.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
@Data
2626
@SuperBuilder
2727
public class CreateAliasReq {
28-
private String alias;
28+
private String databaseName;
2929
private String collectionName;
30+
private String alias;
3031
}

sdk-core/src/main/java/io/milvus/v2/service/utility/request/DescribeAliasReq.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
@Data
2626
@SuperBuilder
2727
public class DescribeAliasReq {
28+
private String databaseName;
2829
private String alias;
2930
}

sdk-core/src/main/java/io/milvus/v2/service/utility/request/DropAliasReq.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
@Data
2626
@SuperBuilder
2727
public class DropAliasReq {
28+
private String databaseName;
2829
private String alias;
2930
}

sdk-core/src/main/java/io/milvus/v2/service/utility/request/ListAliasesReq.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
@Data
2626
@SuperBuilder
2727
public class ListAliasesReq {
28+
private String databaseName;
2829
private String collectionName;
2930
}

sdk-core/src/main/java/io/milvus/v2/service/utility/response/DescribeAliasResp.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
@Data
2626
@SuperBuilder
2727
public class DescribeAliasResp {
28+
private String databaseName;
2829
private String collectionName;
2930
private String alias;
3031
}

0 commit comments

Comments
 (0)