Java: VSS commands init #2385

Yury-Fridlyand · 2024-10-03T00:25:13Z

.github/workflows/java.yml

glide-core/src/protobuf/command_request.proto

acarbonetto · 2024-10-03T16:54:49Z

java/client/build.gradle

@@ -165,8 +165,8 @@ jar.dependsOn('copyNativeLib')
 javadoc.dependsOn('copyNativeLib')
 copyNativeLib.dependsOn('buildRustRelease')
 compileTestJava.dependsOn('copyNativeLib')
-test.dependsOn('buildRust')
-testFfi.dependsOn('buildRust')
+test.dependsOn('buildRustRelease')


why? I thought we were okay with running tests vs the debug version?

gradle still runs UT on release due to copyNativeLib. At least it doesn't build debug version which is never used.

I don't know when we decided to switch to the release version. Better to run against debug, but we can fix this in a separate PR

java/client/src/main/java/glide/api/BaseClient.java

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

acarbonetto · 2024-10-09T00:52:58Z

glide-core/src/request_type.rs

@@ -685,6 +691,9 @@ impl RequestType {
            RequestType::ScriptExists => Some(get_two_word_command("SCRIPT", "EXISTS")),
            RequestType::ScriptFlush => Some(get_two_word_command("SCRIPT", "FLUSH")),
            RequestType::ScriptKill => Some(get_two_word_command("SCRIPT", "KILL")),
+            RequestType::FtCreate => Some(cmd("FT.CREATE")),
+            RequestType::FtSearch => Some(cmd("FT.SEARCH")),
+            RequestType::FtDrop => Some(cmd("FT.DROPINDEX")),


Suggested change

RequestType::FtDrop => Some(cmd("FT.DROPINDEX")),

RequestType::FtDropIndex => Some(cmd("FT.DROPINDEX")),

acarbonetto · 2024-10-09T00:53:04Z

glide-core/src/request_type.rs

@@ -457,6 +460,9 @@ impl From<::protobuf::EnumOrUnknown<ProtobufRequestType>> for RequestType {
            ProtobufRequestType::ScriptFlush => RequestType::ScriptFlush,
            ProtobufRequestType::ScriptKill => RequestType::ScriptKill,
            ProtobufRequestType::ScriptShow => RequestType::ScriptShow,
+            ProtobufRequestType::FtCreate => RequestType::FtCreate,
+            ProtobufRequestType::FtSearch => RequestType::FtSearch,
+            ProtobufRequestType::FtDrop => RequestType::FtDrop,


Suggested change

ProtobufRequestType::FtDrop => RequestType::FtDrop,

ProtobufRequestType::FtDropIndex => RequestType::FtDropIndex,

acarbonetto · 2024-10-09T00:53:10Z

glide-core/src/request_type.rs

@@ -227,6 +227,9 @@ pub enum RequestType {
    ScriptFlush = 216,
    ScriptKill = 217,
    ScriptShow = 218,
+    FtCreate = 2000,
+    FtSearch = 2001,
+    FtDrop = 2002,


Suggested change

FtDrop = 2002,

FtDropIndex = 2002,

acarbonetto · 2024-10-09T00:53:17Z

glide-core/src/protobuf/command_request.proto

+
+    FtCreate = 2000;
+    FtSearch = 2001;
+    FtDrop = 2002;


Suggested change

FtDrop = 2002;

FtDropIndex = 2002;

acarbonetto · 2024-10-09T00:54:09Z

java/client/build.gradle

@@ -165,8 +165,8 @@ jar.dependsOn('copyNativeLib')
 javadoc.dependsOn('copyNativeLib')
 copyNativeLib.dependsOn('buildRustRelease')
 compileTestJava.dependsOn('copyNativeLib')
-test.dependsOn('buildRust')
-testFfi.dependsOn('buildRust')
+test.dependsOn('buildRustRelease')


I don't know when we decided to switch to the release version. Better to run against debug, but we can fix this in a separate PR

acarbonetto · 2024-10-09T00:56:45Z

java/client/src/main/java/glide/api/commands/VectorSearchBaseCommands.java

+import glide.api.models.commands.vss.FTSearchOptions.FTSearchOptionsBuilder;
+import java.util.concurrent.CompletableFuture;
+
+public interface VectorSearchBaseCommands {


Please change this to a Static Public Class and put it under package glide.api.commands.servermodules.
Move the commands function from BaseClient to here (add the argument BaseClient to each command).
We don't need to separate Interface and commands, and we can put the documentation in one place.

Following the JSON and FT commands, we should rename this class to FT, and commands should only reference the action. Example:

import static glide.api.models.commands. servermodules.FT; FT.create(client, "hash_idx1", FTCreateOptions.empty(), new FieldInfo[] { new FieldInfo("vec", VectorFieldFlat.builder(DistanceMetric.L2, 2).build()) }).get();

Will do after merging #2414

prateek-kumar-improving · 2024-10-09T01:59:09Z

java/client/src/main/java/glide/api/commands/VectorSearchBaseCommands.java

+     * client.ftdrop("hash_idx1").get();
+     * }</pre>
+     */
+    CompletableFuture<String> ftdrop(String indexName);


Suggested change

CompletableFuture<String> ftdrop(String indexName);

CompletableFuture<String> ftdropindex(String indexName);

prateek-kumar-improving · 2024-10-09T02:00:48Z

java/client/src/main/java/glide/api/models/commands/vss/FTCreateOptions.java

+            var args = new ArrayList<String>();
+            args.add("TAG");
+            if (separator.isPresent()) {
+                args.add("SEPARATOR");


Should these keywords be constants?

prateek-kumar-improving · 2024-10-09T02:01:53Z

java/client/src/main/java/glide/api/models/commands/vss/FTCreateOptions.java

+        @Override
+        public String[] toArgs() {
+            var args = new ArrayList<String>();
+            args.add("VECTOR");


Suggestion: Types TEXT, VECTOR, TAG, etc. could be Enums.

prateek-kumar-improving · 2024-10-09T02:03:29Z

java/client/src/main/java/glide/api/models/commands/vss/FTCreateOptions.java

+            var args = new ArrayList<String>();
+            args.add("VECTOR");
+            args.add(Algorithm);
+            args.add(Integer.toString(params.size() * 2));


There is no null check for params? This is a potential null pointer exception.

prateek-kumar-improving · 2024-10-09T02:06:30Z

java/client/src/main/java/glide/api/models/commands/vss/FTCreateOptions.java

+     */
+    public static class VectorFieldHnsw extends VectorField {
+        protected VectorFieldHnsw(Map<String, String> params) {
+            super(params, "HNSW");


"HNSW" value can be taken from Algorithm Enum.

prateek-kumar-improving · 2024-10-10T17:25:21Z

java/client/src/main/java/glide/api/BaseClient.java

+                concatenateArrays(
+                        new GlideString[] {gs(indexName), gs(query)},
+                        options.toArgs(),
+                        new GlideString[] {gs("DIALECT"), gs("2")});


I don't see this option in the inputs.

Yury-Fridlyand · 2024-10-11T18:45:25Z

Superseded by #2414, #2439 and #2440

Yury-Fridlyand added 7 commits October 2, 2024 14:18

5293436

b5f8834

fc939d1

503258d

5d466e8

82c42a1

2f26179

Yury-Fridlyand added the java issues and fixes related to the java client label Oct 3, 2024

Yury-Fridlyand requested a review from a team as a code owner October 3, 2024 00:25

Yury-Fridlyand had a problem deploying to AWS_ACTIONS October 3, 2024 00:25 — with GitHub Actions Error

Yury-Fridlyand requested a review from shohamazon October 3, 2024 00:25

236a11b

Yury-Fridlyand had a problem deploying to AWS_ACTIONS October 3, 2024 00:48 — with GitHub Actions Error

Yury-Fridlyand temporarily deployed to AWS_ACTIONS October 3, 2024 00:48 — with GitHub Actions Inactive

78ee3a5

Yury-Fridlyand had a problem deploying to AWS_ACTIONS October 3, 2024 15:26 — with GitHub Actions Error

Yury-Fridlyand temporarily deployed to AWS_ACTIONS October 3, 2024 15:26 — with GitHub Actions Inactive

461acd0

Yury-Fridlyand had a problem deploying to AWS_ACTIONS October 3, 2024 16:06 — with GitHub Actions Error

acarbonetto reviewed Oct 3, 2024

View reviewed changes

bf1eee2

Yury-Fridlyand had a problem deploying to AWS_ACTIONS October 3, 2024 20:37 — with GitHub Actions Error

c183a58

Yury-Fridlyand had a problem deploying to AWS_ACTIONS October 3, 2024 20:39 — with GitHub Actions Error

121698d

Yury-Fridlyand had a problem deploying to AWS_ACTIONS October 3, 2024 21:54 — with GitHub Actions Error

2219259

Yury-Fridlyand had a problem deploying to AWS_ACTIONS October 3, 2024 22:00 — with GitHub Actions Error

This was referenced Oct 3, 2024

Java: FT.CREATE Bit-Quill/valkey-glide#422

Closed

FT.DROP Bit-Quill/valkey-glide#424

Closed

Yury-Fridlyand mentioned this pull request Oct 3, 2024

FT.SEARCH Bit-Quill/valkey-glide#423

Closed

jamesx-improving reviewed Oct 4, 2024

View reviewed changes

java/client/src/main/java/glide/api/BaseClient.java Show resolved Hide resolved

Yury-Fridlyand added 2 commits October 7, 2024 11:06

989670a

Merge branch 'main' into java/yuryf-ft-create-search-drop

8730f01

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Yury-Fridlyand had a problem deploying to AWS_ACTIONS October 7, 2024 21:53 — with GitHub Actions Error

b8e84b4

Yury-Fridlyand had a problem deploying to AWS_ACTIONS October 7, 2024 23:34 — with GitHub Actions Error

acarbonetto changed the title ~~Java: VSS commans init~~ Java: VSS commands init Oct 8, 2024

0571445

Yury-Fridlyand had a problem deploying to AWS_ACTIONS October 8, 2024 01:29 — with GitHub Actions Failure

Yury-Fridlyand mentioned this pull request Oct 8, 2024

Java: add FT.INFO #2405

Merged

6 tasks

acarbonetto reviewed Oct 9, 2024

View reviewed changes

prateek-kumar-improving reviewed Oct 9, 2024

View reviewed changes

prateek-kumar-improving reviewed Oct 10, 2024

View reviewed changes

Yury-Fridlyand closed this Oct 11, 2024

Yury-Fridlyand deleted the java/yuryf-ft-create-search-drop branch October 11, 2024 18:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Java: VSS commands init #2385

Java: VSS commands init #2385

Yury-Fridlyand commented Oct 3, 2024 •

edited

Loading

acarbonetto Oct 3, 2024

Yury-Fridlyand Oct 3, 2024 •

edited

Loading

acarbonetto Oct 9, 2024

acarbonetto Oct 9, 2024

acarbonetto Oct 9, 2024

acarbonetto Oct 9, 2024

acarbonetto Oct 9, 2024

acarbonetto Oct 9, 2024

acarbonetto Oct 9, 2024

acarbonetto Oct 9, 2024

Yury-Fridlyand Oct 9, 2024

prateek-kumar-improving Oct 9, 2024

prateek-kumar-improving Oct 9, 2024

prateek-kumar-improving Oct 9, 2024

prateek-kumar-improving Oct 9, 2024

prateek-kumar-improving Oct 9, 2024

prateek-kumar-improving Oct 10, 2024

Yury-Fridlyand commented Oct 11, 2024

	RequestType::FtDrop => Some(cmd("FT.DROPINDEX")),
	RequestType::FtDropIndex => Some(cmd("FT.DROPINDEX")),

	ProtobufRequestType::FtDrop => RequestType::FtDrop,
	ProtobufRequestType::FtDropIndex => RequestType::FtDropIndex,

	CompletableFuture<String> ftdrop(String indexName);
	CompletableFuture<String> ftdropindex(String indexName);

Java: VSS commands init #2385

Java: VSS commands init #2385

Conversation

Yury-Fridlyand commented Oct 3, 2024 • edited Loading

Choose a reason for hiding this comment

Yury-Fridlyand Oct 3, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Yury-Fridlyand commented Oct 11, 2024

Yury-Fridlyand commented Oct 3, 2024 •

edited

Loading

Yury-Fridlyand Oct 3, 2024 •

edited

Loading