Merge branch 'milvus_test' of github.com:nosqlbench/nosqlbench into milvus_test

adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusAlterCollectionOpDispenser.java

@@ -42,7 +42,8 @@ public class MilvusAlterCollectionOpDispenser extends MilvusBaseOpDispenser<Alte
         LongFunction<AlterCollectionParam.Builder> ebF =
             l -> AlterCollectionParam.newBuilder().withCollectionName(targetF.apply(l));
 
-        ebF = op.enhanceFuncOptionally(ebF,"ttl", Integer.class, AlterCollectionParam.Builder::withTTL);
+        ebF = op.enhanceFuncOptionally(ebF, "ttl", Number.class,
+            (AlterCollectionParam.Builder b, Number n) -> b.withTTL(n.intValue()));
 
         final LongFunction<AlterCollectionParam.Builder> lastF = ebF;
         final LongFunction<AlterCollectionParam> collectionParamF = l -> lastF.apply(l).build();
@@ -56,6 +57,6 @@ public class MilvusAlterCollectionOpDispenser extends MilvusBaseOpDispenser<Alte
         ParsedOp op,
         LongFunction<String> targetF
     ) {
-        return l -> new MilvusAlterCollectionOp(clientF.apply(l),paramF.apply(l));
+        return l -> new MilvusAlterCollectionOp(clientF.apply(l), paramF.apply(l));
     }
 }

adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateCollectionOpDispenser.java

