IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

minor adjustments to milvus adapter

Browse Source
This commit is contained in:
Jonathan Shook 2024-06-05 13:31:09 -05:00
parent 24a449c951
commit ded4a7a32c
4 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mvn-defaults/pom.xml
View File

@ -392,6 +392,13 @@
<version>1.0-1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.23.1</version>
</dependency>
</dependencies>
</dependencyManagement>
@ -405,15 +412,22 @@
<version>2.23.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.23.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.23.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.23.1</version>
<!-- <version>2.23.1</version>-->
</dependency>
<dependency>

17
nb-adapters/adapter-milvus/pom.xml
View File

@ -52,11 +52,28 @@
<artifactId>protobuf-java-util</artifactId>
<version>3.25.3</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.apache.logging.log4j</groupId>-->
<!-- <artifactId>log4j-core</artifactId>-->
<!-- <version>2.23.1</version>-->
<!-- </dependency>-->
<dependency>
<groupId>io.milvus</groupId>
<artifactId>milvus-sdk-java</artifactId>
<version>2.4.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
</dependencies>

28
nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusSpace.java
View File

@ -31,6 +31,7 @@ import java.nio.file.Paths;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
/**
* The MilvusSpace class is a context object which stores all stateful contextual information needed to interact
@ -51,8 +52,10 @@ public class MilvusSpace implements AutoCloseable {
* Create a new MilvusSpace Object which stores all stateful contextual information needed to interact
* with the Milvus/Zilliz database instance.
*
* @param name The name of this space
* @param cfg The configuration ({@link NBConfiguration}) for this nb run
* @param name
* The name of this space
* @param cfg
* The configuration ({@link NBConfiguration}) for this nb run
*/
public MilvusSpace(String name, NBConfiguration cfg) {
this.name = name;
@ -72,7 +75,7 @@ public class MilvusSpace implements AutoCloseable {
cfg.getOptional("database_name").ifPresent(builder::withDatabaseName);
cfg.getOptional("database").ifPresent(builder::withDatabaseName);
var requiredToken = cfg.getOptional("token_file")
cfg.getOptional("token_file")
.map(Paths::get)
.map(
tokenFilePath -> {
@ -84,16 +87,15 @@ public class MilvusSpace implements AutoCloseable {
throw new RuntimeException(e);
}
}
).orElseGet(
() -> cfg.getOptional("token")
.orElseThrow(() -> new RuntimeException("You must provide either a token_file or a token to " +
"configure a Milvus/Zilliz client"))
);
builder = builder.withToken(requiredToken);
).or(() -> cfg.getOptional("token"))
.ifPresent(builder::withToken);
// builder = builder.withToken(optionalToken);
ConnectParam connectParams = builder.build();
String tokenSummary = Optional.ofNullable(builder.getToken())
.map(MilvusAdapterUtils::maskDigits).orElse("[none]");
logger.info("{}: Creating new Milvus/Zilliz Client with (masked) token [{}], uri/endpoint [{}]",
this.name, MilvusAdapterUtils.maskDigits(builder.getToken()), builder.getUri());
this.name, tokenSummary, builder.getUri());
return new MilvusServiceClient(connectParams);
}
@ -101,11 +103,11 @@ public class MilvusSpace implements AutoCloseable {
return ConfigModel.of(MilvusSpace.class)
.add(
Param.optional("token_file", String.class, "the file to load the token from")
Param.optional("token_file", String.class, "the file to load the token from (try root:Milvus within)")
)
.add(
Param.defaultTo("token", "root:Milvus")
.setDescription("the Milvus/Zilliz token to use to connect to the database")
Param.optional("token")
.setDescription("the Milvus/Zilliz token to use to connect to the database (try root:Milvus)")
)
.add(
Param.defaultTo("uri", "127.0.0.1:19530")

2
nb-adapters/adapter-qdrant/src/main/java/io/nosqlbench/adapter/qdrant/QdrantSpace.java
View File

@ -72,7 +72,7 @@ public class QdrantSpace implements AutoCloseable {
boolean useTls = cfg.getOptional("use_tls").map(Boolean::parseBoolean).orElse(true);
var builder = QdrantGrpcClient.newBuilder(uri, grpcPort, useTls);
var requiredToken = cfg.getOptional("token_file")
var Optional<requiredToken> = cfg.getOptional("token_file")
.map(Paths::get)
.map(
tokenFilePath -> {