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
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
import io.milvus.v2.common.DataType;
import io.milvus.v2.common.IndexParam;
import io.milvus.v2.service.collection.request.*;
import io.milvus.v2.service.database.request.CreateDatabaseReq;
import io.milvus.v2.service.database.response.ListDatabasesResp;
import io.milvus.v2.service.index.request.CreateIndexReq;
import io.milvus.v2.service.vector.request.QueryReq;
import io.milvus.v2.service.vector.response.QueryResp;
Expand Down Expand Up @@ -132,6 +134,7 @@ public static class CloudImportConsts {
public static final String OBJECT_SECRET_KEY = "_your_storage_secret_key_";
}

private static final String DATABASE_NAME = "java_sdk_db";
private static final String SIMPLE_COLLECTION_NAME = "java_sdk_bulkwriter_simple_v2";
private static final String ALL_TYPES_COLLECTION_NAME = "java_sdk_bulkwriter_all_v2";
private static final Integer DIM = 512;
Expand Down Expand Up @@ -163,6 +166,18 @@ private static void createConnection() {
.password(PASSWORD)
.build());
System.out.println("\nConnected");

ListDatabasesResp dbs = milvusClient.listDatabases();
if (!dbs.getDatabaseNames().contains(DATABASE_NAME)) {
milvusClient.createDatabase(CreateDatabaseReq.builder()
.databaseName(DATABASE_NAME)
.build());
try {
milvusClient.useDatabase(DATABASE_NAME);
} catch (Exception e) {
System.out.println("Unable to switch database, error: " + e);
}
}
}

private static void exampleSimpleCollection(List<BulkFileType> fileTypes) throws Exception {
Expand Down Expand Up @@ -460,6 +475,7 @@ private static void callBulkInsert(List<List<String>> batchFiles) throws Interru
options.put("sep", "|"); // this option only take effect for CSV
MilvusImportRequest milvusImportRequest = MilvusImportRequest.builder()
.collectionName(ALL_TYPES_COLLECTION_NAME)
.dbName(DATABASE_NAME)
.files(batchFiles)
.apiKey(USER_NAME + ":" + PASSWORD)
.options(options)
Expand All @@ -472,7 +488,9 @@ private static void callBulkInsert(List<List<String>> batchFiles) throws Interru
System.out.println("Create a bulkInert task, job id: " + jobId);

System.out.println("\n===================== listBulkInsertJobs() ====================");
MilvusListImportJobsRequest listImportJobsRequest = MilvusListImportJobsRequest.builder().collectionName(ALL_TYPES_COLLECTION_NAME)
MilvusListImportJobsRequest listImportJobsRequest = MilvusListImportJobsRequest.builder()
.collectionName(ALL_TYPES_COLLECTION_NAME)
.dbName(DATABASE_NAME)
.apiKey(USER_NAME + ":" + PASSWORD)
.build();
String listImportJobsResult = BulkImportUtils.listImportJobs(url, listImportJobsRequest);
Expand Down Expand Up @@ -560,11 +578,15 @@ private static void createCollection(String collectionName, CreateCollectionReq.

CreateCollectionReq requestCreate = CreateCollectionReq.builder()
.collectionName(collectionName)
.databaseName(DATABASE_NAME)
.collectionSchema(collectionSchema)
.consistencyLevel(ConsistencyLevel.BOUNDED)
.build();

milvusClient.dropCollection(DropCollectionReq.builder().collectionName(collectionName).build());
milvusClient.dropCollection(DropCollectionReq.builder()
.collectionName(collectionName)
.databaseName(DATABASE_NAME)
.build());
milvusClient.createCollection(requestCreate);

System.out.printf("Collection %s created%n", collectionName);
Expand Down Expand Up @@ -762,11 +784,13 @@ private static void createIndex(CreateCollectionReq.CollectionSchema collectionS
}
milvusClient.createIndex(CreateIndexReq.builder()
.collectionName(ALL_TYPES_COLLECTION_NAME)
.databaseName(DATABASE_NAME)
.indexParams(indexes)
.build());

milvusClient.loadCollection(LoadCollectionReq.builder()
.collectionName(ALL_TYPES_COLLECTION_NAME)
.databaseName(DATABASE_NAME)
.build());
}

Expand All @@ -778,6 +802,7 @@ private static void loadCollection() {
// force the new segments to be loaded into memory.
milvusClient.refreshLoad(RefreshLoadReq.builder()
.collectionName(ALL_TYPES_COLLECTION_NAME)
.databaseName(DATABASE_NAME)
.build());
System.out.println("Collection row number: " + getCollectionRowCount());
}
Expand All @@ -787,6 +812,7 @@ private static List<QueryResp.QueryResult> query(String expr, List<String> outpu
checkMilvusClientIfExist();
QueryReq test = QueryReq.builder()
.collectionName(ALL_TYPES_COLLECTION_NAME)
.databaseName(DATABASE_NAME)
.filter(expr)
.outputFields(outputFields)
.consistencyLevel(ConsistencyLevel.STRONG)
Expand All @@ -802,6 +828,7 @@ private static Long getCollectionRowCount() {
// Get row count, set ConsistencyLevel.STRONG to sync the data to query node so that data is visible
QueryResp countR = milvusClient.query(QueryReq.builder()
.collectionName(ALL_TYPES_COLLECTION_NAME)
.databaseName(DATABASE_NAME)
.filter("")
.outputFields(Collections.singletonList("count(*)"))
.consistencyLevel(ConsistencyLevel.STRONG)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
public class MilvusListImportJobsRequest extends BaseListImportJobsRequest {
private static final long serialVersionUID = 8957739122547766268L;
private String collectionName;
// this parameter "dbName" will be converted to JSON and passed to server
// milvus http server requires "dbName", not "databaseName"
private String dbName;

protected MilvusListImportJobsRequest() {
}
Expand All @@ -33,6 +36,7 @@ protected MilvusListImportJobsRequest(String collectionName) {
protected MilvusListImportJobsRequest(MilvusListImportJobsRequestBuilder builder) {
super(builder);
this.collectionName = builder.collectionName;
this.dbName = builder.dbName;
}

public String getCollectionName() {
Expand All @@ -43,10 +47,19 @@ public void setCollectionName(String collectionName) {
this.collectionName = collectionName;
}

public String getDbName() {
return dbName;
}

public void setDbName(String dbName) {
this.dbName = dbName;
}

@Override
public String toString() {
return "MilvusListImportJobsRequest{" +
"collectionName='" + collectionName + '\'' +
"dbName='" + dbName + '\'' +
'}';
}

Expand All @@ -56,16 +69,23 @@ public static MilvusListImportJobsRequestBuilder builder() {

public static class MilvusListImportJobsRequestBuilder extends BaseListImportJobsRequestBuilder<MilvusListImportJobsRequestBuilder> {
private String collectionName;
private String dbName;

private MilvusListImportJobsRequestBuilder() {
this.collectionName = "";
this.dbName = "";
}

public MilvusListImportJobsRequestBuilder collectionName(String collectionName) {
this.collectionName = collectionName;
return this;
}

public MilvusListImportJobsRequestBuilder dbName(String dbName) {
this.dbName = dbName;
return this;
}

public MilvusListImportJobsRequest build() {
return new MilvusListImportJobsRequest(this);
}
Expand Down
Loading