@@ -39,12 +39,9 @@ public class MilvusCreateCollectionOpDispenser extends MilvusBaseOpDispenser<Cre
     /**
      * Create a new MilvusCreateCollectionOpDispenser subclassed from {@link MilvusBaseOpDispenser}.
      *
-     * @param adapter
+     * @param adapter        The associated {@link MilvusDriverAdapter}
-     *     The associated {@link MilvusDriverAdapter}
+     * @param op             The {@link ParsedOp} encapsulating the activity for this cycle
-     * @param op
+     * @param targetFunction A LongFunction that returns the specified Milvus Index for this Op
-     *     The {@link ParsedOp} encapsulating the activity for this cycle
-     * @param targetFunction
-     *     A LongFunction that returns the specified Milvus Index for this Op
      */
     public MilvusCreateCollectionOpDispenser(MilvusDriverAdapter adapter,
                                              ParsedOp op,
@@ -61,10 +58,10 @@ public class MilvusCreateCollectionOpDispenser extends MilvusBaseOpDispenser<Cre
         LongFunction<CreateCollectionParam.Builder> ebF =
             l -> CreateCollectionParam.newBuilder().withCollectionName(targetF.apply(l));
 
-        ebF = op.enhanceFuncOptionally(ebF, "shards_num", Integer.class,
+        ebF = op.enhanceFuncOptionally(ebF, "shards_num", Number.class,
-            CreateCollectionParam.Builder::withShardsNum);
+            (CreateCollectionParam.Builder b, Number n) -> b.withShardsNum(n.intValue()));
-        ebF = op.enhanceFuncOptionally(ebF, "partition_num", Integer.class,
+        ebF = op.enhanceFuncOptionally(ebF, "partition_num", Number.class,
-            CreateCollectionParam.Builder::withPartitionsNum);
+            (CreateCollectionParam.Builder b, Number n) -> b.withPartitionsNum(n.intValue()));
         ebF = op.enhanceFuncOptionally(ebF, "description", String.class,
             CreateCollectionParam.Builder::withDescription);
         ebF = op.enhanceEnumOptionally(ebF, "consistency_level",
@@ -97,8 +94,7 @@ public class MilvusCreateCollectionOpDispenser extends MilvusBaseOpDispenser<Cre
     /**
      * Function to build the {@link FieldType}s for the {@link CreateCollectionParam}.
      *
-     * @param fieldTypesData
+     * @param fieldTypesData The static map of config data from the create collection request
-     *     The static map of config data from the create collection request
      * @param ebF
      * @return a list of static field types
      */
@@ -112,20 +108,20 @@ public class MilvusCreateCollectionOpDispenser extends MilvusBaseOpDispenser<Cre
                 .ifPresent(builder::withPrimaryKey);
             fieldspec.getOptionalStaticValue("auto_id", Boolean.class)
                 .ifPresent(builder::withAutoID);
-            fieldspec.getOptionalStaticConfig("max_length", Integer.class)
+            fieldspec.getOptionalStaticConfig("max_length", Number.class)
-                .ifPresent(builder::withMaxLength);
+                .ifPresent((Number n) -> builder.withMaxLength(n.intValue()));
-            fieldspec.getOptionalStaticConfig("max_capacity", Integer.class)
+            fieldspec.getOptionalStaticConfig("max_capacity", Number.class)
-                .ifPresent(builder::withMaxCapacity);
+                .ifPresent((Number n) -> builder.withMaxCapacity(n.intValue()));
-            fieldspec.getOptionalStaticValue(List.of("partition_key","partition"), Boolean.class)
+            fieldspec.getOptionalStaticValue(List.of("partition_key", "partition"), Boolean.class)
                 .ifPresent(builder::withPartitionKey);
-            fieldspec.getOptionalStaticValue("dimension", Integer.class)
+            fieldspec.getOptionalStaticValue("dimension", Number.class)
-                .ifPresent(builder::withDimension);
+                .ifPresent((Number n) -> builder.withDimension(n.intValue()));
             fieldspec.getOptionalStaticConfig("data_type", String.class)
                 .map(DataType::valueOf)
                 .ifPresent(builder::withDataType);
             fieldspec.getOptionalStaticConfig("type_params", Map.class)
                 .ifPresent(builder::withTypeParams);
-            fieldspec.getOptionalStaticConfig("element_type",String.class)
+            fieldspec.getOptionalStaticConfig("element_type", String.class)
                 .map(DataType::valueOf)
                 .ifPresent(builder::withElementType);
 

adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateIndexOpDispenser.java

@@ -71,7 +71,10 @@ public class MilvusCreateIndexOpDispenser extends MilvusBaseOpDispenser<CreateIn
     }
 
     @Override
-    public LongFunction<MilvusBaseOp<CreateIndexParam>> createOpFunc(LongFunction<CreateIndexParam> paramF, LongFunction<MilvusServiceClient> clientF, ParsedOp op, LongFunction<String> targetF) {
+    public LongFunction<MilvusBaseOp<CreateIndexParam>> createOpFunc(
+        LongFunction<CreateIndexParam> paramF,
+        LongFunction<MilvusServiceClient> clientF,
+        ParsedOp op, LongFunction<String> targetF) {
         return l -> new MilvusCreateIndexOp(clientF.apply(l), paramF.apply(l));
     }
 }

adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusFlushOpDispenser.java

@@ -51,12 +51,12 @@ public class MilvusFlushOpDispenser extends MilvusBaseOpDispenser<FlushParam> {
         };
         LongFunction<FlushParam.Builder> finalEbF = ebF;
         ebF = l -> finalEbF.apply(l).withCollectionNames(cnames.apply(l));
-        ebF = op.enhanceFuncOptionally(ebF, List.of("database_name","database"),String.class,
+        ebF = op.enhanceFuncOptionally(ebF, List.of("database_name", "database"), String.class,
             FlushParam.Builder::withDatabaseName);
-        ebF = op.enhanceFuncOptionally(ebF, "sync_flush_waiting_interval",Long.class,
+        ebF = op.enhanceFuncOptionally(ebF, "sync_flush_waiting_interval", Number.class,
-            FlushParam.Builder::withSyncFlushWaitingInterval);
+            (FlushParam.Builder b, Number n) -> b.withSyncFlushWaitingInterval(n.longValue()));
-        ebF = op.enhanceFuncOptionally(ebF, "sync_flush_waiting_timeout",Long.class,
+        ebF = op.enhanceFuncOptionally(ebF, "sync_flush_waiting_timeout", Number.class,
-            FlushParam.Builder::withSyncFlushWaitingTimeout);
+            (FlushParam.Builder b, Number n) -> b.withSyncFlushWaitingTimeout(n.longValue()));
 
         final LongFunction<FlushParam.Builder> lastF = ebF;
         final LongFunction<FlushParam> collectionParamF = l -> lastF.apply(l).build();
@@ -70,6 +70,6 @@ public class MilvusFlushOpDispenser extends MilvusBaseOpDispenser<FlushParam> {
         ParsedOp op,
         LongFunction<String> targetF
     ) {
-        return l -> new MilvusFlushOp(clientF.apply(l),paramF.apply(l));
+        return l -> new MilvusFlushOp(clientF.apply(l), paramF.apply(l));
     }
 }

adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetFlushStateOpDispenser.java

@@ -52,9 +52,10 @@ public class MilvusGetFlushStateOpDispenser extends MilvusBaseOpDispenser<GetFlu
         };
         LongFunction<GetFlushStateParam.Builder> finalEbF = ebF;
         ebF = l -> finalEbF.apply(l).withSegmentIDs(idsF.apply(l));
