Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions sdk-core/src/main/java/io/milvus/v2/client/MilvusClientV2.java
Original file line number Diff line number Diff line change
Expand Up @@ -306,12 +306,22 @@ public static CreateCollectionReq.CollectionSchema CreateSchema() {
}

/**
* list milvus collections
* List milvus collections in the current database of the connection
*
* @return List of String collection names
*/
public ListCollectionsResp listCollections() {
return rpcUtils.retry(()-> collectionService.listCollections(this.getRpcStub()));
return rpcUtils.retry(()-> collectionService.listCollections(this.getRpcStub(), ""));
}
/**
* List milvus collections, can specify the target database
* Note: the old API listCollections() doesn't have a ListCollectionsReq argument, we have to create
* this new V2 API to avoid incompatible issue.
*
* @return List of String collection names
*/
public ListCollectionsResp listCollectionsV2(ListCollectionsReq request) {
return rpcUtils.retry(()-> collectionService.listCollections(this.getRpcStub(), request.getDatabaseName()));
}
/**
* Drops a collection in Milvus.
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
@Data
@SuperBuilder
public class GetCollectionStatsReq {
private String databaseName;
private String collectionName;
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
@Data
@SuperBuilder
public class GetLoadStateReq {
private String databaseName;
private String collectionName;
private String partitionName;
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@
@Data
@SuperBuilder
public class HasCollectionReq {
private String databaseName;
private String collectionName;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package io.milvus.v2.service.collection.request;

import org.apache.commons.lang3.builder.EqualsBuilder;

import java.util.Objects;

public class ListCollectionsReq {
private String databaseName;

private ListCollectionsReq(Builder builder) {
this.databaseName = builder.databaseName;
}

public static Builder builder() {
return new Builder();
}

// Getters
public String getDatabaseName() {
return databaseName;
}

// Setters
public void setDatabaseName(String databaseName) {
this.databaseName = databaseName;
}

@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (obj == null || getClass() != obj.getClass()) return false;

ListCollectionsReq that = (ListCollectionsReq) obj;

return new EqualsBuilder()
.append(databaseName, that.databaseName)
.isEquals();
}

@Override
public int hashCode() {
return Objects.hash(databaseName);
}

@Override
public String toString() {
return "ListCollectionsReq{" +
"databaseName='" + databaseName +
'}';
}

public static class Builder {
private String databaseName;

private Builder() {}

public Builder databaseName(String databaseName) {
this.databaseName = databaseName;
return this;
}

public ListCollectionsReq build() {
return new ListCollectionsReq(this);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
@Data
@SuperBuilder
public class ReleaseCollectionReq {
private String databaseName;
private String collectionName;
@Deprecated
@Builder.Default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
@Data
@SuperBuilder
public class RenameCollectionReq {
private String databaseName;
private String collectionName;
private String newCollectionName;
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

public class DatabaseService extends BaseService {
public Void createDatabase(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, CreateDatabaseReq request) {
String title = String.format("CreateDatabaseRequest databaseName:%s", request.getDatabaseName());
String title = String.format("Create database: '%s'", request.getDatabaseName());
CreateDatabaseRequest.Builder builder = CreateDatabaseRequest.newBuilder()
.setDbName(request.getDatabaseName());
List<KeyValuePair> propertiesList = ParamUtils.AssembleKvPair(request.getProperties());
Expand All @@ -46,7 +46,7 @@ public Void createDatabase(MilvusServiceGrpc.MilvusServiceBlockingStub blockingS
}

public Void dropDatabase(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DropDatabaseReq request) {
String title = String.format("DropDatabaseRequest databaseName:%s", request.getDatabaseName());
String title = String.format("Drop database: '%s'", request.getDatabaseName());
DropDatabaseRequest rpcRequest = DropDatabaseRequest.newBuilder()
.setDbName(request.getDatabaseName())
.build();
Expand All @@ -58,6 +58,7 @@ public Void dropDatabase(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStu

public ListDatabasesResp listDatabases(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub) {
ListDatabasesResponse response = blockingStub.listDatabases(ListDatabasesRequest.newBuilder().build());
rpcUtils.handleResponse("List databases", response.getStatus());
ListDatabasesResp listDatabasesResp = ListDatabasesResp.builder()
.databaseNames(response.getDbNamesList())
.build();
Expand All @@ -66,7 +67,7 @@ public ListDatabasesResp listDatabases(MilvusServiceGrpc.MilvusServiceBlockingSt
}

public Void alterDatabaseProperties(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, AlterDatabasePropertiesReq request) {
String title = String.format("AlterDatabasePropertiesReq databaseName:%s", request.getDatabaseName());
String title = String.format("Alter properties of database: '%s'", request.getDatabaseName());
AlterDatabaseRequest.Builder builder = AlterDatabaseRequest.newBuilder()
.setDbName(request.getDatabaseName());
List<KeyValuePair> propertiesList = ParamUtils.AssembleKvPair(request.getProperties());
Expand All @@ -80,7 +81,7 @@ public Void alterDatabaseProperties(MilvusServiceGrpc.MilvusServiceBlockingStub
}

public Void dropDatabaseProperties(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DropDatabasePropertiesReq request) {
String title = String.format("DropDatabasePropertiesReq databaseName:%s", request.getDatabaseName());
String title = String.format("Drop properties of database: '%s'", request.getDatabaseName());
AlterDatabaseRequest.Builder builder = AlterDatabaseRequest.newBuilder()
.setDbName(request.getDatabaseName())
.addAllDeleteKeys(request.getPropertyKeys());
Expand All @@ -91,7 +92,7 @@ public Void dropDatabaseProperties(MilvusServiceGrpc.MilvusServiceBlockingStub b
}

public DescribeDatabaseResp describeDatabase(MilvusServiceGrpc.MilvusServiceBlockingStub blockingStub, DescribeDatabaseReq request) {
String title = String.format("DescribeDatabaseRequest databaseName:%s", request.getDatabaseName());
String title = String.format("Describe database: '%s'", request.getDatabaseName());
DescribeDatabaseRequest rpcRequest = DescribeDatabaseRequest.newBuilder()
.setDbName(request.getDatabaseName())
.build();
Expand Down
Loading
Loading