|
26 | 26 | import io.milvus.v2.service.BaseService; |
27 | 27 | import io.milvus.v2.service.utility.request.*; |
28 | 28 | import io.milvus.v2.service.utility.response.*; |
| 29 | +import org.apache.commons.lang3.StringUtils; |
29 | 30 |
|
30 | 31 | import java.util.*; |
31 | 32 | import java.util.stream.Collectors; |
@@ -119,61 +120,77 @@ public GetCompactionStateResp getCompactionState(MilvusServiceGrpc.MilvusService |
119 | 120 | } |
120 | 121 |
|
121 | 122 | 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() |
124 | 125 | .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()); |
128 | 132 | rpcUtils.handleResponse(title, status); |
129 | 133 |
|
130 | 134 | return null; |
131 | 135 | } |
132 | 136 |
|
133 | 137 | 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()); |
139 | 145 | rpcUtils.handleResponse(title, status); |
140 | 146 |
|
141 | 147 | return null; |
142 | 148 | } |
143 | 149 |
|
144 | 150 | 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() |
147 | 153 | .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()); |
151 | 161 | rpcUtils.handleResponse(title, status); |
152 | 162 |
|
153 | 163 | return null; |
154 | 164 | } |
155 | 165 |
|
156 | 166 | 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()); |
162 | 174 |
|
163 | 175 | rpcUtils.handleResponse(title, response.getStatus()); |
164 | 176 |
|
165 | 177 | return DescribeAliasResp.builder() |
| 178 | + .databaseName(response.getDbName()) |
166 | 179 | .collectionName(response.getCollection()) |
167 | 180 | .alias(response.getAlias()) |
168 | 181 | .build(); |
169 | 182 | } |
170 | 183 |
|
171 | 184 | public ListAliasResp listAliases(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, ListAliasesReq request) { |
172 | 185 | 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()); |
177 | 194 |
|
178 | 195 | rpcUtils.handleResponse(title, response.getStatus()); |
179 | 196 |
|
|
0 commit comments