-        ebF = op.enhanceFuncOptionally(ebF,List.of("collection","collection_name"),String.class,
+        ebF = op.enhanceFuncOptionally(ebF, List.of("collection", "collection_name"), String.class,
             GetFlushStateParam.Builder::withCollectionName);
-        ebF = op.enhanceFuncOptionally(ebF,"flush_ts",Long.class,GetFlushStateParam.Builder::withFlushTs);
+        ebF = op.enhanceFuncOptionally(ebF, "flush_ts", Number.class,
+            (GetFlushStateParam.Builder b, Number n) -> b.withFlushTs(n.longValue()));
 
         final LongFunction<GetFlushStateParam.Builder> lastF = ebF;
         final LongFunction<GetFlushStateParam> collectionParamF = l -> lastF.apply(l).build();
@@ -68,6 +69,6 @@ public class MilvusGetFlushStateOpDispenser extends MilvusBaseOpDispenser<GetFlu
         ParsedOp op,
         LongFunction<String> targetF
     ) {
-        return l -> new MilvusGetFlushStateOp(clientF.apply(l),paramF.apply(l));
+        return l -> new MilvusGetFlushStateOp(clientF.apply(l), paramF.apply(l));
     }
 }

adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListBulkInsertTasksOpDispenser.java

@@ -41,7 +41,8 @@ public class MilvusListBulkInsertTasksOpDispenser extends MilvusBaseOpDispenser<
     ) {
         LongFunction<ListBulkInsertTasksParam.Builder> ebF =
             l -> ListBulkInsertTasksParam.newBuilder().withCollectionName(targetF.apply(l));
-        ebF = op.enhanceFuncOptionally(ebF,"limit",Integer.class,ListBulkInsertTasksParam.Builder::withLimit);
+        ebF = op.enhanceFuncOptionally(ebF, "limit", Number.class,
+            (ListBulkInsertTasksParam.Builder b, Number n) -> b.withLimit(n.intValue()));
 
         final LongFunction<ListBulkInsertTasksParam.Builder> lastF = ebF;
         final LongFunction<ListBulkInsertTasksParam> collectionParamF = l -> lastF.apply(l).build();
@@ -55,6 +56,6 @@ public class MilvusListBulkInsertTasksOpDispenser extends MilvusBaseOpDispenser<
         ParsedOp op,
         LongFunction<String> targetF
     ) {
-        return l -> new MilvusListBulkInsertTasksOp(clientF.apply(l),paramF.apply(l));
+        return l -> new MilvusListBulkInsertTasksOp(clientF.apply(l), paramF.apply(l));
     }
 }

adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadCollectionOpDispenser.java

@@ -43,17 +43,18 @@ public class MilvusLoadCollectionOpDispenser extends MilvusBaseOpDispenser<LoadC
         LongFunction<LoadCollectionParam.Builder> ebF =
             l -> LoadCollectionParam.newBuilder().withCollectionName(targetF.apply(l));
 
-        ebF = op.enhanceFuncOptionally(ebF,List.of("database_name","database"),String.class,
+        ebF = op.enhanceFuncOptionally(ebF, List.of("database_name", "database"), String.class,
             LoadCollectionParam.Builder::withDatabaseName);
 
-        ebF = op.enhanceFuncOptionally(ebF,"refresh",Boolean.class,LoadCollectionParam.Builder::withRefresh);
+        ebF = op.enhanceFuncOptionally(ebF, "refresh", Boolean.class, LoadCollectionParam.Builder::withRefresh);
-        ebF = op.enhanceFuncOptionally(ebF,"sync_load",Boolean.class,LoadCollectionParam.Builder::withSyncLoad);
+        ebF = op.enhanceFuncOptionally(ebF, "sync_load", Boolean.class, LoadCollectionParam.Builder::withSyncLoad);
-        ebF = op.enhanceFuncOptionally(ebF,"replica_number",Integer.class,LoadCollectionParam.Builder::withReplicaNumber);
+        ebF = op.enhanceFuncOptionally(ebF, "replica_number", Number.class,
-        ebF = op.enhanceFuncOptionally(ebF,"resource_groups", List.class,LoadCollectionParam.Builder::withResourceGroups);
+            (LoadCollectionParam.Builder b, Number n) -> b.withReplicaNumber(n.intValue()));
-        ebF = op.enhanceFuncOptionally(ebF,"sync_load_waiting_interval",Number.class,
+        ebF = op.enhanceFuncOptionally(ebF, "resource_groups", List.class, LoadCollectionParam.Builder::withResourceGroups);
-            (LoadCollectionParam.Builder b,Number n) -> b.withSyncLoadWaitingInterval(n.longValue()));
+        ebF = op.enhanceFuncOptionally(ebF, "sync_load_waiting_interval", Number.class,
-        ebF = op.enhanceFuncOptionally(ebF,"sync_load_waiting_timeout",Number.class,
+            (LoadCollectionParam.Builder b, Number n) -> b.withSyncLoadWaitingInterval(n.longValue()));
-            (LoadCollectionParam.Builder b,Number n) -> b.withSyncLoadWaitingTimeout(n.longValue()));
+        ebF = op.enhanceFuncOptionally(ebF, "sync_load_waiting_timeout", Number.class,
+            (LoadCollectionParam.Builder b, Number n) -> b.withSyncLoadWaitingTimeout(n.longValue()));
 
         final LongFunction<LoadCollectionParam.Builder> lastF = ebF;
         final LongFunction<LoadCollectionParam> collectionParamF = l -> lastF.apply(l).build();
@@ -67,6 +68,6 @@ public class MilvusLoadCollectionOpDispenser extends MilvusBaseOpDispenser<LoadC
         ParsedOp op,
         LongFunction<String> targetF
     ) {
-        return l -> new MilvusLoadCollectionOp(clientF.apply(l),paramF.apply(l));
+        return l -> new MilvusLoadCollectionOp(clientF.apply(l), paramF.apply(l));
     }
 }

adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadPartitionsOpDispenser.java

@@ -50,22 +50,24 @@ public class MilvusLoadPartitionsOpDispenser extends MilvusBaseOpDispenser<LoadP
         LongFunction<LoadPartitionsParam.Builder> ebF =
             l -> LoadPartitionsParam.newBuilder().withCollectionName(targetF.apply(l));
 
-        ebF = op.enhanceFunc(ebF, List.of("partition_names","partitions"), List.class,
+        ebF = op.enhanceFunc(ebF, List.of("partition_names", "partitions"), List.class,
             LoadPartitionsParam.Builder::withPartitionNames);
         ebF = op.enhanceFuncOptionally(
             ebF, "resource_groups", List.class,
             LoadPartitionsParam.Builder::withResourceGroups
         );
         ebF = op.enhanceFuncOptionally(
-            ebF, List.of("database_name","database"), String.class,
+            ebF, List.of("database_name", "database"), String.class,
             LoadPartitionsParam.Builder::withDatabaseName
         );
         ebF = op.enhanceFuncOptionally(ebF, "refresh", Boolean.class, LoadPartitionsParam.Builder::withRefresh);
-        ebF = op.enhanceFuncOptionally(ebF, "replica_number", Integer.class, LoadPartitionsParam.Builder::withReplicaNumber);
+        ebF = op.enhanceFuncOptionally(ebF, "replica_number", Number.class,
-        ebF = op.enhanceFuncOptionally(ebF,"sync_load",Boolean.class,LoadPartitionsParam.Builder::withSyncLoad);
+            (LoadPartitionsParam.Builder b, Number n) -> b.withReplicaNumber(n.intValue()));
-        ebF = op.enhanceFuncOptionally(ebF,"sync_load_waiting_interval",Long.class,LoadPartitionsParam.Builder::withSyncLoadWaitingInterval);
+        ebF = op.enhanceFuncOptionally(ebF, "sync_load", Boolean.class, LoadPartitionsParam.Builder::withSyncLoad);
-        ebF = op.enhanceFuncOptionally(ebF,"sync_load_waiting_timeout",Long.class,
+        ebF = op.enhanceFuncOptionally(ebF, "sync_load_waiting_interval", Number.class,
-            LoadPartitionsParam.Builder::withSyncLoadWaitingTimeout);
+            (LoadPartitionsParam.Builder b, Number n) -> b.withSyncLoadWaitingInterval(n.longValue()));
+        ebF = op.enhanceFuncOptionally(ebF, "sync_load_waiting_timeout", Number.class,
+            (LoadPartitionsParam.Builder b, Number n) -> b.withSyncLoadWaitingTimeout(n.longValue()));
 
         final LongFunction<LoadPartitionsParam.Builder> lastF = ebF;
         final LongFunction<LoadPartitionsParam> collectionParamF = l -> lastF.apply(l).build();

adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusQueryOpDispenser.java

@@ -44,14 +44,14 @@ public class MilvusQueryOpDispenser extends MilvusBaseOpDispenser<QueryParam> {
         LongFunction<QueryParam.Builder> ebF =
             l -> QueryParam.newBuilder().withCollectionName(targetF.apply(l));
 
-        ebF = op.enhanceFuncOptionally(ebF,List.of("partition_names","partitions"), List.class,
+        ebF = op.enhanceFuncOptionally(ebF, List.of("partition_names", "partitions"), List.class,
             QueryParam.Builder::withPartitionNames);
-        ebF = op.enhanceEnumOptionally(ebF,"consistency_level", ConsistencyLevelEnum.class, QueryParam.Builder::withConsistencyLevel);
+        ebF = op.enhanceEnumOptionally(ebF, "consistency_level", ConsistencyLevelEnum.class, QueryParam.Builder::withConsistencyLevel);
-        ebF = op.enhanceFuncOptionally(ebF,"expr",String.class,QueryParam.Builder::withExpr);
+        ebF = op.enhanceFuncOptionally(ebF, "expr", String.class, QueryParam.Builder::withExpr);
-        ebF = op.enhanceFuncOptionally(ebF,"limit",Long.class,QueryParam.Builder::withLimit);
+        ebF = op.enhanceFuncOptionally(ebF, "limit", Number.class, (QueryParam.Builder b, Number n) -> b.withLimit(n.longValue()));
-        ebF = op.enhanceFuncOptionally(ebF,"offset",Long.class,QueryParam.Builder::withOffset);
+        ebF = op.enhanceFuncOptionally(ebF, "offset", Number.class, (QueryParam.Builder b, Number n) -> b.withOffset(n.longValue()));
-        ebF = op.enhanceFuncOptionally(ebF,"ignore_growing",Boolean.class,QueryParam.Builder::withIgnoreGrowing);
+        ebF = op.enhanceFuncOptionally(ebF, "ignore_growing", Boolean.class, QueryParam.Builder::withIgnoreGrowing);
-        ebF = op.enhanceFuncOptionally(ebF,"out_fields",List.class,QueryParam.Builder::withOutFields);
+        ebF = op.enhanceFuncOptionally(ebF, "out_fields", List.class, QueryParam.Builder::withOutFields);
 
         final LongFunction<QueryParam.Builder> lastF = ebF;
         final LongFunction<QueryParam> collectionParamF = l -> lastF.apply(l).build();
@@ -65,6 +65,6 @@ public class MilvusQueryOpDispenser extends MilvusBaseOpDispenser<QueryParam> {
         ParsedOp op,
         LongFunction<String> targetF
     ) {
-        return l -> new MilvusQueryOp(clientF.apply(l),paramF.apply(l));
+        return l -> new MilvusQueryOp(clientF.apply(l), paramF.apply(l));
     }
 }

adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusSearchOpDispenser.java

@@ -24,12 +24,8 @@ import io.nosqlbench.adapter.milvus.MilvusDriverAdapter;
 import io.nosqlbench.adapter.milvus.ops.MilvusBaseOp;
 import io.nosqlbench.adapter.milvus.ops.MilvusSearchOp;
 import io.nosqlbench.adapters.api.templating.ParsedOp;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.function.LongFunction;
 
 public class MilvusSearchOpDispenser extends MilvusBaseOpDispenser<SearchParam> {
@@ -53,9 +49,11 @@ public class MilvusSearchOpDispenser extends MilvusBaseOpDispenser<SearchParam>
 
         ebF = op.enhanceEnumOptionally(ebF, "consistency_level", ConsistencyLevelEnum.class, SearchParam.Builder::withConsistencyLevel);
         ebF = op.enhanceFuncOptionally(ebF, "expr", String.class, SearchParam.Builder::withExpr);
-        ebF = op.enhanceDefaultFunc(ebF, "top_k", Integer.class, 100, SearchParam.Builder::withTopK);
+        ebF = op.enhanceDefaultFunc(ebF, "top_k", Number.class, 100,
+            (SearchParam.Builder b, Number n) -> b.withTopK(n.intValue()));
         ebF = op.enhanceEnumOptionally(ebF, "metric_type", MetricType.class, SearchParam.Builder::withMetricType);
-        ebF = op.enhanceFuncOptionally(ebF, "round_decimal", Integer.class, SearchParam.Builder::withRoundDecimal);
+        ebF = op.enhanceFuncOptionally(ebF, "round_decimal", Number.class,
+            (SearchParam.Builder b, Number n) -> b.withRoundDecimal(n.intValue()));
         ebF = op.enhanceFuncOptionally(ebF, "ignore_growing", Boolean.class, SearchParam.Builder::withIgnoreGrowing);
         ebF = op.enhanceFuncOptionally(ebF, "params", String.class, SearchParam.Builder::withParams);
         ebF = op.enhanceFunc(ebF, List.of("vector_field_name", "vector_field"), String.class,