diff --git a/.github/workflows/java_sdk_ci_test.yaml b/.github/workflows/java_sdk_ci_test.yaml index d55a082bb..246cbdb8a 100644 --- a/.github/workflows/java_sdk_ci_test.yaml +++ b/.github/workflows/java_sdk_ci_test.yaml @@ -31,13 +31,13 @@ jobs: mvn clean versions:set -DnewVersion=2.4.0 mvn clean install -Dmaven.test.skip=true - - name: Test - timeout-minutes: 60 - shell: bash - working-directory: tests/milvustestv2 - run: | - echo "run testcases" - mvn clean test -Dsurefire.suiteXmlFiles=testng.xml +# - name: Test +# timeout-minutes: 60 +# shell: bash +# working-directory: tests/milvustestv2 +# run: | +# echo "run testcases" +# mvn clean test -Dsurefire.suiteXmlFiles=testng.xml # - name: Upload logs # if: ${{ always() }} diff --git a/.gitignore b/.gitignore index e9c87c4ce..e530c080a 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ hs_err_pid* target/ volumes/ *.iml +.flattened-pom.xml # Example files examples/bulk_writer diff --git a/.gitmodules b/.gitmodules index 82e5e96f4..a9b2587b5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "src/main/milvus-proto"] - path = src/main/milvus-proto +[submodule "sdk-core/src/main/milvus-proto"] + path = sdk-core/src/main/milvus-proto url = https://github.com/milvus-io/milvus-proto.git diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c81ed427..8df7afbb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## milvus-sdk-java 2.5.2 (TBD) +### Improvement +- Split milvus Java SDK to two packages to reduce dependency complexity + ## milvus-sdk-java 2.5.1 (2024-12-04) ### Improvement - Support upsert items with auto-id primary key diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 9b6ab3f43..0fca4946e 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -13,7 +13,7 @@ This document will help to setup your development environment and running tests $ git clone --recursive git@github.com:milvus-io/milvus-sdk-java.git ``` -Milvus proto files are managed by a submodule project under the directory: src/milvus-proto +Milvus proto files are managed by a submodule project under the directory: sdk-core/src/main/milvus-proto Fetch Milvus proto files by the following command(If the previous clone is not with submodules) ```shell $ git submodule update --init @@ -31,10 +31,10 @@ $ mvn install ``` ## Update Milvus proto files -Milvus proto files are managed by a submodule project under the directory: src/milvus-proto +Milvus proto files are managed by a submodule project under the directory: sdk-core/src/main/milvus-proto Before developing new interfaces, you need to get the latest proto files by the following command: ```shell -$ git submodule update --remote +$ git submodule update --remote ``` ## Building Milvus diff --git a/README.md b/README.md index 5045f3775..78ddd0b9c 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The following table shows compatibilities between Milvus and Java SDK. | >= 2.2.9 | 2.2.7 ~ 2.2.15 | | 2.3.x | 2.3.11 | | 2.4.x | 2.4.8 | -| 2.5.x | 2.5.1 | +| 2.5.x | 2.5.2 | ### Install Java SDK @@ -33,22 +33,47 @@ You can use **Apache Maven** or **Gradle** add Milvus SDK to your project. io.milvus milvus-sdk-java - 2.5.1 + 2.5.2 ``` - Gradle/Groovy ```groovy - implementation 'io.milvus:milvus-sdk-java:2.5.1' + implementation 'io.milvus:milvus-sdk-java:2.5.2' ``` - Gradle/Kotlin ```kotlin - implementation("io.milvus:milvus-sdk-java:2.5.1") + implementation("io.milvus:milvus-sdk-java:2.5.2") ``` - + +From v2.5.2, milvus Java SDK is split into two packages: milvus-sdk-java and milvus-sdk-java-bulkwriter, because BulkWriter requires quite a lot of dependencies. If you don't need BulkWriter tool, you can ignore the milvus-sdk-java-bulkwriter package. +To use BulkWriter, import milvus-sdk-java-bulkwriter to your project. + + - Apache Maven + + ```xml + + io.milvus + milvus-sdk-java-bulkwriter + 2.5.2 + + ``` + + - Gradle/Groovy + + ```groovy + implementation 'io.milvus:milvus-sdk-java-bulkwriter:2.5.2' + ``` + + - Gradle/Kotlin + + ```kotlin + implementation("io.milvus:milvus-sdk-java-bulkwriter:2.5.2") + ``` + ### Examples Please refer to [examples](https://github.com/milvus-io/milvus-sdk-java/tree/master/examples) folder for Java SDK examples. diff --git a/examples/main/java/io/milvus/v1/ClientPoolExample.java b/examples/main/java/io/milvus/v1/ClientPoolExample.java index eb408358d..5961acd3a 100644 --- a/examples/main/java/io/milvus/v1/ClientPoolExample.java +++ b/examples/main/java/io/milvus/v1/ClientPoolExample.java @@ -106,11 +106,19 @@ public static void createCollection(MilvusClientV1Pool pool) { public static Thread runInsertThread(MilvusClientV1Pool pool, String clientName, int repeatRequests) { Thread t = new Thread(() -> { Gson gson = new Gson(); - Random rand = new Random(); for (int i = 0; i < repeatRequests; i++) { - MilvusClient client = pool.getClient(clientName); + MilvusClient client = null; + while(client == null) { + try { + // getClient() might exceeds the borrowMaxWaitMillis and throw exception + // retry to call until it return a client + client = pool.getClient(clientName); + } catch (Exception e) { + System.out.printf("Failed to get client, will retry, error: %s%n", e.getMessage()); + } + } try { - int rowCount = rand.nextInt(10) + 10; + int rowCount = 1; List rows = new ArrayList<>(); for (int j = 0; j < rowCount; j++) { JsonObject row = new JsonObject(); @@ -141,7 +149,16 @@ public static Thread runInsertThread(MilvusClientV1Pool pool, String clientName, public static Thread runSearchThread(MilvusClientV1Pool pool, String clientName, int repeatRequests) { Thread t = new Thread(() -> { for (int i = 0; i < repeatRequests; i++) { - MilvusClient client = pool.getClient(clientName); + MilvusClient client = null; + while(client == null) { + try { + // getClient() might exceeds the borrowMaxWaitMillis and throw exception + // retry to call until it return a client + client = pool.getClient(clientName); + } catch (Exception e) { + System.out.printf("Failed to get client, will retry, error: %s%n", e.getMessage()); + } + } try { R searchRet = client.search(SearchParam.newBuilder() .withCollectionName(CollectionName) @@ -191,7 +208,7 @@ public static void main(String[] args) throws InterruptedException { createCollection(pool); List threadList = new ArrayList<>(); - int threadCount = 10; + int threadCount = 100; int repeatRequests = 100; long start = System.currentTimeMillis(); for (int k = 0; k < threadCount; k++) { @@ -212,7 +229,7 @@ public static void main(String[] args) throws InterruptedException { } long end = System.currentTimeMillis(); System.out.printf("%d insert requests and %d search requests finished in %.3f seconds%n", - threadCount*repeatRequests, threadCount*repeatRequests, (end-start)*0.001); + threadCount*repeatRequests*3, threadCount*repeatRequests*3, (end-start)*0.001); System.out.printf("Total %d idle clients and %d active clients%n", pool.getTotalIdleClientNumber(), pool.getTotalActiveClientNumber()); pool.clear(); // clear idle clients diff --git a/examples/main/java/io/milvus/v2/ClientPoolExample.java b/examples/main/java/io/milvus/v2/ClientPoolExample.java index 7900fa56c..5a4ed970d 100644 --- a/examples/main/java/io/milvus/v2/ClientPoolExample.java +++ b/examples/main/java/io/milvus/v2/ClientPoolExample.java @@ -40,7 +40,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Random; public class ClientPoolExample { public static String CollectionName = "java_sdk_example_pool_v2"; @@ -79,11 +78,19 @@ public static void createCollection(MilvusClientV2Pool pool) { public static Thread runInsertThread(MilvusClientV2Pool pool, String clientName, int repeatRequests) { Thread t = new Thread(() -> { Gson gson = new Gson(); - Random rand = new Random(); for (int i = 0; i < repeatRequests; i++) { - MilvusClientV2 client = pool.getClient(clientName); + MilvusClientV2 client = null; + while(client == null) { + try { + // getClient() might exceeds the borrowMaxWaitMillis and throw exception + // retry to call until it return a client + client = pool.getClient(clientName); + } catch (Exception e) { + System.out.printf("Failed to get client, will retry, error: %s%n", e.getMessage()); + } + } try { - int rowCount = rand.nextInt(10) + 10; + int rowCount = 1; List rows = new ArrayList<>(); for (int j = 0; j < rowCount; j++) { JsonObject row = new JsonObject(); @@ -110,7 +117,16 @@ public static Thread runInsertThread(MilvusClientV2Pool pool, String clientName, public static Thread runSearchThread(MilvusClientV2Pool pool, String clientName, int repeatRequests) { Thread t = new Thread(() -> { for (int i = 0; i < repeatRequests; i++) { - MilvusClientV2 client = pool.getClient(clientName); + MilvusClientV2 client = null; + while(client == null) { + try { + // getClient() might exceeds the borrowMaxWaitMillis and throw exception + // retry to call until it return a client + client = pool.getClient(clientName); + } catch (Exception e) { + System.out.printf("Failed to get client, will retry, error: %s%n", e.getMessage()); + } + } try { SearchResp result = client.search(SearchReq.builder() .collectionName(CollectionName) @@ -154,7 +170,7 @@ public static void main(String[] args) throws InterruptedException { createCollection(pool); List threadList = new ArrayList<>(); - int threadCount = 10; + int threadCount = 100; int repeatRequests = 100; long start = System.currentTimeMillis(); for (int k = 0; k < threadCount; k++) { @@ -175,7 +191,7 @@ public static void main(String[] args) throws InterruptedException { } long end = System.currentTimeMillis(); System.out.printf("%d insert requests and %d search requests finished in %.3f seconds%n", - threadCount*repeatRequests, threadCount*repeatRequests, (end-start)*0.001); + threadCount*repeatRequests*3, threadCount*repeatRequests*3, (end-start)*0.001); System.out.printf("Total %d idle clients and %d active clients%n", pool.getTotalIdleClientNumber(), pool.getTotalActiveClientNumber()); diff --git a/examples/pom.xml b/examples/pom.xml index aa7183f8c..06ba9dfbc 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -25,7 +25,7 @@ io.milvus milvus-sdk-java-examples - 2.5.1 + 2.5.2 @@ -64,7 +64,12 @@ io.milvus milvus-sdk-java - 2.5.1 + 2.5.2 + + + io.milvus + milvus-sdk-java-bulkwriter + 2.5.2 org.tensorflow diff --git a/pom.xml b/pom.xml index eb7a349d5..62266dc3d 100644 --- a/pom.xml +++ b/pom.xml @@ -24,11 +24,11 @@ 4.0.0 io.milvus - milvus-sdk-java - 2.5.1 - jar + milvus-sdk-java-parent + ${revision} + pom - io.milvus:milvus-sdk-java + ${project.artifactId} Java SDK for Milvus, a distributed high-performance vector database. https://github.com/milvus-io/milvus-sdk-java @@ -48,6 +48,10 @@ http://www.milvus.io + + sdk-core + sdk-bulkwriter + scm:git:https://github.com/milvus-io/milvus-sdk-java.git @@ -63,13 +67,16 @@ + 2.5.2 + 8 + 8 UTF-8 + + 1.59.1 3.24.0 3.24.0 4.3 - 1.8 - 1.8 2.8.2 3.2.1 1.2 @@ -79,7 +86,6 @@ 5.10.1 1.18.22 4.12.0 - 3.0.24 3.1.0 3.7.0 1.6.2 @@ -94,283 +100,22 @@ 4.11.0 1.19.8 2.12.0 + 32.1.3-jre + 2.21.1 + + 3.0.24 3.3.6 1.2.0 1.13.1 3.13.10 - 32.1.3-jre - 2.21.1 1.1.10.5 - - 1.12.687 8.5.7 12.25.3 1.10.1 - - - - - io.grpc - grpc-bom - ${grpc.version} - pom - import - - - org.slf4j - slf4j-api - ${slf4j.api.version} - - - com.google.guava - guava - ${guava.version} - - - com.google.errorprone - error_prone_annotations - ${errorprone.version} - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-stdlib-common - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - org.xerial.snappy - snappy-java - ${snappy.version} - - - org.testcontainers - testcontainers-bom - ${testcontainers.version} - pom - import - - - - - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.mockito - mockito-junit-jupiter - ${mockito.version} - test - - - org.mockito - mockito-inline - ${mockito.version} - test - - - io.grpc - grpc-netty-shaded - ${grpc.version} - - - io.grpc - grpc-protobuf - ${grpc.version} - - - io.grpc - grpc-stub - ${grpc.version} - - - javax.annotation - javax.annotation-api - ${javax.annotation.version} - provided - - - io.grpc - grpc-testing - test - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - org.apache.commons - commons-text - ${commons.text.version} - - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - - - junit - junit - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - test - - - org.testcontainers - milvus - test - - - org.slf4j - slf4j-api - - - org.jetbrains - annotations - - - - - org.testcontainers - junit-jupiter - test - - - org.projectlombok - lombok - ${lombok.version} - provided - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - org.codehaus.plexus - plexus-utils - ${plexus.version} - - - com.google.code.gson - gson - ${gson.version} - - - - org.apache.parquet - parquet-avro - ${parquet.version} - - - org.apache.parquet - parquet-hadoop - ${parquet.version} - - - com.konghq - unirest-java - ${unirest.version} - - - org.apache.hadoop - hadoop-client - ${hadoop.version} - - - netty - io.netty - - - netty-all - io.netty - - - ch.qos.reload4j - reload4j - - - com.nimbusds - nimbus-jose-jwt - - - com.fasterxml.woodstox - woodstox-core - - - slf4j-reload4j - org.slf4j - - - - - - - com.amazonaws - aws-java-sdk-s3 - ${aws-java-sdk-s3.version} - - - commons-logging - commons-logging - - - - - com.amazonaws - aws-java-sdk-sts - ${aws-java-sdk-s3.version} - - - io.minio - minio - ${minio-java-sdk.veresion} - - - com.azure - azure-storage-blob - ${azure-java-blob-sdk.version} - - - com.azure - azure-identity - ${azure-java-identity-sdk.version} - - - jna-platform - net.java.dev.jna - - - - - org.apache.commons - commons-pool2 - ${apache.commons.pool2.version} - - - release @@ -395,7 +140,7 @@ ${maven.javadoc.plugin.version} /usr/bin/javadoc - + -Xdoclint:none @@ -523,7 +268,37 @@ + + org.codehaus.mojo + flatten-maven-plugin + 1.3.0 + true + + + flatten + process-resources + + flatten + + + true + resolveCiFriendliesOnly + + expand + remove + remove + + + + + flatten.clean + clean + + clean + + + + - \ No newline at end of file diff --git a/sdk-bulkwriter/pom.xml b/sdk-bulkwriter/pom.xml new file mode 100644 index 000000000..ffccbb20d --- /dev/null +++ b/sdk-bulkwriter/pom.xml @@ -0,0 +1,192 @@ + + + 4.0.0 + + io.milvus + milvus-sdk-java-parent + ${revision} + ../pom.xml + + + milvus-sdk-java-bulkwriter + jar + ${project.artifactId} + BulkWriter tool for Java + + + + + io.grpc + grpc-bom + ${grpc.version} + pom + import + + + org.slf4j + slf4j-api + ${slf4j.api.version} + + + com.google.guava + guava + ${guava.version} + + + com.google.errorprone + error_prone_annotations + ${errorprone.version} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-stdlib-common + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + org.xerial.snappy + snappy-java + ${snappy.version} + + + org.testcontainers + testcontainers-bom + ${testcontainers.version} + pom + import + + + + + + + io.milvus + milvus-sdk-java + ${revision} + + + junit + junit + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + test + + + org.testcontainers + milvus + test + + + org.testcontainers + junit-jupiter + test + + + org.projectlombok + lombok + ${lombok.version} + provided + + + org.apache.parquet + parquet-avro + ${parquet.version} + + + org.apache.parquet + parquet-hadoop + ${parquet.version} + + + com.konghq + unirest-java + ${unirest.version} + + + org.apache.hadoop + hadoop-client + ${hadoop.version} + + + netty + io.netty + + + netty-all + io.netty + + + ch.qos.reload4j + reload4j + + + com.nimbusds + nimbus-jose-jwt + + + com.fasterxml.woodstox + woodstox-core + + + slf4j-reload4j + org.slf4j + + + + + + + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk-s3.version} + + + commons-logging + commons-logging + + + + + com.amazonaws + aws-java-sdk-sts + ${aws-java-sdk-s3.version} + + + io.minio + minio + ${minio-java-sdk.veresion} + + + com.azure + azure-storage-blob + ${azure-java-blob-sdk.version} + + + com.azure + azure-identity + ${azure-java-identity-sdk.version} + + + jna-platform + net.java.dev.jna + + + + + \ No newline at end of file diff --git a/src/main/java/io/milvus/bulkwriter/BaseBulkImport.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/BaseBulkImport.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/BaseBulkImport.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/BaseBulkImport.java diff --git a/src/main/java/io/milvus/bulkwriter/Buffer.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/Buffer.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/Buffer.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/Buffer.java diff --git a/src/main/java/io/milvus/bulkwriter/BulkImport.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/BulkImport.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/BulkImport.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/BulkImport.java diff --git a/src/main/java/io/milvus/bulkwriter/BulkWriter.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/BulkWriter.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/BulkWriter.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/BulkWriter.java diff --git a/src/main/java/io/milvus/bulkwriter/LocalBulkWriter.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/LocalBulkWriter.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/LocalBulkWriter.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/LocalBulkWriter.java diff --git a/src/main/java/io/milvus/bulkwriter/LocalBulkWriterParam.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/LocalBulkWriterParam.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/LocalBulkWriterParam.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/LocalBulkWriterParam.java diff --git a/src/main/java/io/milvus/bulkwriter/RemoteBulkWriter.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/RemoteBulkWriter.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/RemoteBulkWriter.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/RemoteBulkWriter.java diff --git a/src/main/java/io/milvus/bulkwriter/RemoteBulkWriterParam.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/RemoteBulkWriterParam.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/RemoteBulkWriterParam.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/RemoteBulkWriterParam.java diff --git a/src/main/java/io/milvus/bulkwriter/common/clientenum/BulkFileType.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/clientenum/BulkFileType.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/common/clientenum/BulkFileType.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/clientenum/BulkFileType.java diff --git a/src/main/java/io/milvus/bulkwriter/common/clientenum/CloudStorage.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/clientenum/CloudStorage.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/common/clientenum/CloudStorage.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/clientenum/CloudStorage.java diff --git a/src/main/java/io/milvus/bulkwriter/common/clientenum/TypeSize.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/clientenum/TypeSize.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/common/clientenum/TypeSize.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/clientenum/TypeSize.java diff --git a/src/main/java/io/milvus/bulkwriter/common/utils/GeneratorUtils.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/utils/GeneratorUtils.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/common/utils/GeneratorUtils.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/utils/GeneratorUtils.java diff --git a/src/main/java/io/milvus/bulkwriter/common/utils/ImportUtils.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/utils/ImportUtils.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/common/utils/ImportUtils.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/utils/ImportUtils.java diff --git a/src/main/java/io/milvus/bulkwriter/common/utils/ParquetReaderUtils.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/utils/ParquetReaderUtils.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/common/utils/ParquetReaderUtils.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/utils/ParquetReaderUtils.java diff --git a/src/main/java/io/milvus/bulkwriter/common/utils/ParquetUtils.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/utils/ParquetUtils.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/common/utils/ParquetUtils.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/utils/ParquetUtils.java diff --git a/src/main/java/io/milvus/bulkwriter/common/utils/V2AdapterUtils.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/utils/V2AdapterUtils.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/common/utils/V2AdapterUtils.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/common/utils/V2AdapterUtils.java diff --git a/src/main/java/io/milvus/bulkwriter/connect/AzureConnectParam.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/connect/AzureConnectParam.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/connect/AzureConnectParam.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/connect/AzureConnectParam.java diff --git a/src/main/java/io/milvus/bulkwriter/connect/S3ConnectParam.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/connect/S3ConnectParam.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/connect/S3ConnectParam.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/connect/S3ConnectParam.java diff --git a/src/main/java/io/milvus/bulkwriter/connect/StorageConnectParam.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/connect/StorageConnectParam.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/connect/StorageConnectParam.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/connect/StorageConnectParam.java diff --git a/src/main/java/io/milvus/bulkwriter/request/describe/BaseDescribeImportRequest.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/describe/BaseDescribeImportRequest.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/request/describe/BaseDescribeImportRequest.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/describe/BaseDescribeImportRequest.java diff --git a/src/main/java/io/milvus/bulkwriter/request/describe/CloudDescribeImportRequest.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/describe/CloudDescribeImportRequest.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/request/describe/CloudDescribeImportRequest.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/describe/CloudDescribeImportRequest.java diff --git a/src/main/java/io/milvus/bulkwriter/request/describe/MilvusDescribeImportRequest.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/describe/MilvusDescribeImportRequest.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/request/describe/MilvusDescribeImportRequest.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/describe/MilvusDescribeImportRequest.java diff --git a/src/main/java/io/milvus/bulkwriter/request/import_/BaseImportRequest.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/import_/BaseImportRequest.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/request/import_/BaseImportRequest.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/import_/BaseImportRequest.java diff --git a/src/main/java/io/milvus/bulkwriter/request/import_/CloudImportRequest.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/import_/CloudImportRequest.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/request/import_/CloudImportRequest.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/import_/CloudImportRequest.java diff --git a/src/main/java/io/milvus/bulkwriter/request/import_/MilvusImportRequest.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/import_/MilvusImportRequest.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/request/import_/MilvusImportRequest.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/import_/MilvusImportRequest.java diff --git a/src/main/java/io/milvus/bulkwriter/request/list/BaseListImportJobsRequest.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/list/BaseListImportJobsRequest.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/request/list/BaseListImportJobsRequest.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/list/BaseListImportJobsRequest.java diff --git a/src/main/java/io/milvus/bulkwriter/request/list/CloudListImportJobsRequest.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/list/CloudListImportJobsRequest.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/request/list/CloudListImportJobsRequest.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/list/CloudListImportJobsRequest.java diff --git a/src/main/java/io/milvus/bulkwriter/request/list/MilvusListImportJobsRequest.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/list/MilvusListImportJobsRequest.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/request/list/MilvusListImportJobsRequest.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/request/list/MilvusListImportJobsRequest.java diff --git a/src/main/java/io/milvus/bulkwriter/response/BulkImportResponse.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/response/BulkImportResponse.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/response/BulkImportResponse.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/response/BulkImportResponse.java diff --git a/src/main/java/io/milvus/bulkwriter/response/GetImportProgressResponse.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/response/GetImportProgressResponse.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/response/GetImportProgressResponse.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/response/GetImportProgressResponse.java diff --git a/src/main/java/io/milvus/bulkwriter/response/ListImportJobsResponse.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/response/ListImportJobsResponse.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/response/ListImportJobsResponse.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/response/ListImportJobsResponse.java diff --git a/src/main/java/io/milvus/bulkwriter/response/Record.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/response/Record.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/response/Record.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/response/Record.java diff --git a/src/main/java/io/milvus/bulkwriter/response/RestfulResponse.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/response/RestfulResponse.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/response/RestfulResponse.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/response/RestfulResponse.java diff --git a/src/main/java/io/milvus/bulkwriter/storage/StorageClient.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/storage/StorageClient.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/storage/StorageClient.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/storage/StorageClient.java diff --git a/src/main/java/io/milvus/bulkwriter/storage/client/AzureStorageClient.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/storage/client/AzureStorageClient.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/storage/client/AzureStorageClient.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/storage/client/AzureStorageClient.java diff --git a/src/main/java/io/milvus/bulkwriter/storage/client/MinioStorageClient.java b/sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/storage/client/MinioStorageClient.java similarity index 100% rename from src/main/java/io/milvus/bulkwriter/storage/client/MinioStorageClient.java rename to sdk-bulkwriter/src/main/java/io/milvus/bulkwriter/storage/client/MinioStorageClient.java diff --git a/src/test/java/io/milvus/bulkwriter/BulkWriterTest.java b/sdk-bulkwriter/src/test/java/io/milvus/bulkwriter/BulkWriterTest.java similarity index 73% rename from src/test/java/io/milvus/bulkwriter/BulkWriterTest.java rename to sdk-bulkwriter/src/test/java/io/milvus/bulkwriter/BulkWriterTest.java index 22d9a2513..41e38313d 100644 --- a/src/test/java/io/milvus/bulkwriter/BulkWriterTest.java +++ b/sdk-bulkwriter/src/test/java/io/milvus/bulkwriter/BulkWriterTest.java @@ -19,33 +19,62 @@ package io.milvus.bulkwriter; +import com.google.common.collect.Lists; import com.google.gson.JsonObject; -import io.milvus.TestUtils; import io.milvus.bulkwriter.common.clientenum.BulkFileType; import io.milvus.bulkwriter.common.utils.GeneratorUtils; +import io.milvus.bulkwriter.common.utils.ParquetReaderUtils; import io.milvus.bulkwriter.common.utils.V2AdapterUtils; import io.milvus.common.utils.JsonUtils; import io.milvus.param.collection.CollectionSchemaParam; import io.milvus.param.collection.FieldType; +import io.milvus.v2.client.ConnectConfig; +import io.milvus.v2.client.MilvusClientV2; import io.milvus.v2.common.DataType; import io.milvus.v2.service.collection.request.AddFieldReq; import io.milvus.v2.service.collection.request.CreateCollectionReq; +import org.apache.avro.generic.GenericData; +import org.apache.commons.text.RandomStringGenerator; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; +import org.testcontainers.milvus.MilvusContainer; import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; +@Testcontainers(disabledWithoutDocker = true) public class BulkWriterTest { + private static MilvusClientV2 client; + private static RandomStringGenerator generator; private static final int DIMENSION = 128; private static final TestUtils utils = new TestUtils(DIMENSION); - CreateCollectionReq.CollectionSchema buildSchema() { + @Container + private static final MilvusContainer milvus = new MilvusContainer("milvusdb/milvus:v2.5.0-beta"); + + @BeforeAll + public static void setUp() { + ConnectConfig config = ConnectConfig.builder() + .uri(milvus.getEndpoint()) + .build(); + client = new MilvusClientV2(config); + generator = new RandomStringGenerator.Builder().withinRange('a', 'z').build(); + } + + @AfterAll + public static void tearDown() throws InterruptedException { + if (client != null) { + client.close(5L); + } + } + + CreateCollectionReq.CollectionSchema buildSchema(boolean enableDynamicField) { CreateCollectionReq.CollectionSchema schemaV2 = CreateCollectionReq.CollectionSchema.builder() - .enableDynamicField(true) + .enableDynamicField(enableDynamicField) .build(); schemaV2.addField(AddFieldReq.builder() .fieldName("id") @@ -124,7 +153,7 @@ CreateCollectionReq.CollectionSchema buildSchema() { @Test void testV2AdapterUtils() { - CreateCollectionReq.CollectionSchema schemaV2 = buildSchema(); + CreateCollectionReq.CollectionSchema schemaV2 = buildSchema(true); CollectionSchemaParam schemaV1 = V2AdapterUtils.convertV2Schema(schemaV2); Assertions.assertEquals(schemaV2.isEnableDynamicField(), schemaV1.isEnableDynamicField()); @@ -199,7 +228,7 @@ private static void buildData(BulkWriter writer, int rowCount, boolean isEnableD @Test void testWriteParquet() { try { - CreateCollectionReq.CollectionSchema schemaV2 = buildSchema(); + CreateCollectionReq.CollectionSchema schemaV2 = buildSchema(true); LocalBulkWriterParam bulkWriterParam = LocalBulkWriterParam.newBuilder() .withCollectionSchema(schemaV2) .withLocalPath("/tmp/bulk_writer") @@ -223,7 +252,7 @@ void testWriteParquet() { @Test void testWriteJson() { try { - CreateCollectionReq.CollectionSchema schemaV2 = buildSchema(); + CreateCollectionReq.CollectionSchema schemaV2 = buildSchema(true); LocalBulkWriterParam bulkWriterParam = LocalBulkWriterParam.newBuilder() .withCollectionSchema(schemaV2) .withLocalPath("/tmp/bulk_writer") @@ -247,7 +276,7 @@ void testWriteJson() { @Test void testWriteCSV() { try { - CreateCollectionReq.CollectionSchema schemaV2 = buildSchema(); + CreateCollectionReq.CollectionSchema schemaV2 = buildSchema(true); LocalBulkWriterParam bulkWriterParam = LocalBulkWriterParam.newBuilder() .withCollectionSchema(schemaV2) .withLocalPath("/tmp/bulk_writer") @@ -268,4 +297,70 @@ void testWriteCSV() { Assertions.fail(e.getMessage()); } } + + @Test + public void testLocalBulkWriter() { + // collection schema + CreateCollectionReq.CollectionSchema schemaV2 = buildSchema(false); + + // local bulkwriter + LocalBulkWriterParam writerParam = LocalBulkWriterParam.newBuilder() + .withCollectionSchema(schemaV2) + .withLocalPath("/tmp/bulk_writer") + .withFileType(BulkFileType.PARQUET) + .withChunkSize(100 * 1024) + .build(); + + int rowCount = 100; + List> batchFiles = new ArrayList<>(); + try (LocalBulkWriter bulkWriter = new LocalBulkWriter(writerParam)) { + for (int i = 0; i < rowCount; i++) { + JsonObject row = new JsonObject(); + row.addProperty("bool_field", i % 3 == 0); + row.addProperty("int8_field", i%128); + row.addProperty("int16_field", i%32768); + row.addProperty("int32_field", i); + row.addProperty("int64_field", i); + row.addProperty("float_field", i/3); + row.addProperty("double_field", i/7); + row.addProperty("varchar_field", String.format("varchar_%d", i)); + JsonObject obj = new JsonObject(); + obj.addProperty("dummy", i); + row.add("json_field", obj); + row.add("arr_varchar_field", JsonUtils.toJsonTree(Lists.newArrayList("aaa", "bbb", "ccc"))); + row.add("arr_int32_field", JsonUtils.toJsonTree(Lists.newArrayList(5, 6, 3, 2, 1))); + row.add("arr_float_field", JsonUtils.toJsonTree(Lists.newArrayList(0.5, 1.8))); + row.add("float_vector_field", JsonUtils.toJsonTree(utils.generateFloatVector())); + row.add("binary_vector_field", JsonUtils.toJsonTree(utils.generateBinaryVector().array())); + + bulkWriter.appendRow(row); + } + + bulkWriter.commit(false); + List> files = bulkWriter.getBatchFiles(); + System.out.printf("LocalBulkWriter done! output local files: %s%n", files); + Assertions.assertEquals(1, files.size()); + Assertions.assertEquals(files.get(0).size(), 1); + batchFiles.addAll(files); + } catch (Exception e) { + System.out.println("LocalBulkWriter catch exception: " + e); + Assertions.fail(); + } + + try { + final int[] counter = {0}; + for (List files : batchFiles) { + new ParquetReaderUtils() { + @Override + public void readRecord(GenericData.Record record) { + counter[0]++; + } + }.readParquet(files.get(0)); + } + Assertions.assertEquals(rowCount, counter[0]); + } catch (Exception e) { + System.out.println("Verify parquet file catch exception: " + e); + Assertions.fail(); + } + } } diff --git a/sdk-bulkwriter/src/test/java/io/milvus/bulkwriter/TestUtils.java b/sdk-bulkwriter/src/test/java/io/milvus/bulkwriter/TestUtils.java new file mode 100644 index 000000000..9c8fcb899 --- /dev/null +++ b/sdk-bulkwriter/src/test/java/io/milvus/bulkwriter/TestUtils.java @@ -0,0 +1,161 @@ +package io.milvus.bulkwriter; + +import io.milvus.common.utils.Float16Utils; +import io.milvus.grpc.DataType; +import org.junit.jupiter.api.Assertions; + +import java.nio.ByteBuffer; +import java.util.*; + +public class TestUtils { + private int dimension = 256; + private static final Random RANDOM = new Random(); + + public TestUtils(int dimension) { + this.dimension = dimension; + } + + public List generateFloatVector(int dim) { + List vector = new ArrayList<>(); + for (int i = 0; i < dim; ++i) { + vector.add(RANDOM.nextFloat()); + } + return vector; + } + + public List generateFloatVector() { + return generateFloatVector(dimension); + } + + public List> generateFloatVectors(int count) { + List> vectors = new ArrayList<>(); + for (int n = 0; n < count; ++n) { + vectors.add(generateFloatVector()); + } + + return vectors; + } + + public ByteBuffer generateBinaryVector(int dim) { + int byteCount = dim / 8; + ByteBuffer vector = ByteBuffer.allocate(byteCount); + for (int i = 0; i < byteCount; ++i) { + vector.put((byte) RANDOM.nextInt(Byte.MAX_VALUE)); + } + return vector; + } + + public ByteBuffer generateBinaryVector() { + return generateBinaryVector(dimension); + } + + public List generateBinaryVectors(int count) { + List vectors = new ArrayList<>(); + for (int n = 0; n < count; ++n) { + vectors.add(generateBinaryVector()); + } + return vectors; + + } + + public ByteBuffer generateFloat16Vector() { + List vector = generateFloatVector(); + return Float16Utils.f32VectorToFp16Buffer(vector); + } + + public List generateFloat16Vectors(int count) { + List vectors = new ArrayList<>(); + for (int n = 0; n < count; ++n) { + vectors.add(generateFloat16Vector()); + } + return vectors; + } + + public ByteBuffer generateBFloat16Vector() { + List vector = generateFloatVector(); + return Float16Utils.f32VectorToBf16Buffer(vector); + } + + public List generateBFloat16Vectors(int count) { + List vectors = new ArrayList<>(); + for (int n = 0; n < count; ++n) { + vectors.add(generateBFloat16Vector()); + } + return vectors; + } + + public SortedMap generateSparseVector() { + SortedMap sparse = new TreeMap<>(); + int dim = RANDOM.nextInt(10) + 10; + for (int i = 0; i < dim; ++i) { + sparse.put((long) RANDOM.nextInt(1000000), RANDOM.nextFloat()); + } + return sparse; + } + + public List> generateSparseVectors(int count) { + List> vectors = new ArrayList<>(); + for (int n = 0; n < count; ++n) { + vectors.add(generateSparseVector()); + } + return vectors; + } + + public List generateRandomArray(DataType eleType, int maxCapacity) { + switch (eleType) { + case Bool: { + List values = new ArrayList<>(); + for (int i = 0; i < maxCapacity; i++) { + values.add(i%10 == 0); + } + return values; + } + case Int8: + case Int16: { + List values = new ArrayList<>(); + for (int i = 0; i < maxCapacity; i++) { + values.add((short)RANDOM.nextInt(256)); + } + return values; + } + case Int32: { + List values = new ArrayList<>(); + for (int i = 0; i < maxCapacity; i++) { + values.add(RANDOM.nextInt()); + } + return values; + } + case Int64: { + List values = new ArrayList<>(); + for (int i = 0; i < maxCapacity; i++) { + values.add(RANDOM.nextLong()); + } + return values; + } + case Float: { + List values = new ArrayList<>(); + for (int i = 0; i < maxCapacity; i++) { + values.add(RANDOM.nextFloat()); + } + return values; + } + case Double: { + List values = new ArrayList<>(); + for (int i = 0; i < maxCapacity; i++) { + values.add(RANDOM.nextDouble()); + } + return values; + } + case VarChar: { + List values = new ArrayList<>(); + for (int i = 0; i < maxCapacity; i++) { + values.add(String.format("varchar_arr_%d", i)); + } + return values; + } + default: + Assertions.fail(); + } + return null; + } +} diff --git a/sdk-core/pom.xml b/sdk-core/pom.xml new file mode 100644 index 000000000..6bee1e9de --- /dev/null +++ b/sdk-core/pom.xml @@ -0,0 +1,176 @@ + + + 4.0.0 + + io.milvus + milvus-sdk-java-parent + ${revision} + ../pom.xml + + + milvus-sdk-java + jar + ${project.artifactId} + Milvus Java SDK core functions + + + + + io.grpc + grpc-bom + ${grpc.version} + pom + import + + + org.slf4j + slf4j-api + ${slf4j.api.version} + + + com.google.guava + guava + ${guava.version} + + + com.google.errorprone + error_prone_annotations + ${errorprone.version} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-stdlib-common + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + org.testcontainers + testcontainers-bom + ${testcontainers.version} + pom + import + + + + + + + org.mockito + mockito-core + ${mockito.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockito.version} + test + + + org.mockito + mockito-inline + ${mockito.version} + test + + + io.grpc + grpc-netty-shaded + ${grpc.version} + + + io.grpc + grpc-protobuf + ${grpc.version} + + + io.grpc + grpc-stub + ${grpc.version} + + + javax.annotation + javax.annotation-api + ${javax.annotation.version} + provided + + + io.grpc + grpc-testing + test + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + org.apache.commons + commons-text + ${commons.text.version} + + + org.apache.commons + commons-collections4 + ${commons-collections4.version} + + + junit + junit + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + test + + + org.testcontainers + milvus + test + + + org.testcontainers + junit-jupiter + test + + + org.projectlombok + lombok + ${lombok.version} + provided + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + + com.google.code.gson + gson + ${gson.version} + + + org.apache.commons + commons-pool2 + ${apache.commons.pool2.version} + + + org.slf4j + slf4j-api + provided + + + \ No newline at end of file diff --git a/src/main/java/io/milvus/client/AbstractMilvusGrpcClient.java b/sdk-core/src/main/java/io/milvus/client/AbstractMilvusGrpcClient.java similarity index 100% rename from src/main/java/io/milvus/client/AbstractMilvusGrpcClient.java rename to sdk-core/src/main/java/io/milvus/client/AbstractMilvusGrpcClient.java diff --git a/src/main/java/io/milvus/client/MilvusClient.java b/sdk-core/src/main/java/io/milvus/client/MilvusClient.java similarity index 100% rename from src/main/java/io/milvus/client/MilvusClient.java rename to sdk-core/src/main/java/io/milvus/client/MilvusClient.java diff --git a/src/main/java/io/milvus/client/MilvusMultiServiceClient.java b/sdk-core/src/main/java/io/milvus/client/MilvusMultiServiceClient.java similarity index 100% rename from src/main/java/io/milvus/client/MilvusMultiServiceClient.java rename to sdk-core/src/main/java/io/milvus/client/MilvusMultiServiceClient.java diff --git a/src/main/java/io/milvus/client/MilvusServiceClient.java b/sdk-core/src/main/java/io/milvus/client/MilvusServiceClient.java similarity index 100% rename from src/main/java/io/milvus/client/MilvusServiceClient.java rename to sdk-core/src/main/java/io/milvus/client/MilvusServiceClient.java diff --git a/src/main/java/io/milvus/common/clientenum/ConsistencyLevelEnum.java b/sdk-core/src/main/java/io/milvus/common/clientenum/ConsistencyLevelEnum.java similarity index 100% rename from src/main/java/io/milvus/common/clientenum/ConsistencyLevelEnum.java rename to sdk-core/src/main/java/io/milvus/common/clientenum/ConsistencyLevelEnum.java diff --git a/src/main/java/io/milvus/common/clientenum/FunctionType.java b/sdk-core/src/main/java/io/milvus/common/clientenum/FunctionType.java similarity index 100% rename from src/main/java/io/milvus/common/clientenum/FunctionType.java rename to sdk-core/src/main/java/io/milvus/common/clientenum/FunctionType.java diff --git a/src/main/java/io/milvus/common/constant/MilvusClientConstant.java b/sdk-core/src/main/java/io/milvus/common/constant/MilvusClientConstant.java similarity index 100% rename from src/main/java/io/milvus/common/constant/MilvusClientConstant.java rename to sdk-core/src/main/java/io/milvus/common/constant/MilvusClientConstant.java diff --git a/src/main/java/io/milvus/common/resourcegroup/ResourceGroupConfig.java b/sdk-core/src/main/java/io/milvus/common/resourcegroup/ResourceGroupConfig.java similarity index 100% rename from src/main/java/io/milvus/common/resourcegroup/ResourceGroupConfig.java rename to sdk-core/src/main/java/io/milvus/common/resourcegroup/ResourceGroupConfig.java diff --git a/src/main/java/io/milvus/common/resourcegroup/ResourceGroupLimit.java b/sdk-core/src/main/java/io/milvus/common/resourcegroup/ResourceGroupLimit.java similarity index 100% rename from src/main/java/io/milvus/common/resourcegroup/ResourceGroupLimit.java rename to sdk-core/src/main/java/io/milvus/common/resourcegroup/ResourceGroupLimit.java diff --git a/src/main/java/io/milvus/common/resourcegroup/ResourceGroupNodeFilter.java b/sdk-core/src/main/java/io/milvus/common/resourcegroup/ResourceGroupNodeFilter.java similarity index 100% rename from src/main/java/io/milvus/common/resourcegroup/ResourceGroupNodeFilter.java rename to sdk-core/src/main/java/io/milvus/common/resourcegroup/ResourceGroupNodeFilter.java diff --git a/src/main/java/io/milvus/common/resourcegroup/ResourceGroupTransfer.java b/sdk-core/src/main/java/io/milvus/common/resourcegroup/ResourceGroupTransfer.java similarity index 100% rename from src/main/java/io/milvus/common/resourcegroup/ResourceGroupTransfer.java rename to sdk-core/src/main/java/io/milvus/common/resourcegroup/ResourceGroupTransfer.java diff --git a/src/main/java/io/milvus/common/utils/ExceptionUtils.java b/sdk-core/src/main/java/io/milvus/common/utils/ExceptionUtils.java similarity index 100% rename from src/main/java/io/milvus/common/utils/ExceptionUtils.java rename to sdk-core/src/main/java/io/milvus/common/utils/ExceptionUtils.java diff --git a/src/main/java/io/milvus/common/utils/Float16Utils.java b/sdk-core/src/main/java/io/milvus/common/utils/Float16Utils.java similarity index 100% rename from src/main/java/io/milvus/common/utils/Float16Utils.java rename to sdk-core/src/main/java/io/milvus/common/utils/Float16Utils.java diff --git a/src/main/java/io/milvus/common/utils/GTsDict.java b/sdk-core/src/main/java/io/milvus/common/utils/GTsDict.java similarity index 100% rename from src/main/java/io/milvus/common/utils/GTsDict.java rename to sdk-core/src/main/java/io/milvus/common/utils/GTsDict.java diff --git a/src/main/java/io/milvus/common/utils/JsonUtils.java b/sdk-core/src/main/java/io/milvus/common/utils/JsonUtils.java similarity index 100% rename from src/main/java/io/milvus/common/utils/JsonUtils.java rename to sdk-core/src/main/java/io/milvus/common/utils/JsonUtils.java diff --git a/src/main/java/io/milvus/common/utils/URLParser.java b/sdk-core/src/main/java/io/milvus/common/utils/URLParser.java similarity index 100% rename from src/main/java/io/milvus/common/utils/URLParser.java rename to sdk-core/src/main/java/io/milvus/common/utils/URLParser.java diff --git a/src/main/java/io/milvus/common/utils/VectorUtils.java b/sdk-core/src/main/java/io/milvus/common/utils/VectorUtils.java similarity index 100% rename from src/main/java/io/milvus/common/utils/VectorUtils.java rename to sdk-core/src/main/java/io/milvus/common/utils/VectorUtils.java diff --git a/src/main/java/io/milvus/connection/ClusterFactory.java b/sdk-core/src/main/java/io/milvus/connection/ClusterFactory.java similarity index 100% rename from src/main/java/io/milvus/connection/ClusterFactory.java rename to sdk-core/src/main/java/io/milvus/connection/ClusterFactory.java diff --git a/src/main/java/io/milvus/connection/ClusterListener.java b/sdk-core/src/main/java/io/milvus/connection/ClusterListener.java similarity index 100% rename from src/main/java/io/milvus/connection/ClusterListener.java rename to sdk-core/src/main/java/io/milvus/connection/ClusterListener.java diff --git a/src/main/java/io/milvus/connection/Listener.java b/sdk-core/src/main/java/io/milvus/connection/Listener.java similarity index 100% rename from src/main/java/io/milvus/connection/Listener.java rename to sdk-core/src/main/java/io/milvus/connection/Listener.java diff --git a/src/main/java/io/milvus/connection/QueryNodeListener.java b/sdk-core/src/main/java/io/milvus/connection/QueryNodeListener.java similarity index 100% rename from src/main/java/io/milvus/connection/QueryNodeListener.java rename to sdk-core/src/main/java/io/milvus/connection/QueryNodeListener.java diff --git a/src/main/java/io/milvus/connection/ServerMonitor.java b/sdk-core/src/main/java/io/milvus/connection/ServerMonitor.java similarity index 100% rename from src/main/java/io/milvus/connection/ServerMonitor.java rename to sdk-core/src/main/java/io/milvus/connection/ServerMonitor.java diff --git a/src/main/java/io/milvus/connection/ServerSetting.java b/sdk-core/src/main/java/io/milvus/connection/ServerSetting.java similarity index 100% rename from src/main/java/io/milvus/connection/ServerSetting.java rename to sdk-core/src/main/java/io/milvus/connection/ServerSetting.java diff --git a/src/main/java/io/milvus/exception/ClientNotConnectedException.java b/sdk-core/src/main/java/io/milvus/exception/ClientNotConnectedException.java similarity index 100% rename from src/main/java/io/milvus/exception/ClientNotConnectedException.java rename to sdk-core/src/main/java/io/milvus/exception/ClientNotConnectedException.java diff --git a/src/main/java/io/milvus/exception/IllegalResponseException.java b/sdk-core/src/main/java/io/milvus/exception/IllegalResponseException.java similarity index 100% rename from src/main/java/io/milvus/exception/IllegalResponseException.java rename to sdk-core/src/main/java/io/milvus/exception/IllegalResponseException.java diff --git a/src/main/java/io/milvus/exception/MilvusException.java b/sdk-core/src/main/java/io/milvus/exception/MilvusException.java similarity index 100% rename from src/main/java/io/milvus/exception/MilvusException.java rename to sdk-core/src/main/java/io/milvus/exception/MilvusException.java diff --git a/src/main/java/io/milvus/exception/ParamException.java b/sdk-core/src/main/java/io/milvus/exception/ParamException.java similarity index 100% rename from src/main/java/io/milvus/exception/ParamException.java rename to sdk-core/src/main/java/io/milvus/exception/ParamException.java diff --git a/src/main/java/io/milvus/exception/ServerException.java b/sdk-core/src/main/java/io/milvus/exception/ServerException.java similarity index 100% rename from src/main/java/io/milvus/exception/ServerException.java rename to sdk-core/src/main/java/io/milvus/exception/ServerException.java diff --git a/src/main/java/io/milvus/exception/UnExpectedException.java b/sdk-core/src/main/java/io/milvus/exception/UnExpectedException.java similarity index 100% rename from src/main/java/io/milvus/exception/UnExpectedException.java rename to sdk-core/src/main/java/io/milvus/exception/UnExpectedException.java diff --git a/src/main/java/io/milvus/orm/iterator/IteratorAdapterV2.java b/sdk-core/src/main/java/io/milvus/orm/iterator/IteratorAdapterV2.java similarity index 100% rename from src/main/java/io/milvus/orm/iterator/IteratorAdapterV2.java rename to sdk-core/src/main/java/io/milvus/orm/iterator/IteratorAdapterV2.java diff --git a/src/main/java/io/milvus/orm/iterator/IteratorCache.java b/sdk-core/src/main/java/io/milvus/orm/iterator/IteratorCache.java similarity index 100% rename from src/main/java/io/milvus/orm/iterator/IteratorCache.java rename to sdk-core/src/main/java/io/milvus/orm/iterator/IteratorCache.java diff --git a/src/main/java/io/milvus/orm/iterator/QueryIterator.java b/sdk-core/src/main/java/io/milvus/orm/iterator/QueryIterator.java similarity index 100% rename from src/main/java/io/milvus/orm/iterator/QueryIterator.java rename to sdk-core/src/main/java/io/milvus/orm/iterator/QueryIterator.java diff --git a/src/main/java/io/milvus/orm/iterator/SearchIterator.java b/sdk-core/src/main/java/io/milvus/orm/iterator/SearchIterator.java similarity index 98% rename from src/main/java/io/milvus/orm/iterator/SearchIterator.java rename to sdk-core/src/main/java/io/milvus/orm/iterator/SearchIterator.java index 00d15921d..c77eef80b 100644 --- a/src/main/java/io/milvus/orm/iterator/SearchIterator.java +++ b/sdk-core/src/main/java/io/milvus/orm/iterator/SearchIterator.java @@ -1,7 +1,6 @@ package io.milvus.orm.iterator; -import com.amazonaws.util.CollectionUtils; -import com.amazonaws.util.StringUtils; + import com.google.common.collect.Lists; import com.google.gson.reflect.TypeToken; import io.milvus.common.utils.ExceptionUtils; @@ -19,6 +18,8 @@ import io.milvus.v2.service.collection.request.CreateCollectionReq; import io.milvus.v2.service.vector.request.SearchIteratorReq; import io.milvus.v2.utils.RpcUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -185,7 +186,7 @@ private void initSearchIterator() { SearchResultsWrapper searchResultsWrapper = new SearchResultsWrapper(response.getResults()); List result = searchResultsWrapper.getRowRecords(0); - if (CollectionUtils.isNullOrEmpty(result)) { + if (CollectionUtils.isEmpty(result)) { String msg = "Cannot init search iterator because init page contains no matched rows, " + "please check the radius and range_filter set up by searchParams"; logger.error(msg); @@ -212,7 +213,7 @@ private void setUpRangeParameters(List page) { private void updateFilteredIds(SearchResultsWrapper searchResultsWrapper) { List idScores = searchResultsWrapper.getIDScore(0); - if (CollectionUtils.isNullOrEmpty(idScores)) { + if (CollectionUtils.isEmpty(idScores)) { return; } @@ -261,7 +262,7 @@ private SearchResults executeSearch(Map params, String nextExpr, .withMetricType(MetricType.valueOf(searchIteratorParam.getMetricType())) .withIgnoreGrowing(searchIteratorParam.isIgnoreGrowing()); - if (!StringUtils.isNullOrEmpty(searchIteratorParam.getGroupByFieldName())) { + if (StringUtils.isNotEmpty(searchIteratorParam.getGroupByFieldName())) { searchParamBuilder.withGroupByFieldName(searchIteratorParam.getGroupByFieldName()); } fillVectorsByPlType(searchParamBuilder); @@ -455,7 +456,7 @@ private Map nextParams(int coefficient) { } private String filteredDuplicatedResultExpr(String expr) { - if (CollectionUtils.isNullOrEmpty(filteredIds)) { + if (CollectionUtils.isEmpty(filteredIds)) { return expr; } diff --git a/src/main/java/io/milvus/param/ConnectParam.java b/sdk-core/src/main/java/io/milvus/param/ConnectParam.java similarity index 100% rename from src/main/java/io/milvus/param/ConnectParam.java rename to sdk-core/src/main/java/io/milvus/param/ConnectParam.java diff --git a/src/main/java/io/milvus/param/Constant.java b/sdk-core/src/main/java/io/milvus/param/Constant.java similarity index 100% rename from src/main/java/io/milvus/param/Constant.java rename to sdk-core/src/main/java/io/milvus/param/Constant.java diff --git a/src/main/java/io/milvus/param/IndexBuildState.java b/sdk-core/src/main/java/io/milvus/param/IndexBuildState.java similarity index 100% rename from src/main/java/io/milvus/param/IndexBuildState.java rename to sdk-core/src/main/java/io/milvus/param/IndexBuildState.java diff --git a/src/main/java/io/milvus/param/IndexType.java b/sdk-core/src/main/java/io/milvus/param/IndexType.java similarity index 100% rename from src/main/java/io/milvus/param/IndexType.java rename to sdk-core/src/main/java/io/milvus/param/IndexType.java diff --git a/src/main/java/io/milvus/param/LogLevel.java b/sdk-core/src/main/java/io/milvus/param/LogLevel.java similarity index 100% rename from src/main/java/io/milvus/param/LogLevel.java rename to sdk-core/src/main/java/io/milvus/param/LogLevel.java diff --git a/src/main/java/io/milvus/param/MetricType.java b/sdk-core/src/main/java/io/milvus/param/MetricType.java similarity index 100% rename from src/main/java/io/milvus/param/MetricType.java rename to sdk-core/src/main/java/io/milvus/param/MetricType.java diff --git a/src/main/java/io/milvus/param/MultiConnectParam.java b/sdk-core/src/main/java/io/milvus/param/MultiConnectParam.java similarity index 100% rename from src/main/java/io/milvus/param/MultiConnectParam.java rename to sdk-core/src/main/java/io/milvus/param/MultiConnectParam.java diff --git a/src/main/java/io/milvus/param/ParamUtils.java b/sdk-core/src/main/java/io/milvus/param/ParamUtils.java similarity index 100% rename from src/main/java/io/milvus/param/ParamUtils.java rename to sdk-core/src/main/java/io/milvus/param/ParamUtils.java diff --git a/src/main/java/io/milvus/param/QueryNodeSingleSearch.java b/sdk-core/src/main/java/io/milvus/param/QueryNodeSingleSearch.java similarity index 100% rename from src/main/java/io/milvus/param/QueryNodeSingleSearch.java rename to sdk-core/src/main/java/io/milvus/param/QueryNodeSingleSearch.java diff --git a/src/main/java/io/milvus/param/R.java b/sdk-core/src/main/java/io/milvus/param/R.java similarity index 100% rename from src/main/java/io/milvus/param/R.java rename to sdk-core/src/main/java/io/milvus/param/R.java diff --git a/src/main/java/io/milvus/param/RetryParam.java b/sdk-core/src/main/java/io/milvus/param/RetryParam.java similarity index 100% rename from src/main/java/io/milvus/param/RetryParam.java rename to sdk-core/src/main/java/io/milvus/param/RetryParam.java diff --git a/src/main/java/io/milvus/param/RpcStatus.java b/sdk-core/src/main/java/io/milvus/param/RpcStatus.java similarity index 100% rename from src/main/java/io/milvus/param/RpcStatus.java rename to sdk-core/src/main/java/io/milvus/param/RpcStatus.java diff --git a/src/main/java/io/milvus/param/ServerAddress.java b/sdk-core/src/main/java/io/milvus/param/ServerAddress.java similarity index 100% rename from src/main/java/io/milvus/param/ServerAddress.java rename to sdk-core/src/main/java/io/milvus/param/ServerAddress.java diff --git a/src/main/java/io/milvus/param/alias/AlterAliasParam.java b/sdk-core/src/main/java/io/milvus/param/alias/AlterAliasParam.java similarity index 100% rename from src/main/java/io/milvus/param/alias/AlterAliasParam.java rename to sdk-core/src/main/java/io/milvus/param/alias/AlterAliasParam.java diff --git a/src/main/java/io/milvus/param/alias/CreateAliasParam.java b/sdk-core/src/main/java/io/milvus/param/alias/CreateAliasParam.java similarity index 100% rename from src/main/java/io/milvus/param/alias/CreateAliasParam.java rename to sdk-core/src/main/java/io/milvus/param/alias/CreateAliasParam.java diff --git a/src/main/java/io/milvus/param/alias/DropAliasParam.java b/sdk-core/src/main/java/io/milvus/param/alias/DropAliasParam.java similarity index 100% rename from src/main/java/io/milvus/param/alias/DropAliasParam.java rename to sdk-core/src/main/java/io/milvus/param/alias/DropAliasParam.java diff --git a/src/main/java/io/milvus/param/alias/ListAliasesParam.java b/sdk-core/src/main/java/io/milvus/param/alias/ListAliasesParam.java similarity index 100% rename from src/main/java/io/milvus/param/alias/ListAliasesParam.java rename to sdk-core/src/main/java/io/milvus/param/alias/ListAliasesParam.java diff --git a/src/main/java/io/milvus/param/bulkinsert/BulkInsertParam.java b/sdk-core/src/main/java/io/milvus/param/bulkinsert/BulkInsertParam.java similarity index 100% rename from src/main/java/io/milvus/param/bulkinsert/BulkInsertParam.java rename to sdk-core/src/main/java/io/milvus/param/bulkinsert/BulkInsertParam.java diff --git a/src/main/java/io/milvus/param/bulkinsert/GetBulkInsertStateParam.java b/sdk-core/src/main/java/io/milvus/param/bulkinsert/GetBulkInsertStateParam.java similarity index 100% rename from src/main/java/io/milvus/param/bulkinsert/GetBulkInsertStateParam.java rename to sdk-core/src/main/java/io/milvus/param/bulkinsert/GetBulkInsertStateParam.java diff --git a/src/main/java/io/milvus/param/bulkinsert/ListBulkInsertTasksParam.java b/sdk-core/src/main/java/io/milvus/param/bulkinsert/ListBulkInsertTasksParam.java similarity index 100% rename from src/main/java/io/milvus/param/bulkinsert/ListBulkInsertTasksParam.java rename to sdk-core/src/main/java/io/milvus/param/bulkinsert/ListBulkInsertTasksParam.java diff --git a/src/main/java/io/milvus/param/collection/AlterCollectionParam.java b/sdk-core/src/main/java/io/milvus/param/collection/AlterCollectionParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/AlterCollectionParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/AlterCollectionParam.java diff --git a/src/main/java/io/milvus/param/collection/AlterDatabaseParam.java b/sdk-core/src/main/java/io/milvus/param/collection/AlterDatabaseParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/AlterDatabaseParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/AlterDatabaseParam.java diff --git a/src/main/java/io/milvus/param/collection/CollectionSchemaParam.java b/sdk-core/src/main/java/io/milvus/param/collection/CollectionSchemaParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/CollectionSchemaParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/CollectionSchemaParam.java diff --git a/src/main/java/io/milvus/param/collection/CreateCollectionParam.java b/sdk-core/src/main/java/io/milvus/param/collection/CreateCollectionParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/CreateCollectionParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/CreateCollectionParam.java diff --git a/src/main/java/io/milvus/param/collection/CreateDatabaseParam.java b/sdk-core/src/main/java/io/milvus/param/collection/CreateDatabaseParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/CreateDatabaseParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/CreateDatabaseParam.java diff --git a/src/main/java/io/milvus/param/collection/DescribeCollectionParam.java b/sdk-core/src/main/java/io/milvus/param/collection/DescribeCollectionParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/DescribeCollectionParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/DescribeCollectionParam.java diff --git a/src/main/java/io/milvus/param/collection/DescribeDatabaseParam.java b/sdk-core/src/main/java/io/milvus/param/collection/DescribeDatabaseParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/DescribeDatabaseParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/DescribeDatabaseParam.java diff --git a/src/main/java/io/milvus/param/collection/DropCollectionParam.java b/sdk-core/src/main/java/io/milvus/param/collection/DropCollectionParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/DropCollectionParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/DropCollectionParam.java diff --git a/src/main/java/io/milvus/param/collection/DropDatabaseParam.java b/sdk-core/src/main/java/io/milvus/param/collection/DropDatabaseParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/DropDatabaseParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/DropDatabaseParam.java diff --git a/src/main/java/io/milvus/param/collection/FieldType.java b/sdk-core/src/main/java/io/milvus/param/collection/FieldType.java similarity index 100% rename from src/main/java/io/milvus/param/collection/FieldType.java rename to sdk-core/src/main/java/io/milvus/param/collection/FieldType.java diff --git a/src/main/java/io/milvus/param/collection/FlushParam.java b/sdk-core/src/main/java/io/milvus/param/collection/FlushParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/FlushParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/FlushParam.java diff --git a/src/main/java/io/milvus/param/collection/GetCollectionStatisticsParam.java b/sdk-core/src/main/java/io/milvus/param/collection/GetCollectionStatisticsParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/GetCollectionStatisticsParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/GetCollectionStatisticsParam.java diff --git a/src/main/java/io/milvus/param/collection/GetLoadStateParam.java b/sdk-core/src/main/java/io/milvus/param/collection/GetLoadStateParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/GetLoadStateParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/GetLoadStateParam.java diff --git a/src/main/java/io/milvus/param/collection/GetLoadingProgressParam.java b/sdk-core/src/main/java/io/milvus/param/collection/GetLoadingProgressParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/GetLoadingProgressParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/GetLoadingProgressParam.java diff --git a/src/main/java/io/milvus/param/collection/HasCollectionParam.java b/sdk-core/src/main/java/io/milvus/param/collection/HasCollectionParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/HasCollectionParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/HasCollectionParam.java diff --git a/src/main/java/io/milvus/param/collection/LoadCollectionParam.java b/sdk-core/src/main/java/io/milvus/param/collection/LoadCollectionParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/LoadCollectionParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/LoadCollectionParam.java diff --git a/src/main/java/io/milvus/param/collection/ReleaseCollectionParam.java b/sdk-core/src/main/java/io/milvus/param/collection/ReleaseCollectionParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/ReleaseCollectionParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/ReleaseCollectionParam.java diff --git a/src/main/java/io/milvus/param/collection/RenameCollectionParam.java b/sdk-core/src/main/java/io/milvus/param/collection/RenameCollectionParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/RenameCollectionParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/RenameCollectionParam.java diff --git a/src/main/java/io/milvus/param/collection/ShowCollectionsParam.java b/sdk-core/src/main/java/io/milvus/param/collection/ShowCollectionsParam.java similarity index 100% rename from src/main/java/io/milvus/param/collection/ShowCollectionsParam.java rename to sdk-core/src/main/java/io/milvus/param/collection/ShowCollectionsParam.java diff --git a/src/main/java/io/milvus/param/control/GetCompactionPlansParam.java b/sdk-core/src/main/java/io/milvus/param/control/GetCompactionPlansParam.java similarity index 100% rename from src/main/java/io/milvus/param/control/GetCompactionPlansParam.java rename to sdk-core/src/main/java/io/milvus/param/control/GetCompactionPlansParam.java diff --git a/src/main/java/io/milvus/param/control/GetCompactionStateParam.java b/sdk-core/src/main/java/io/milvus/param/control/GetCompactionStateParam.java similarity index 100% rename from src/main/java/io/milvus/param/control/GetCompactionStateParam.java rename to sdk-core/src/main/java/io/milvus/param/control/GetCompactionStateParam.java diff --git a/src/main/java/io/milvus/param/control/GetFlushAllStateParam.java b/sdk-core/src/main/java/io/milvus/param/control/GetFlushAllStateParam.java similarity index 100% rename from src/main/java/io/milvus/param/control/GetFlushAllStateParam.java rename to sdk-core/src/main/java/io/milvus/param/control/GetFlushAllStateParam.java diff --git a/src/main/java/io/milvus/param/control/GetFlushStateParam.java b/sdk-core/src/main/java/io/milvus/param/control/GetFlushStateParam.java similarity index 100% rename from src/main/java/io/milvus/param/control/GetFlushStateParam.java rename to sdk-core/src/main/java/io/milvus/param/control/GetFlushStateParam.java diff --git a/src/main/java/io/milvus/param/control/GetMetricsParam.java b/sdk-core/src/main/java/io/milvus/param/control/GetMetricsParam.java similarity index 100% rename from src/main/java/io/milvus/param/control/GetMetricsParam.java rename to sdk-core/src/main/java/io/milvus/param/control/GetMetricsParam.java diff --git a/src/main/java/io/milvus/param/control/GetPersistentSegmentInfoParam.java b/sdk-core/src/main/java/io/milvus/param/control/GetPersistentSegmentInfoParam.java similarity index 100% rename from src/main/java/io/milvus/param/control/GetPersistentSegmentInfoParam.java rename to sdk-core/src/main/java/io/milvus/param/control/GetPersistentSegmentInfoParam.java diff --git a/src/main/java/io/milvus/param/control/GetQuerySegmentInfoParam.java b/sdk-core/src/main/java/io/milvus/param/control/GetQuerySegmentInfoParam.java similarity index 100% rename from src/main/java/io/milvus/param/control/GetQuerySegmentInfoParam.java rename to sdk-core/src/main/java/io/milvus/param/control/GetQuerySegmentInfoParam.java diff --git a/src/main/java/io/milvus/param/control/GetReplicasParam.java b/sdk-core/src/main/java/io/milvus/param/control/GetReplicasParam.java similarity index 100% rename from src/main/java/io/milvus/param/control/GetReplicasParam.java rename to sdk-core/src/main/java/io/milvus/param/control/GetReplicasParam.java diff --git a/src/main/java/io/milvus/param/control/LoadBalanceParam.java b/sdk-core/src/main/java/io/milvus/param/control/LoadBalanceParam.java similarity index 100% rename from src/main/java/io/milvus/param/control/LoadBalanceParam.java rename to sdk-core/src/main/java/io/milvus/param/control/LoadBalanceParam.java diff --git a/src/main/java/io/milvus/param/control/ManualCompactParam.java b/sdk-core/src/main/java/io/milvus/param/control/ManualCompactParam.java similarity index 100% rename from src/main/java/io/milvus/param/control/ManualCompactParam.java rename to sdk-core/src/main/java/io/milvus/param/control/ManualCompactParam.java diff --git a/src/main/java/io/milvus/param/credential/CreateCredentialParam.java b/sdk-core/src/main/java/io/milvus/param/credential/CreateCredentialParam.java similarity index 100% rename from src/main/java/io/milvus/param/credential/CreateCredentialParam.java rename to sdk-core/src/main/java/io/milvus/param/credential/CreateCredentialParam.java diff --git a/src/main/java/io/milvus/param/credential/DeleteCredentialParam.java b/sdk-core/src/main/java/io/milvus/param/credential/DeleteCredentialParam.java similarity index 100% rename from src/main/java/io/milvus/param/credential/DeleteCredentialParam.java rename to sdk-core/src/main/java/io/milvus/param/credential/DeleteCredentialParam.java diff --git a/src/main/java/io/milvus/param/credential/ListCredUsersParam.java b/sdk-core/src/main/java/io/milvus/param/credential/ListCredUsersParam.java similarity index 100% rename from src/main/java/io/milvus/param/credential/ListCredUsersParam.java rename to sdk-core/src/main/java/io/milvus/param/credential/ListCredUsersParam.java diff --git a/src/main/java/io/milvus/param/credential/UpdateCredentialParam.java b/sdk-core/src/main/java/io/milvus/param/credential/UpdateCredentialParam.java similarity index 100% rename from src/main/java/io/milvus/param/credential/UpdateCredentialParam.java rename to sdk-core/src/main/java/io/milvus/param/credential/UpdateCredentialParam.java diff --git a/src/main/java/io/milvus/param/dml/AnnSearchParam.java b/sdk-core/src/main/java/io/milvus/param/dml/AnnSearchParam.java similarity index 100% rename from src/main/java/io/milvus/param/dml/AnnSearchParam.java rename to sdk-core/src/main/java/io/milvus/param/dml/AnnSearchParam.java diff --git a/src/main/java/io/milvus/param/dml/DeleteParam.java b/sdk-core/src/main/java/io/milvus/param/dml/DeleteParam.java similarity index 100% rename from src/main/java/io/milvus/param/dml/DeleteParam.java rename to sdk-core/src/main/java/io/milvus/param/dml/DeleteParam.java diff --git a/src/main/java/io/milvus/param/dml/HybridSearchParam.java b/sdk-core/src/main/java/io/milvus/param/dml/HybridSearchParam.java similarity index 100% rename from src/main/java/io/milvus/param/dml/HybridSearchParam.java rename to sdk-core/src/main/java/io/milvus/param/dml/HybridSearchParam.java diff --git a/src/main/java/io/milvus/param/dml/InsertParam.java b/sdk-core/src/main/java/io/milvus/param/dml/InsertParam.java similarity index 100% rename from src/main/java/io/milvus/param/dml/InsertParam.java rename to sdk-core/src/main/java/io/milvus/param/dml/InsertParam.java diff --git a/src/main/java/io/milvus/param/dml/QueryIteratorParam.java b/sdk-core/src/main/java/io/milvus/param/dml/QueryIteratorParam.java similarity index 100% rename from src/main/java/io/milvus/param/dml/QueryIteratorParam.java rename to sdk-core/src/main/java/io/milvus/param/dml/QueryIteratorParam.java diff --git a/src/main/java/io/milvus/param/dml/QueryParam.java b/sdk-core/src/main/java/io/milvus/param/dml/QueryParam.java similarity index 100% rename from src/main/java/io/milvus/param/dml/QueryParam.java rename to sdk-core/src/main/java/io/milvus/param/dml/QueryParam.java diff --git a/src/main/java/io/milvus/param/dml/SearchIteratorParam.java b/sdk-core/src/main/java/io/milvus/param/dml/SearchIteratorParam.java similarity index 100% rename from src/main/java/io/milvus/param/dml/SearchIteratorParam.java rename to sdk-core/src/main/java/io/milvus/param/dml/SearchIteratorParam.java diff --git a/src/main/java/io/milvus/param/dml/SearchParam.java b/sdk-core/src/main/java/io/milvus/param/dml/SearchParam.java similarity index 100% rename from src/main/java/io/milvus/param/dml/SearchParam.java rename to sdk-core/src/main/java/io/milvus/param/dml/SearchParam.java diff --git a/src/main/java/io/milvus/param/dml/UpsertParam.java b/sdk-core/src/main/java/io/milvus/param/dml/UpsertParam.java similarity index 100% rename from src/main/java/io/milvus/param/dml/UpsertParam.java rename to sdk-core/src/main/java/io/milvus/param/dml/UpsertParam.java diff --git a/src/main/java/io/milvus/param/dml/ranker/BaseRanker.java b/sdk-core/src/main/java/io/milvus/param/dml/ranker/BaseRanker.java similarity index 100% rename from src/main/java/io/milvus/param/dml/ranker/BaseRanker.java rename to sdk-core/src/main/java/io/milvus/param/dml/ranker/BaseRanker.java diff --git a/src/main/java/io/milvus/param/dml/ranker/RRFRanker.java b/sdk-core/src/main/java/io/milvus/param/dml/ranker/RRFRanker.java similarity index 100% rename from src/main/java/io/milvus/param/dml/ranker/RRFRanker.java rename to sdk-core/src/main/java/io/milvus/param/dml/ranker/RRFRanker.java diff --git a/src/main/java/io/milvus/param/dml/ranker/WeightedRanker.java b/sdk-core/src/main/java/io/milvus/param/dml/ranker/WeightedRanker.java similarity index 100% rename from src/main/java/io/milvus/param/dml/ranker/WeightedRanker.java rename to sdk-core/src/main/java/io/milvus/param/dml/ranker/WeightedRanker.java diff --git a/src/main/java/io/milvus/param/highlevel/collection/CreateSimpleCollectionParam.java b/sdk-core/src/main/java/io/milvus/param/highlevel/collection/CreateSimpleCollectionParam.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/collection/CreateSimpleCollectionParam.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/collection/CreateSimpleCollectionParam.java diff --git a/src/main/java/io/milvus/param/highlevel/collection/ListCollectionsParam.java b/sdk-core/src/main/java/io/milvus/param/highlevel/collection/ListCollectionsParam.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/collection/ListCollectionsParam.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/collection/ListCollectionsParam.java diff --git a/src/main/java/io/milvus/param/highlevel/collection/response/ListCollectionsResponse.java b/sdk-core/src/main/java/io/milvus/param/highlevel/collection/response/ListCollectionsResponse.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/collection/response/ListCollectionsResponse.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/collection/response/ListCollectionsResponse.java diff --git a/src/main/java/io/milvus/param/highlevel/dml/DeleteIdsParam.java b/sdk-core/src/main/java/io/milvus/param/highlevel/dml/DeleteIdsParam.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/dml/DeleteIdsParam.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/dml/DeleteIdsParam.java diff --git a/src/main/java/io/milvus/param/highlevel/dml/GetIdsParam.java b/sdk-core/src/main/java/io/milvus/param/highlevel/dml/GetIdsParam.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/dml/GetIdsParam.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/dml/GetIdsParam.java diff --git a/src/main/java/io/milvus/param/highlevel/dml/InsertRowsParam.java b/sdk-core/src/main/java/io/milvus/param/highlevel/dml/InsertRowsParam.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/dml/InsertRowsParam.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/dml/InsertRowsParam.java diff --git a/src/main/java/io/milvus/param/highlevel/dml/QuerySimpleParam.java b/sdk-core/src/main/java/io/milvus/param/highlevel/dml/QuerySimpleParam.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/dml/QuerySimpleParam.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/dml/QuerySimpleParam.java diff --git a/src/main/java/io/milvus/param/highlevel/dml/SearchSimpleParam.java b/sdk-core/src/main/java/io/milvus/param/highlevel/dml/SearchSimpleParam.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/dml/SearchSimpleParam.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/dml/SearchSimpleParam.java diff --git a/src/main/java/io/milvus/param/highlevel/dml/response/DeleteResponse.java b/sdk-core/src/main/java/io/milvus/param/highlevel/dml/response/DeleteResponse.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/dml/response/DeleteResponse.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/dml/response/DeleteResponse.java diff --git a/src/main/java/io/milvus/param/highlevel/dml/response/GetResponse.java b/sdk-core/src/main/java/io/milvus/param/highlevel/dml/response/GetResponse.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/dml/response/GetResponse.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/dml/response/GetResponse.java diff --git a/src/main/java/io/milvus/param/highlevel/dml/response/InsertResponse.java b/sdk-core/src/main/java/io/milvus/param/highlevel/dml/response/InsertResponse.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/dml/response/InsertResponse.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/dml/response/InsertResponse.java diff --git a/src/main/java/io/milvus/param/highlevel/dml/response/QueryResponse.java b/sdk-core/src/main/java/io/milvus/param/highlevel/dml/response/QueryResponse.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/dml/response/QueryResponse.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/dml/response/QueryResponse.java diff --git a/src/main/java/io/milvus/param/highlevel/dml/response/SearchResponse.java b/sdk-core/src/main/java/io/milvus/param/highlevel/dml/response/SearchResponse.java similarity index 100% rename from src/main/java/io/milvus/param/highlevel/dml/response/SearchResponse.java rename to sdk-core/src/main/java/io/milvus/param/highlevel/dml/response/SearchResponse.java diff --git a/src/main/java/io/milvus/param/index/AlterIndexParam.java b/sdk-core/src/main/java/io/milvus/param/index/AlterIndexParam.java similarity index 100% rename from src/main/java/io/milvus/param/index/AlterIndexParam.java rename to sdk-core/src/main/java/io/milvus/param/index/AlterIndexParam.java diff --git a/src/main/java/io/milvus/param/index/CreateIndexParam.java b/sdk-core/src/main/java/io/milvus/param/index/CreateIndexParam.java similarity index 100% rename from src/main/java/io/milvus/param/index/CreateIndexParam.java rename to sdk-core/src/main/java/io/milvus/param/index/CreateIndexParam.java diff --git a/src/main/java/io/milvus/param/index/DescribeIndexParam.java b/sdk-core/src/main/java/io/milvus/param/index/DescribeIndexParam.java similarity index 100% rename from src/main/java/io/milvus/param/index/DescribeIndexParam.java rename to sdk-core/src/main/java/io/milvus/param/index/DescribeIndexParam.java diff --git a/src/main/java/io/milvus/param/index/DropIndexParam.java b/sdk-core/src/main/java/io/milvus/param/index/DropIndexParam.java similarity index 100% rename from src/main/java/io/milvus/param/index/DropIndexParam.java rename to sdk-core/src/main/java/io/milvus/param/index/DropIndexParam.java diff --git a/src/main/java/io/milvus/param/index/GetIndexBuildProgressParam.java b/sdk-core/src/main/java/io/milvus/param/index/GetIndexBuildProgressParam.java similarity index 100% rename from src/main/java/io/milvus/param/index/GetIndexBuildProgressParam.java rename to sdk-core/src/main/java/io/milvus/param/index/GetIndexBuildProgressParam.java diff --git a/src/main/java/io/milvus/param/index/GetIndexStateParam.java b/sdk-core/src/main/java/io/milvus/param/index/GetIndexStateParam.java similarity index 100% rename from src/main/java/io/milvus/param/index/GetIndexStateParam.java rename to sdk-core/src/main/java/io/milvus/param/index/GetIndexStateParam.java diff --git a/src/main/java/io/milvus/param/partition/CreatePartitionParam.java b/sdk-core/src/main/java/io/milvus/param/partition/CreatePartitionParam.java similarity index 100% rename from src/main/java/io/milvus/param/partition/CreatePartitionParam.java rename to sdk-core/src/main/java/io/milvus/param/partition/CreatePartitionParam.java diff --git a/src/main/java/io/milvus/param/partition/DropPartitionParam.java b/sdk-core/src/main/java/io/milvus/param/partition/DropPartitionParam.java similarity index 100% rename from src/main/java/io/milvus/param/partition/DropPartitionParam.java rename to sdk-core/src/main/java/io/milvus/param/partition/DropPartitionParam.java diff --git a/src/main/java/io/milvus/param/partition/GetPartitionStatisticsParam.java b/sdk-core/src/main/java/io/milvus/param/partition/GetPartitionStatisticsParam.java similarity index 100% rename from src/main/java/io/milvus/param/partition/GetPartitionStatisticsParam.java rename to sdk-core/src/main/java/io/milvus/param/partition/GetPartitionStatisticsParam.java diff --git a/src/main/java/io/milvus/param/partition/HasPartitionParam.java b/sdk-core/src/main/java/io/milvus/param/partition/HasPartitionParam.java similarity index 100% rename from src/main/java/io/milvus/param/partition/HasPartitionParam.java rename to sdk-core/src/main/java/io/milvus/param/partition/HasPartitionParam.java diff --git a/src/main/java/io/milvus/param/partition/LoadPartitionsParam.java b/sdk-core/src/main/java/io/milvus/param/partition/LoadPartitionsParam.java similarity index 100% rename from src/main/java/io/milvus/param/partition/LoadPartitionsParam.java rename to sdk-core/src/main/java/io/milvus/param/partition/LoadPartitionsParam.java diff --git a/src/main/java/io/milvus/param/partition/ReleasePartitionsParam.java b/sdk-core/src/main/java/io/milvus/param/partition/ReleasePartitionsParam.java similarity index 100% rename from src/main/java/io/milvus/param/partition/ReleasePartitionsParam.java rename to sdk-core/src/main/java/io/milvus/param/partition/ReleasePartitionsParam.java diff --git a/src/main/java/io/milvus/param/partition/ShowPartitionsParam.java b/sdk-core/src/main/java/io/milvus/param/partition/ShowPartitionsParam.java similarity index 100% rename from src/main/java/io/milvus/param/partition/ShowPartitionsParam.java rename to sdk-core/src/main/java/io/milvus/param/partition/ShowPartitionsParam.java diff --git a/src/main/java/io/milvus/param/resourcegroup/CreateResourceGroupParam.java b/sdk-core/src/main/java/io/milvus/param/resourcegroup/CreateResourceGroupParam.java similarity index 100% rename from src/main/java/io/milvus/param/resourcegroup/CreateResourceGroupParam.java rename to sdk-core/src/main/java/io/milvus/param/resourcegroup/CreateResourceGroupParam.java diff --git a/src/main/java/io/milvus/param/resourcegroup/DescribeResourceGroupParam.java b/sdk-core/src/main/java/io/milvus/param/resourcegroup/DescribeResourceGroupParam.java similarity index 100% rename from src/main/java/io/milvus/param/resourcegroup/DescribeResourceGroupParam.java rename to sdk-core/src/main/java/io/milvus/param/resourcegroup/DescribeResourceGroupParam.java diff --git a/src/main/java/io/milvus/param/resourcegroup/DropResourceGroupParam.java b/sdk-core/src/main/java/io/milvus/param/resourcegroup/DropResourceGroupParam.java similarity index 100% rename from src/main/java/io/milvus/param/resourcegroup/DropResourceGroupParam.java rename to sdk-core/src/main/java/io/milvus/param/resourcegroup/DropResourceGroupParam.java diff --git a/src/main/java/io/milvus/param/resourcegroup/ListResourceGroupsParam.java b/sdk-core/src/main/java/io/milvus/param/resourcegroup/ListResourceGroupsParam.java similarity index 100% rename from src/main/java/io/milvus/param/resourcegroup/ListResourceGroupsParam.java rename to sdk-core/src/main/java/io/milvus/param/resourcegroup/ListResourceGroupsParam.java diff --git a/src/main/java/io/milvus/param/resourcegroup/TransferNodeParam.java b/sdk-core/src/main/java/io/milvus/param/resourcegroup/TransferNodeParam.java similarity index 100% rename from src/main/java/io/milvus/param/resourcegroup/TransferNodeParam.java rename to sdk-core/src/main/java/io/milvus/param/resourcegroup/TransferNodeParam.java diff --git a/src/main/java/io/milvus/param/resourcegroup/TransferReplicaParam.java b/sdk-core/src/main/java/io/milvus/param/resourcegroup/TransferReplicaParam.java similarity index 100% rename from src/main/java/io/milvus/param/resourcegroup/TransferReplicaParam.java rename to sdk-core/src/main/java/io/milvus/param/resourcegroup/TransferReplicaParam.java diff --git a/src/main/java/io/milvus/param/resourcegroup/UpdateResourceGroupsParam.java b/sdk-core/src/main/java/io/milvus/param/resourcegroup/UpdateResourceGroupsParam.java similarity index 100% rename from src/main/java/io/milvus/param/resourcegroup/UpdateResourceGroupsParam.java rename to sdk-core/src/main/java/io/milvus/param/resourcegroup/UpdateResourceGroupsParam.java diff --git a/src/main/java/io/milvus/param/role/AddUserToRoleParam.java b/sdk-core/src/main/java/io/milvus/param/role/AddUserToRoleParam.java similarity index 100% rename from src/main/java/io/milvus/param/role/AddUserToRoleParam.java rename to sdk-core/src/main/java/io/milvus/param/role/AddUserToRoleParam.java diff --git a/src/main/java/io/milvus/param/role/CreateRoleParam.java b/sdk-core/src/main/java/io/milvus/param/role/CreateRoleParam.java similarity index 100% rename from src/main/java/io/milvus/param/role/CreateRoleParam.java rename to sdk-core/src/main/java/io/milvus/param/role/CreateRoleParam.java diff --git a/src/main/java/io/milvus/param/role/DropRoleParam.java b/sdk-core/src/main/java/io/milvus/param/role/DropRoleParam.java similarity index 100% rename from src/main/java/io/milvus/param/role/DropRoleParam.java rename to sdk-core/src/main/java/io/milvus/param/role/DropRoleParam.java diff --git a/src/main/java/io/milvus/param/role/GrantRolePrivilegeParam.java b/sdk-core/src/main/java/io/milvus/param/role/GrantRolePrivilegeParam.java similarity index 100% rename from src/main/java/io/milvus/param/role/GrantRolePrivilegeParam.java rename to sdk-core/src/main/java/io/milvus/param/role/GrantRolePrivilegeParam.java diff --git a/src/main/java/io/milvus/param/role/RemoveUserFromRoleParam.java b/sdk-core/src/main/java/io/milvus/param/role/RemoveUserFromRoleParam.java similarity index 100% rename from src/main/java/io/milvus/param/role/RemoveUserFromRoleParam.java rename to sdk-core/src/main/java/io/milvus/param/role/RemoveUserFromRoleParam.java diff --git a/src/main/java/io/milvus/param/role/RevokeRolePrivilegeParam.java b/sdk-core/src/main/java/io/milvus/param/role/RevokeRolePrivilegeParam.java similarity index 100% rename from src/main/java/io/milvus/param/role/RevokeRolePrivilegeParam.java rename to sdk-core/src/main/java/io/milvus/param/role/RevokeRolePrivilegeParam.java diff --git a/src/main/java/io/milvus/param/role/SelectGrantForRoleAndObjectParam.java b/sdk-core/src/main/java/io/milvus/param/role/SelectGrantForRoleAndObjectParam.java similarity index 100% rename from src/main/java/io/milvus/param/role/SelectGrantForRoleAndObjectParam.java rename to sdk-core/src/main/java/io/milvus/param/role/SelectGrantForRoleAndObjectParam.java diff --git a/src/main/java/io/milvus/param/role/SelectGrantForRoleParam.java b/sdk-core/src/main/java/io/milvus/param/role/SelectGrantForRoleParam.java similarity index 100% rename from src/main/java/io/milvus/param/role/SelectGrantForRoleParam.java rename to sdk-core/src/main/java/io/milvus/param/role/SelectGrantForRoleParam.java diff --git a/src/main/java/io/milvus/param/role/SelectRoleParam.java b/sdk-core/src/main/java/io/milvus/param/role/SelectRoleParam.java similarity index 100% rename from src/main/java/io/milvus/param/role/SelectRoleParam.java rename to sdk-core/src/main/java/io/milvus/param/role/SelectRoleParam.java diff --git a/src/main/java/io/milvus/param/role/SelectUserParam.java b/sdk-core/src/main/java/io/milvus/param/role/SelectUserParam.java similarity index 100% rename from src/main/java/io/milvus/param/role/SelectUserParam.java rename to sdk-core/src/main/java/io/milvus/param/role/SelectUserParam.java diff --git a/src/main/java/io/milvus/pool/ClientPool.java b/sdk-core/src/main/java/io/milvus/pool/ClientPool.java similarity index 100% rename from src/main/java/io/milvus/pool/ClientPool.java rename to sdk-core/src/main/java/io/milvus/pool/ClientPool.java diff --git a/src/main/java/io/milvus/pool/MilvusClientV1Pool.java b/sdk-core/src/main/java/io/milvus/pool/MilvusClientV1Pool.java similarity index 100% rename from src/main/java/io/milvus/pool/MilvusClientV1Pool.java rename to sdk-core/src/main/java/io/milvus/pool/MilvusClientV1Pool.java diff --git a/src/main/java/io/milvus/pool/MilvusClientV2Pool.java b/sdk-core/src/main/java/io/milvus/pool/MilvusClientV2Pool.java similarity index 100% rename from src/main/java/io/milvus/pool/MilvusClientV2Pool.java rename to sdk-core/src/main/java/io/milvus/pool/MilvusClientV2Pool.java diff --git a/src/main/java/io/milvus/pool/PoolClientFactory.java b/sdk-core/src/main/java/io/milvus/pool/PoolClientFactory.java similarity index 100% rename from src/main/java/io/milvus/pool/PoolClientFactory.java rename to sdk-core/src/main/java/io/milvus/pool/PoolClientFactory.java diff --git a/src/main/java/io/milvus/pool/PoolConfig.java b/sdk-core/src/main/java/io/milvus/pool/PoolConfig.java similarity index 100% rename from src/main/java/io/milvus/pool/PoolConfig.java rename to sdk-core/src/main/java/io/milvus/pool/PoolConfig.java diff --git a/src/main/java/io/milvus/response/BulkInsertResponseWrapper.java b/sdk-core/src/main/java/io/milvus/response/BulkInsertResponseWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/BulkInsertResponseWrapper.java rename to sdk-core/src/main/java/io/milvus/response/BulkInsertResponseWrapper.java diff --git a/src/main/java/io/milvus/response/DescCollResponseWrapper.java b/sdk-core/src/main/java/io/milvus/response/DescCollResponseWrapper.java similarity index 99% rename from src/main/java/io/milvus/response/DescCollResponseWrapper.java rename to sdk-core/src/main/java/io/milvus/response/DescCollResponseWrapper.java index 68f69010e..0416809ac 100644 --- a/src/main/java/io/milvus/response/DescCollResponseWrapper.java +++ b/sdk-core/src/main/java/io/milvus/response/DescCollResponseWrapper.java @@ -27,7 +27,6 @@ import io.milvus.param.collection.CollectionSchemaParam; import io.milvus.param.collection.FieldType; import lombok.NonNull; -import org.bouncycastle.util.Strings; import java.util.*; @@ -281,7 +280,7 @@ public List getResourceGroups() { if (value == null) { return new ArrayList<>(); } - return Arrays.asList(Strings.split(value, ',')); + return Arrays.asList(value.split(",")); } /** diff --git a/src/main/java/io/milvus/response/DescDBResponseWrapper.java b/sdk-core/src/main/java/io/milvus/response/DescDBResponseWrapper.java similarity index 96% rename from src/main/java/io/milvus/response/DescDBResponseWrapper.java rename to sdk-core/src/main/java/io/milvus/response/DescDBResponseWrapper.java index 2c974ca32..d3e331fc1 100644 --- a/src/main/java/io/milvus/response/DescDBResponseWrapper.java +++ b/sdk-core/src/main/java/io/milvus/response/DescDBResponseWrapper.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Map; -import org.bouncycastle.util.Strings; /** * Util class to wrap response of describeCollection interface. @@ -72,7 +71,7 @@ public List getResourceGroups() { if (value == null) { return new ArrayList<>(); } - return Arrays.asList(Strings.split(value, ',')); + return Arrays.asList(value.split(",")); } /** diff --git a/src/main/java/io/milvus/response/DescIndexResponseWrapper.java b/sdk-core/src/main/java/io/milvus/response/DescIndexResponseWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/DescIndexResponseWrapper.java rename to sdk-core/src/main/java/io/milvus/response/DescIndexResponseWrapper.java diff --git a/src/main/java/io/milvus/response/FieldDataWrapper.java b/sdk-core/src/main/java/io/milvus/response/FieldDataWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/FieldDataWrapper.java rename to sdk-core/src/main/java/io/milvus/response/FieldDataWrapper.java diff --git a/src/main/java/io/milvus/response/GetBulkInsertStateWrapper.java b/sdk-core/src/main/java/io/milvus/response/GetBulkInsertStateWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/GetBulkInsertStateWrapper.java rename to sdk-core/src/main/java/io/milvus/response/GetBulkInsertStateWrapper.java diff --git a/src/main/java/io/milvus/response/GetCollStatResponseWrapper.java b/sdk-core/src/main/java/io/milvus/response/GetCollStatResponseWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/GetCollStatResponseWrapper.java rename to sdk-core/src/main/java/io/milvus/response/GetCollStatResponseWrapper.java diff --git a/src/main/java/io/milvus/response/GetPartStatResponseWrapper.java b/sdk-core/src/main/java/io/milvus/response/GetPartStatResponseWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/GetPartStatResponseWrapper.java rename to sdk-core/src/main/java/io/milvus/response/GetPartStatResponseWrapper.java diff --git a/src/main/java/io/milvus/response/MutationResultWrapper.java b/sdk-core/src/main/java/io/milvus/response/MutationResultWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/MutationResultWrapper.java rename to sdk-core/src/main/java/io/milvus/response/MutationResultWrapper.java diff --git a/src/main/java/io/milvus/response/QueryResultsWrapper.java b/sdk-core/src/main/java/io/milvus/response/QueryResultsWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/QueryResultsWrapper.java rename to sdk-core/src/main/java/io/milvus/response/QueryResultsWrapper.java diff --git a/src/main/java/io/milvus/response/SearchResultsWrapper.java b/sdk-core/src/main/java/io/milvus/response/SearchResultsWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/SearchResultsWrapper.java rename to sdk-core/src/main/java/io/milvus/response/SearchResultsWrapper.java diff --git a/src/main/java/io/milvus/response/ShowCollResponseWrapper.java b/sdk-core/src/main/java/io/milvus/response/ShowCollResponseWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/ShowCollResponseWrapper.java rename to sdk-core/src/main/java/io/milvus/response/ShowCollResponseWrapper.java diff --git a/src/main/java/io/milvus/response/ShowPartResponseWrapper.java b/sdk-core/src/main/java/io/milvus/response/ShowPartResponseWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/ShowPartResponseWrapper.java rename to sdk-core/src/main/java/io/milvus/response/ShowPartResponseWrapper.java diff --git a/src/main/java/io/milvus/response/basic/RowRecordWrapper.java b/sdk-core/src/main/java/io/milvus/response/basic/RowRecordWrapper.java similarity index 100% rename from src/main/java/io/milvus/response/basic/RowRecordWrapper.java rename to sdk-core/src/main/java/io/milvus/response/basic/RowRecordWrapper.java diff --git a/src/main/java/io/milvus/v2/client/ConnectConfig.java b/sdk-core/src/main/java/io/milvus/v2/client/ConnectConfig.java similarity index 100% rename from src/main/java/io/milvus/v2/client/ConnectConfig.java rename to sdk-core/src/main/java/io/milvus/v2/client/ConnectConfig.java diff --git a/src/main/java/io/milvus/v2/client/MilvusClientV2.java b/sdk-core/src/main/java/io/milvus/v2/client/MilvusClientV2.java similarity index 100% rename from src/main/java/io/milvus/v2/client/MilvusClientV2.java rename to sdk-core/src/main/java/io/milvus/v2/client/MilvusClientV2.java diff --git a/src/main/java/io/milvus/v2/client/RetryConfig.java b/sdk-core/src/main/java/io/milvus/v2/client/RetryConfig.java similarity index 100% rename from src/main/java/io/milvus/v2/client/RetryConfig.java rename to sdk-core/src/main/java/io/milvus/v2/client/RetryConfig.java diff --git a/src/main/java/io/milvus/v2/common/CompactionState.java b/sdk-core/src/main/java/io/milvus/v2/common/CompactionState.java similarity index 100% rename from src/main/java/io/milvus/v2/common/CompactionState.java rename to sdk-core/src/main/java/io/milvus/v2/common/CompactionState.java diff --git a/src/main/java/io/milvus/v2/common/ConsistencyLevel.java b/sdk-core/src/main/java/io/milvus/v2/common/ConsistencyLevel.java similarity index 100% rename from src/main/java/io/milvus/v2/common/ConsistencyLevel.java rename to sdk-core/src/main/java/io/milvus/v2/common/ConsistencyLevel.java diff --git a/src/main/java/io/milvus/v2/common/DataType.java b/sdk-core/src/main/java/io/milvus/v2/common/DataType.java similarity index 100% rename from src/main/java/io/milvus/v2/common/DataType.java rename to sdk-core/src/main/java/io/milvus/v2/common/DataType.java diff --git a/src/main/java/io/milvus/v2/common/IndexBuildState.java b/sdk-core/src/main/java/io/milvus/v2/common/IndexBuildState.java similarity index 100% rename from src/main/java/io/milvus/v2/common/IndexBuildState.java rename to sdk-core/src/main/java/io/milvus/v2/common/IndexBuildState.java diff --git a/src/main/java/io/milvus/v2/common/IndexParam.java b/sdk-core/src/main/java/io/milvus/v2/common/IndexParam.java similarity index 100% rename from src/main/java/io/milvus/v2/common/IndexParam.java rename to sdk-core/src/main/java/io/milvus/v2/common/IndexParam.java diff --git a/src/main/java/io/milvus/v2/exception/ErrorCode.java b/sdk-core/src/main/java/io/milvus/v2/exception/ErrorCode.java similarity index 100% rename from src/main/java/io/milvus/v2/exception/ErrorCode.java rename to sdk-core/src/main/java/io/milvus/v2/exception/ErrorCode.java diff --git a/src/main/java/io/milvus/v2/exception/MilvusClientException.java b/sdk-core/src/main/java/io/milvus/v2/exception/MilvusClientException.java similarity index 100% rename from src/main/java/io/milvus/v2/exception/MilvusClientException.java rename to sdk-core/src/main/java/io/milvus/v2/exception/MilvusClientException.java diff --git a/src/main/java/io/milvus/v2/service/BaseService.java b/sdk-core/src/main/java/io/milvus/v2/service/BaseService.java similarity index 100% rename from src/main/java/io/milvus/v2/service/BaseService.java rename to sdk-core/src/main/java/io/milvus/v2/service/BaseService.java diff --git a/src/main/java/io/milvus/v2/service/collection/CollectionService.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/CollectionService.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/CollectionService.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/CollectionService.java diff --git a/src/main/java/io/milvus/v2/service/collection/request/AddFieldReq.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/request/AddFieldReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/request/AddFieldReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/request/AddFieldReq.java diff --git a/src/main/java/io/milvus/v2/service/collection/request/AlterCollectionReq.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/request/AlterCollectionReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/request/AlterCollectionReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/request/AlterCollectionReq.java diff --git a/src/main/java/io/milvus/v2/service/collection/request/CreateCollectionReq.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/request/CreateCollectionReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/request/CreateCollectionReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/request/CreateCollectionReq.java diff --git a/src/main/java/io/milvus/v2/service/collection/request/DescribeCollectionReq.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/request/DescribeCollectionReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/request/DescribeCollectionReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/request/DescribeCollectionReq.java diff --git a/src/main/java/io/milvus/v2/service/collection/request/DropCollectionReq.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/request/DropCollectionReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/request/DropCollectionReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/request/DropCollectionReq.java diff --git a/src/main/java/io/milvus/v2/service/collection/request/GetCollectionStatsReq.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/request/GetCollectionStatsReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/request/GetCollectionStatsReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/request/GetCollectionStatsReq.java diff --git a/src/main/java/io/milvus/v2/service/collection/request/GetLoadStateReq.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/request/GetLoadStateReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/request/GetLoadStateReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/request/GetLoadStateReq.java diff --git a/src/main/java/io/milvus/v2/service/collection/request/HasCollectionReq.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/request/HasCollectionReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/request/HasCollectionReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/request/HasCollectionReq.java diff --git a/src/main/java/io/milvus/v2/service/collection/request/LoadCollectionReq.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/request/LoadCollectionReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/request/LoadCollectionReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/request/LoadCollectionReq.java diff --git a/src/main/java/io/milvus/v2/service/collection/request/ReleaseCollectionReq.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/request/ReleaseCollectionReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/request/ReleaseCollectionReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/request/ReleaseCollectionReq.java diff --git a/src/main/java/io/milvus/v2/service/collection/request/RenameCollectionReq.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/request/RenameCollectionReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/request/RenameCollectionReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/request/RenameCollectionReq.java diff --git a/src/main/java/io/milvus/v2/service/collection/response/DescribeCollectionResp.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/response/DescribeCollectionResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/response/DescribeCollectionResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/response/DescribeCollectionResp.java diff --git a/src/main/java/io/milvus/v2/service/collection/response/GetCollectionStatsResp.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/response/GetCollectionStatsResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/response/GetCollectionStatsResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/response/GetCollectionStatsResp.java diff --git a/src/main/java/io/milvus/v2/service/collection/response/ListCollectionsResp.java b/sdk-core/src/main/java/io/milvus/v2/service/collection/response/ListCollectionsResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/collection/response/ListCollectionsResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/collection/response/ListCollectionsResp.java diff --git a/src/main/java/io/milvus/v2/service/database/DatabaseService.java b/sdk-core/src/main/java/io/milvus/v2/service/database/DatabaseService.java similarity index 100% rename from src/main/java/io/milvus/v2/service/database/DatabaseService.java rename to sdk-core/src/main/java/io/milvus/v2/service/database/DatabaseService.java diff --git a/src/main/java/io/milvus/v2/service/database/request/AlterDatabaseReq.java b/sdk-core/src/main/java/io/milvus/v2/service/database/request/AlterDatabaseReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/database/request/AlterDatabaseReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/database/request/AlterDatabaseReq.java diff --git a/src/main/java/io/milvus/v2/service/database/request/CreateDatabaseReq.java b/sdk-core/src/main/java/io/milvus/v2/service/database/request/CreateDatabaseReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/database/request/CreateDatabaseReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/database/request/CreateDatabaseReq.java diff --git a/src/main/java/io/milvus/v2/service/database/request/DescribeDatabaseReq.java b/sdk-core/src/main/java/io/milvus/v2/service/database/request/DescribeDatabaseReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/database/request/DescribeDatabaseReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/database/request/DescribeDatabaseReq.java diff --git a/src/main/java/io/milvus/v2/service/database/request/DropDatabaseReq.java b/sdk-core/src/main/java/io/milvus/v2/service/database/request/DropDatabaseReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/database/request/DropDatabaseReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/database/request/DropDatabaseReq.java diff --git a/src/main/java/io/milvus/v2/service/database/response/DescribeDatabaseResp.java b/sdk-core/src/main/java/io/milvus/v2/service/database/response/DescribeDatabaseResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/database/response/DescribeDatabaseResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/database/response/DescribeDatabaseResp.java diff --git a/src/main/java/io/milvus/v2/service/database/response/ListDatabasesResp.java b/sdk-core/src/main/java/io/milvus/v2/service/database/response/ListDatabasesResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/database/response/ListDatabasesResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/database/response/ListDatabasesResp.java diff --git a/src/main/java/io/milvus/v2/service/index/IndexService.java b/sdk-core/src/main/java/io/milvus/v2/service/index/IndexService.java similarity index 100% rename from src/main/java/io/milvus/v2/service/index/IndexService.java rename to sdk-core/src/main/java/io/milvus/v2/service/index/IndexService.java diff --git a/src/main/java/io/milvus/v2/service/index/request/AlterIndexReq.java b/sdk-core/src/main/java/io/milvus/v2/service/index/request/AlterIndexReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/index/request/AlterIndexReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/index/request/AlterIndexReq.java diff --git a/src/main/java/io/milvus/v2/service/index/request/CreateIndexReq.java b/sdk-core/src/main/java/io/milvus/v2/service/index/request/CreateIndexReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/index/request/CreateIndexReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/index/request/CreateIndexReq.java diff --git a/src/main/java/io/milvus/v2/service/index/request/DescribeIndexReq.java b/sdk-core/src/main/java/io/milvus/v2/service/index/request/DescribeIndexReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/index/request/DescribeIndexReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/index/request/DescribeIndexReq.java diff --git a/src/main/java/io/milvus/v2/service/index/request/DropIndexReq.java b/sdk-core/src/main/java/io/milvus/v2/service/index/request/DropIndexReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/index/request/DropIndexReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/index/request/DropIndexReq.java diff --git a/src/main/java/io/milvus/v2/service/index/request/ListIndexesReq.java b/sdk-core/src/main/java/io/milvus/v2/service/index/request/ListIndexesReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/index/request/ListIndexesReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/index/request/ListIndexesReq.java diff --git a/src/main/java/io/milvus/v2/service/index/response/DescribeIndexResp.java b/sdk-core/src/main/java/io/milvus/v2/service/index/response/DescribeIndexResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/index/response/DescribeIndexResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/index/response/DescribeIndexResp.java diff --git a/src/main/java/io/milvus/v2/service/partition/PartitionService.java b/sdk-core/src/main/java/io/milvus/v2/service/partition/PartitionService.java similarity index 100% rename from src/main/java/io/milvus/v2/service/partition/PartitionService.java rename to sdk-core/src/main/java/io/milvus/v2/service/partition/PartitionService.java diff --git a/src/main/java/io/milvus/v2/service/partition/request/CreatePartitionReq.java b/sdk-core/src/main/java/io/milvus/v2/service/partition/request/CreatePartitionReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/partition/request/CreatePartitionReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/partition/request/CreatePartitionReq.java diff --git a/src/main/java/io/milvus/v2/service/partition/request/DropPartitionReq.java b/sdk-core/src/main/java/io/milvus/v2/service/partition/request/DropPartitionReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/partition/request/DropPartitionReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/partition/request/DropPartitionReq.java diff --git a/src/main/java/io/milvus/v2/service/partition/request/HasPartitionReq.java b/sdk-core/src/main/java/io/milvus/v2/service/partition/request/HasPartitionReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/partition/request/HasPartitionReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/partition/request/HasPartitionReq.java diff --git a/src/main/java/io/milvus/v2/service/partition/request/ListPartitionsReq.java b/sdk-core/src/main/java/io/milvus/v2/service/partition/request/ListPartitionsReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/partition/request/ListPartitionsReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/partition/request/ListPartitionsReq.java diff --git a/src/main/java/io/milvus/v2/service/partition/request/LoadPartitionsReq.java b/sdk-core/src/main/java/io/milvus/v2/service/partition/request/LoadPartitionsReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/partition/request/LoadPartitionsReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/partition/request/LoadPartitionsReq.java diff --git a/src/main/java/io/milvus/v2/service/partition/request/ReleasePartitionsReq.java b/sdk-core/src/main/java/io/milvus/v2/service/partition/request/ReleasePartitionsReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/partition/request/ReleasePartitionsReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/partition/request/ReleasePartitionsReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/PrivilegeGroup.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/PrivilegeGroup.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/PrivilegeGroup.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/PrivilegeGroup.java diff --git a/src/main/java/io/milvus/v2/service/rbac/RBACService.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/RBACService.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/RBACService.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/RBACService.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/AddPrivilegesToGroupReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/AddPrivilegesToGroupReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/AddPrivilegesToGroupReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/AddPrivilegesToGroupReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/CreatePrivilegeGroupReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/CreatePrivilegeGroupReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/CreatePrivilegeGroupReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/CreatePrivilegeGroupReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/CreateRoleReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/CreateRoleReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/CreateRoleReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/CreateRoleReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/CreateUserReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/CreateUserReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/CreateUserReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/CreateUserReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/DescribeRoleReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/DescribeRoleReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/DescribeRoleReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/DescribeRoleReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/DescribeUserReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/DescribeUserReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/DescribeUserReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/DescribeUserReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/DropPrivilegeGroupReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/DropPrivilegeGroupReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/DropPrivilegeGroupReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/DropPrivilegeGroupReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/DropRoleReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/DropRoleReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/DropRoleReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/DropRoleReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/DropUserReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/DropUserReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/DropUserReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/DropUserReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/GrantPrivilegeReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/GrantPrivilegeReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/GrantPrivilegeReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/GrantPrivilegeReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/GrantPrivilegeReqV2.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/GrantPrivilegeReqV2.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/GrantPrivilegeReqV2.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/GrantPrivilegeReqV2.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/GrantRoleReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/GrantRoleReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/GrantRoleReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/GrantRoleReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/ListPrivilegeGroupsReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/ListPrivilegeGroupsReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/ListPrivilegeGroupsReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/ListPrivilegeGroupsReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/RemovePrivilegesFromGroupReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/RemovePrivilegesFromGroupReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/RemovePrivilegesFromGroupReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/RemovePrivilegesFromGroupReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/RevokePrivilegeReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/RevokePrivilegeReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/RevokePrivilegeReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/RevokePrivilegeReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/RevokePrivilegeReqV2.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/RevokePrivilegeReqV2.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/RevokePrivilegeReqV2.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/RevokePrivilegeReqV2.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/RevokeRoleReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/RevokeRoleReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/RevokeRoleReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/RevokeRoleReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/request/UpdatePasswordReq.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/request/UpdatePasswordReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/request/UpdatePasswordReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/request/UpdatePasswordReq.java diff --git a/src/main/java/io/milvus/v2/service/rbac/response/DescribeRoleResp.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/response/DescribeRoleResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/response/DescribeRoleResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/response/DescribeRoleResp.java diff --git a/src/main/java/io/milvus/v2/service/rbac/response/DescribeUserResp.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/response/DescribeUserResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/response/DescribeUserResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/response/DescribeUserResp.java diff --git a/src/main/java/io/milvus/v2/service/rbac/response/ListPrivilegeGroupsResp.java b/sdk-core/src/main/java/io/milvus/v2/service/rbac/response/ListPrivilegeGroupsResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/rbac/response/ListPrivilegeGroupsResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/rbac/response/ListPrivilegeGroupsResp.java diff --git a/src/main/java/io/milvus/v2/service/utility/UtilityService.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/UtilityService.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/UtilityService.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/UtilityService.java diff --git a/src/main/java/io/milvus/v2/service/utility/request/AlterAliasReq.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/request/AlterAliasReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/request/AlterAliasReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/request/AlterAliasReq.java diff --git a/src/main/java/io/milvus/v2/service/utility/request/CompactReq.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/request/CompactReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/request/CompactReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/request/CompactReq.java diff --git a/src/main/java/io/milvus/v2/service/utility/request/CreateAliasReq.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/request/CreateAliasReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/request/CreateAliasReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/request/CreateAliasReq.java diff --git a/src/main/java/io/milvus/v2/service/utility/request/DescribeAliasReq.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/request/DescribeAliasReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/request/DescribeAliasReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/request/DescribeAliasReq.java diff --git a/src/main/java/io/milvus/v2/service/utility/request/DropAliasReq.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/request/DropAliasReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/request/DropAliasReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/request/DropAliasReq.java diff --git a/src/main/java/io/milvus/v2/service/utility/request/FlushReq.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/request/FlushReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/request/FlushReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/request/FlushReq.java diff --git a/src/main/java/io/milvus/v2/service/utility/request/GetCompactionStateReq.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/request/GetCompactionStateReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/request/GetCompactionStateReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/request/GetCompactionStateReq.java diff --git a/src/main/java/io/milvus/v2/service/utility/request/ListAliasesReq.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/request/ListAliasesReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/request/ListAliasesReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/request/ListAliasesReq.java diff --git a/src/main/java/io/milvus/v2/service/utility/response/CompactResp.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/response/CompactResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/response/CompactResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/response/CompactResp.java diff --git a/src/main/java/io/milvus/v2/service/utility/response/DescribeAliasResp.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/response/DescribeAliasResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/response/DescribeAliasResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/response/DescribeAliasResp.java diff --git a/src/main/java/io/milvus/v2/service/utility/response/FlushResp.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/response/FlushResp.java similarity index 85% rename from src/main/java/io/milvus/v2/service/utility/response/FlushResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/response/FlushResp.java index 264205b2a..25dd566be 100644 --- a/src/main/java/io/milvus/v2/service/utility/response/FlushResp.java +++ b/sdk-core/src/main/java/io/milvus/v2/service/utility/response/FlushResp.java @@ -22,7 +22,6 @@ import lombok.Builder; import lombok.Data; import lombok.experimental.SuperBuilder; -import org.apache.commons.collections.map.HashedMap; import java.util.*; @@ -30,7 +29,7 @@ @SuperBuilder public class FlushResp { @Builder.Default - Map> collectionSegmentIDs = new HashedMap(); + Map> collectionSegmentIDs = new HashMap<>(); @Builder.Default - Map collectionFlushTs = new HashedMap(); + Map collectionFlushTs = new HashMap<>(); } diff --git a/src/main/java/io/milvus/v2/service/utility/response/GetCompactionStateResp.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/response/GetCompactionStateResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/response/GetCompactionStateResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/response/GetCompactionStateResp.java diff --git a/src/main/java/io/milvus/v2/service/utility/response/ListAliasResp.java b/sdk-core/src/main/java/io/milvus/v2/service/utility/response/ListAliasResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/utility/response/ListAliasResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/utility/response/ListAliasResp.java diff --git a/src/main/java/io/milvus/v2/service/vector/VectorService.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/VectorService.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/VectorService.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/VectorService.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/AnnSearchReq.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/AnnSearchReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/AnnSearchReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/AnnSearchReq.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/DeleteReq.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/DeleteReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/DeleteReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/DeleteReq.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/GetReq.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/GetReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/GetReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/GetReq.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/HybridSearchReq.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/HybridSearchReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/HybridSearchReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/HybridSearchReq.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/InsertReq.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/InsertReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/InsertReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/InsertReq.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/QueryIteratorReq.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/QueryIteratorReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/QueryIteratorReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/QueryIteratorReq.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/QueryReq.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/QueryReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/QueryReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/QueryReq.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/SearchIteratorReq.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/SearchIteratorReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/SearchIteratorReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/SearchIteratorReq.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/SearchReq.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/SearchReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/SearchReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/SearchReq.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/UpsertReq.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/UpsertReq.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/UpsertReq.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/UpsertReq.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/data/BFloat16Vec.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/BFloat16Vec.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/data/BFloat16Vec.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/BFloat16Vec.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/data/BaseVector.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/BaseVector.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/data/BaseVector.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/BaseVector.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/data/BinaryVec.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/BinaryVec.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/data/BinaryVec.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/BinaryVec.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/data/EmbeddedText.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/EmbeddedText.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/data/EmbeddedText.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/EmbeddedText.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/data/Float16Vec.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/Float16Vec.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/data/Float16Vec.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/Float16Vec.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/data/FloatVec.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/FloatVec.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/data/FloatVec.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/FloatVec.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/data/SparseFloatVec.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/SparseFloatVec.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/data/SparseFloatVec.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/data/SparseFloatVec.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/ranker/BaseRanker.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/ranker/BaseRanker.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/ranker/BaseRanker.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/ranker/BaseRanker.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/ranker/RRFRanker.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/ranker/RRFRanker.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/ranker/RRFRanker.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/ranker/RRFRanker.java diff --git a/src/main/java/io/milvus/v2/service/vector/request/ranker/WeightedRanker.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/request/ranker/WeightedRanker.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/request/ranker/WeightedRanker.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/request/ranker/WeightedRanker.java diff --git a/src/main/java/io/milvus/v2/service/vector/response/DeleteResp.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/response/DeleteResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/response/DeleteResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/response/DeleteResp.java diff --git a/src/main/java/io/milvus/v2/service/vector/response/GetResp.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/response/GetResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/response/GetResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/response/GetResp.java diff --git a/src/main/java/io/milvus/v2/service/vector/response/InsertResp.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/response/InsertResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/response/InsertResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/response/InsertResp.java diff --git a/src/main/java/io/milvus/v2/service/vector/response/QueryResp.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/response/QueryResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/response/QueryResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/response/QueryResp.java diff --git a/src/main/java/io/milvus/v2/service/vector/response/SearchResp.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/response/SearchResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/response/SearchResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/response/SearchResp.java diff --git a/src/main/java/io/milvus/v2/service/vector/response/UpsertResp.java b/sdk-core/src/main/java/io/milvus/v2/service/vector/response/UpsertResp.java similarity index 100% rename from src/main/java/io/milvus/v2/service/vector/response/UpsertResp.java rename to sdk-core/src/main/java/io/milvus/v2/service/vector/response/UpsertResp.java diff --git a/src/main/java/io/milvus/v2/utils/ClientUtils.java b/sdk-core/src/main/java/io/milvus/v2/utils/ClientUtils.java similarity index 100% rename from src/main/java/io/milvus/v2/utils/ClientUtils.java rename to sdk-core/src/main/java/io/milvus/v2/utils/ClientUtils.java diff --git a/src/main/java/io/milvus/v2/utils/ConvertUtils.java b/sdk-core/src/main/java/io/milvus/v2/utils/ConvertUtils.java similarity index 100% rename from src/main/java/io/milvus/v2/utils/ConvertUtils.java rename to sdk-core/src/main/java/io/milvus/v2/utils/ConvertUtils.java diff --git a/src/main/java/io/milvus/v2/utils/DataUtils.java b/sdk-core/src/main/java/io/milvus/v2/utils/DataUtils.java similarity index 100% rename from src/main/java/io/milvus/v2/utils/DataUtils.java rename to sdk-core/src/main/java/io/milvus/v2/utils/DataUtils.java diff --git a/src/main/java/io/milvus/v2/utils/RpcUtils.java b/sdk-core/src/main/java/io/milvus/v2/utils/RpcUtils.java similarity index 100% rename from src/main/java/io/milvus/v2/utils/RpcUtils.java rename to sdk-core/src/main/java/io/milvus/v2/utils/RpcUtils.java diff --git a/src/main/java/io/milvus/v2/utils/SchemaUtils.java b/sdk-core/src/main/java/io/milvus/v2/utils/SchemaUtils.java similarity index 100% rename from src/main/java/io/milvus/v2/utils/SchemaUtils.java rename to sdk-core/src/main/java/io/milvus/v2/utils/SchemaUtils.java diff --git a/src/main/java/io/milvus/v2/utils/VectorUtils.java b/sdk-core/src/main/java/io/milvus/v2/utils/VectorUtils.java similarity index 100% rename from src/main/java/io/milvus/v2/utils/VectorUtils.java rename to sdk-core/src/main/java/io/milvus/v2/utils/VectorUtils.java diff --git a/src/main/milvus-proto b/sdk-core/src/main/milvus-proto similarity index 100% rename from src/main/milvus-proto rename to sdk-core/src/main/milvus-proto diff --git a/src/main/resources/log4j2.xml b/sdk-core/src/main/resources/log4j2.xml similarity index 100% rename from src/main/resources/log4j2.xml rename to sdk-core/src/main/resources/log4j2.xml diff --git a/src/main/resources/milvus-client.properties b/sdk-core/src/main/resources/milvus-client.properties similarity index 100% rename from src/main/resources/milvus-client.properties rename to sdk-core/src/main/resources/milvus-client.properties diff --git a/src/test/java/io/milvus/TestUtils.java b/sdk-core/src/test/java/io/milvus/TestUtils.java similarity index 99% rename from src/test/java/io/milvus/TestUtils.java rename to sdk-core/src/test/java/io/milvus/TestUtils.java index 5b0fb43ad..d1cccfd8b 100644 --- a/src/test/java/io/milvus/TestUtils.java +++ b/sdk-core/src/test/java/io/milvus/TestUtils.java @@ -2,7 +2,6 @@ import io.milvus.common.utils.Float16Utils; import io.milvus.grpc.DataType; -import io.milvus.param.collection.FieldType; import org.junit.jupiter.api.Assertions; import java.nio.ByteBuffer; diff --git a/src/test/java/io/milvus/client/MilvusClientDockerTest.java b/sdk-core/src/test/java/io/milvus/client/MilvusClientDockerTest.java similarity index 96% rename from src/test/java/io/milvus/client/MilvusClientDockerTest.java rename to sdk-core/src/test/java/io/milvus/client/MilvusClientDockerTest.java index 2bdc54a82..19a1819ff 100644 --- a/src/test/java/io/milvus/client/MilvusClientDockerTest.java +++ b/sdk-core/src/test/java/io/milvus/client/MilvusClientDockerTest.java @@ -23,10 +23,6 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; import io.milvus.TestUtils; -import io.milvus.bulkwriter.LocalBulkWriter; -import io.milvus.bulkwriter.LocalBulkWriterParam; -import io.milvus.bulkwriter.common.clientenum.BulkFileType; -import io.milvus.bulkwriter.common.utils.ParquetReaderUtils; import io.milvus.common.clientenum.ConsistencyLevelEnum; import io.milvus.common.utils.Float16Utils; import io.milvus.common.utils.JsonUtils; @@ -55,7 +51,6 @@ import io.milvus.pool.PoolConfig; import io.milvus.response.*; -import org.apache.avro.generic.GenericData; import org.apache.commons.text.RandomStringGenerator; import org.junit.jupiter.api.Assertions; @@ -2654,95 +2649,6 @@ private static void testHighLevelDelete(String collectionName, List primaryIds) Assertions.assertEquals(R.Status.Success.getCode(), deleteResponseR.getStatus().intValue()); } - @Test - public void testBulkWriter() { - String randomCollectionName = generator.generate(10); - - // collection schema - boolean enabledDynamic = false; - CollectionSchemaParam schema = buildSchema(false, false, enabledDynamic, - Arrays.asList(DataType.Bool, DataType.Int8, DataType.Int16, DataType.Int32, DataType.Int64, - DataType.Float, DataType.Double, DataType.VarChar, DataType.JSON, DataType.Array, - DataType.FloatVector, DataType.BinaryVector, DataType.BFloat16Vector, DataType.SparseFloatVector)); - - // create collection - CreateCollectionParam createParam = CreateCollectionParam.newBuilder() - .withCollectionName(randomCollectionName) - .withSchema(schema) - .build(); - - R createR = client.createCollection(createParam); - Assertions.assertEquals(R.Status.Success.getCode(), createR.getStatus().intValue()); - - // local bulkwriter - LocalBulkWriterParam localWriterParam = LocalBulkWriterParam.newBuilder() - .withCollectionSchema(schema) - .withLocalPath("/tmp/bulk_writer") - .withFileType(BulkFileType.PARQUET) - .withChunkSize(100 * 1024) - .build(); - - int rowCount = 100; - List> batchFiles = new ArrayList<>(); - try (LocalBulkWriter localBulkWriter = new LocalBulkWriter(localWriterParam)) { - for (int i = 0; i < rowCount; i++) { - JsonObject row = new JsonObject(); - row.addProperty("id", i); - row.addProperty(DataType.Bool.name(), i % 3 == 0); - row.addProperty(DataType.Int8.name(), i%128); - row.addProperty(DataType.Int16.name(), i%32768); - row.addProperty(DataType.Int32.name(), i); - row.addProperty(DataType.Int64.name(), i); - row.addProperty(DataType.Float.name(), i/3); - row.addProperty(DataType.Double.name(), i/7); - row.addProperty(DataType.VarChar.name(), String.format("varchar_%d", i)); - JsonObject obj = new JsonObject(); - obj.addProperty("dummy", i); - row.add(DataType.JSON.name(), obj); - row.add(DataType.Array.name() + "_varchar", JsonUtils.toJsonTree(Lists.newArrayList("aaa", "bbb", "ccc"))); - row.add(DataType.Array.name() + "_int32", JsonUtils.toJsonTree(Lists.newArrayList(5, 6, 3, 2, 1))); - row.add(DataType.Array.name() + "_float", JsonUtils.toJsonTree(Lists.newArrayList(0.5, 1.8))); - row.add(DataType.FloatVector.name(), JsonUtils.toJsonTree(utils.generateFloatVector())); - row.add(DataType.BinaryVector.name(), JsonUtils.toJsonTree(utils.generateBinaryVector().array())); - row.add(DataType.BFloat16Vector.name(), JsonUtils.toJsonTree(utils.generateBFloat16Vector().array())); - row.add(DataType.SparseFloatVector.name(), JsonUtils.toJsonTree(utils.generateSparseVector())); - - if (enabledDynamic) { - row.addProperty("dynamic_1", i); - row.addProperty("dynamic_2", String.format("dynamic_%d", i)); - } - - localBulkWriter.appendRow(row); - } - - localBulkWriter.commit(false); - List> files = localBulkWriter.getBatchFiles(); - System.out.printf("LocalBulkWriter done! output local files: %s%n", files); - Assertions.assertEquals(files.size(), 2); - Assertions.assertEquals(files.get(0).size(), 1); - batchFiles.addAll(files); - } catch (Exception e) { - System.out.println("LocalBulkWriter catch exception: " + e); - Assertions.fail(); - } - - try { - final int[] counter = {0}; - for (List files : batchFiles) { - new ParquetReaderUtils() { - @Override - public void readRecord(GenericData.Record record) { - counter[0]++; - } - }.readParquet(files.get(0)); - } - Assertions.assertEquals(rowCount, counter[0]); - } catch (Exception e) { - System.out.println("Verify parquet file catch exception: " + e); - Assertions.fail(); - } - } - @Test public void testIterator() { String randomCollectionName = generator.generate(10); diff --git a/src/test/java/io/milvus/client/MilvusMultiClientDockerTest.java b/sdk-core/src/test/java/io/milvus/client/MilvusMultiClientDockerTest.java similarity index 99% rename from src/test/java/io/milvus/client/MilvusMultiClientDockerTest.java rename to sdk-core/src/test/java/io/milvus/client/MilvusMultiClientDockerTest.java index 2f188669b..b5af94096 100644 --- a/src/test/java/io/milvus/client/MilvusMultiClientDockerTest.java +++ b/sdk-core/src/test/java/io/milvus/client/MilvusMultiClientDockerTest.java @@ -33,7 +33,6 @@ import io.milvus.param.partition.ShowPartitionsParam; import io.milvus.response.*; import org.apache.commons.text.RandomStringGenerator; -import org.codehaus.plexus.util.FileUtils; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.AfterAll; @@ -155,9 +154,6 @@ private static void stopDockerContainer() { if (status != 0) { System.out.println("Failed to clean up test docker containers" + pro.getOutputStream().toString()); } - - System.out.println("Clean up volume directory of Docker"); - FileUtils.deleteDirectory("volumes"); } catch (Throwable t) { System.out.println("Failed to remove docker compose volume:" + t.getMessage()); } diff --git a/src/test/java/io/milvus/client/MilvusServiceClientTest.java b/sdk-core/src/test/java/io/milvus/client/MilvusServiceClientTest.java similarity index 100% rename from src/test/java/io/milvus/client/MilvusServiceClientTest.java rename to sdk-core/src/test/java/io/milvus/client/MilvusServiceClientTest.java diff --git a/src/test/java/io/milvus/server/MockMilvusServer.java b/sdk-core/src/test/java/io/milvus/server/MockMilvusServer.java similarity index 100% rename from src/test/java/io/milvus/server/MockMilvusServer.java rename to sdk-core/src/test/java/io/milvus/server/MockMilvusServer.java diff --git a/src/test/java/io/milvus/server/MockMilvusServerImpl.java b/sdk-core/src/test/java/io/milvus/server/MockMilvusServerImpl.java similarity index 100% rename from src/test/java/io/milvus/server/MockMilvusServerImpl.java rename to sdk-core/src/test/java/io/milvus/server/MockMilvusServerImpl.java diff --git a/src/test/java/io/milvus/v2/BaseTest.java b/sdk-core/src/test/java/io/milvus/v2/BaseTest.java similarity index 100% rename from src/test/java/io/milvus/v2/BaseTest.java rename to sdk-core/src/test/java/io/milvus/v2/BaseTest.java diff --git a/src/test/java/io/milvus/v2/client/MilvusClientV2DockerTest.java b/sdk-core/src/test/java/io/milvus/v2/client/MilvusClientV2DockerTest.java similarity index 100% rename from src/test/java/io/milvus/v2/client/MilvusClientV2DockerTest.java rename to sdk-core/src/test/java/io/milvus/v2/client/MilvusClientV2DockerTest.java diff --git a/src/test/java/io/milvus/v2/client/MilvusClientV2Test.java b/sdk-core/src/test/java/io/milvus/v2/client/MilvusClientV2Test.java similarity index 100% rename from src/test/java/io/milvus/v2/client/MilvusClientV2Test.java rename to sdk-core/src/test/java/io/milvus/v2/client/MilvusClientV2Test.java diff --git a/src/test/java/io/milvus/v2/service/collection/CollectionTest.java b/sdk-core/src/test/java/io/milvus/v2/service/collection/CollectionTest.java similarity index 100% rename from src/test/java/io/milvus/v2/service/collection/CollectionTest.java rename to sdk-core/src/test/java/io/milvus/v2/service/collection/CollectionTest.java diff --git a/src/test/java/io/milvus/v2/service/index/IndexTest.java b/sdk-core/src/test/java/io/milvus/v2/service/index/IndexTest.java similarity index 100% rename from src/test/java/io/milvus/v2/service/index/IndexTest.java rename to sdk-core/src/test/java/io/milvus/v2/service/index/IndexTest.java diff --git a/src/test/java/io/milvus/v2/service/partition/PartitionTest.java b/sdk-core/src/test/java/io/milvus/v2/service/partition/PartitionTest.java similarity index 100% rename from src/test/java/io/milvus/v2/service/partition/PartitionTest.java rename to sdk-core/src/test/java/io/milvus/v2/service/partition/PartitionTest.java diff --git a/src/test/java/io/milvus/v2/service/rbac/RoleTest.java b/sdk-core/src/test/java/io/milvus/v2/service/rbac/RoleTest.java similarity index 100% rename from src/test/java/io/milvus/v2/service/rbac/RoleTest.java rename to sdk-core/src/test/java/io/milvus/v2/service/rbac/RoleTest.java diff --git a/src/test/java/io/milvus/v2/service/rbac/UserTest.java b/sdk-core/src/test/java/io/milvus/v2/service/rbac/UserTest.java similarity index 100% rename from src/test/java/io/milvus/v2/service/rbac/UserTest.java rename to sdk-core/src/test/java/io/milvus/v2/service/rbac/UserTest.java diff --git a/src/test/java/io/milvus/v2/service/utility/UtilityTest.java b/sdk-core/src/test/java/io/milvus/v2/service/utility/UtilityTest.java similarity index 100% rename from src/test/java/io/milvus/v2/service/utility/UtilityTest.java rename to sdk-core/src/test/java/io/milvus/v2/service/utility/UtilityTest.java diff --git a/src/test/java/io/milvus/v2/service/vector/VectorTest.java b/sdk-core/src/test/java/io/milvus/v2/service/vector/VectorTest.java similarity index 100% rename from src/test/java/io/milvus/v2/service/vector/VectorTest.java rename to sdk-core/src/test/java/io/milvus/v2/service/vector/VectorTest.java