From 971347ab3259ca13fd6f2b3880d062fee8127a46 Mon Sep 17 00:00:00 2001
From: generall <andrey@vasnetsov.com>
Date: Thu, 20 Jun 2024 09:40:52 +0200
Subject: [PATCH 1/4] wip: make test with order-by in scroll

---
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                |  8 +-
 .idea/vcs.xml                                 |  2 +-
 .../java/io/qdrant/client/PointsTest.java     | 85 +++++++++++++------
 4 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e7c302f..0befd1f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -16,7 +16,7 @@
           </compositeBuild>
         </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="" />
+        <option name="gradleJvm" value="21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 11303e2..900119e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,7 @@
     <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
     <option name="myNullables">
       <value>
-        <list size="16">
+        <list size="17">
           <item index="0" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="org.jspecify.nullness.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
@@ -26,12 +26,13 @@
           <item index="13" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
           <item index="14" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
           <item index="15" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="16" class="java.lang.String" itemvalue="org.jspecify.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="16">
+        <list size="17">
           <item index="0" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
           <item index="1" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
           <item index="2" class="java.lang.String" itemvalue="jakarta.annotation.Nonnull" />
@@ -48,11 +49,12 @@
           <item index="13" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="14" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="15" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="16" class="java.lang.String" itemvalue="org.jspecify.annotations.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="azul-19" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/test/java/io/qdrant/client/PointsTest.java b/src/test/java/io/qdrant/client/PointsTest.java
index 53f8bbc..9e57960 100644
--- a/src/test/java/io/qdrant/client/PointsTest.java
+++ b/src/test/java/io/qdrant/client/PointsTest.java
@@ -15,6 +15,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import io.qdrant.client.grpc.Collections;
+import io.qdrant.client.grpc.Points;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -379,6 +381,18 @@ public void scroll() throws ExecutionException, InterruptedException {
 
 		assertEquals(1, scrollResponse.getResultCount());
 		assertFalse(scrollResponse.hasNextPageOffset());
+
+		scrollResponse = client.scrollAsync(ScrollPoints.newBuilder()
+			.setCollectionName(testName)
+			.setLimit(1)
+			.setOrderBy(Points.OrderBy.newBuilder()
+				.setDirection(Points.Direction.Desc)
+				.setKey("bar").build())
+			.build()
+		).get();
+
+		assertEquals(1, scrollResponse.getResultCount());
+		assertFalse(scrollResponse.hasNextPageOffset());
 	}
 
 	@Test
@@ -458,10 +472,10 @@ public void discover() throws ExecutionException, InterruptedException {
 		createAndSeedCollection(testName);
 
 		List<ScoredPoint> points = client.discoverAsync(DiscoverPoints.newBuilder()
-				.setCollectionName(testName)
-				.setTarget(targetVector(vector(ImmutableList.of(10.4f, 11.4f))))
-				.setLimit(1)
-				.build()).get();
+			.setCollectionName(testName)
+			.setTarget(targetVector(vector(ImmutableList.of(10.4f, 11.4f))))
+			.setLimit(1)
+			.build()).get();
 
 		assertEquals(1, points.size());
 		assertEquals(id(9), points.get(0).getId());
@@ -472,19 +486,19 @@ public void discoverBatch() throws ExecutionException, InterruptedException {
 		createAndSeedCollection(testName);
 
 		List<BatchResult> batchResults = client.discoverBatchAsync(
-				testName,
-				ImmutableList.of(
-						DiscoverPoints.newBuilder()
-								.setCollectionName(testName)
-								.setTarget(targetVector(vector(ImmutableList.of(10.4f, 11.4f))))
-								.setLimit(1)
-								.build(),
-						DiscoverPoints.newBuilder()
-								.setCollectionName(testName)
-								.setTarget(targetVector(vector(ImmutableList.of(3.5f, 4.5f))))
-								.setLimit(1)
-								.build()),
-				null).get();
+			testName,
+			ImmutableList.of(
+				DiscoverPoints.newBuilder()
+					.setCollectionName(testName)
+					.setTarget(targetVector(vector(ImmutableList.of(10.4f, 11.4f))))
+					.setLimit(1)
+					.build(),
+				DiscoverPoints.newBuilder()
+					.setCollectionName(testName)
+					.setTarget(targetVector(vector(ImmutableList.of(3.5f, 4.5f))))
+					.setLimit(1)
+					.build()),
+			null).get();
 
 		assertEquals(2, batchResults.size());
 		BatchResult result = batchResults.get(0);
@@ -573,17 +587,17 @@ public void batchPointUpdate() throws ExecutionException, InterruptedException {
 		createAndSeedCollection(testName);
 
 		List<PointsUpdateOperation> operations = List.of(
-				PointsUpdateOperation.newBuilder()
-						.setClearPayload(ClearPayload.newBuilder().setPoints(
-								PointsSelector.newBuilder().setPoints(PointsIdsList.newBuilder().addIds(id(9))))
-								.build())
-						.build(),
-				PointsUpdateOperation.newBuilder()
-						.setUpdateVectors(UpdateVectors.newBuilder()
-								.addPoints(PointVectors.newBuilder()
-										.setId(id(9))
-										.setVectors(vectors(0.6f, 0.7f))))
-						.build());
+			PointsUpdateOperation.newBuilder()
+				.setClearPayload(ClearPayload.newBuilder().setPoints(
+						PointsSelector.newBuilder().setPoints(PointsIdsList.newBuilder().addIds(id(9))))
+					.build())
+				.build(),
+			PointsUpdateOperation.newBuilder()
+				.setUpdateVectors(UpdateVectors.newBuilder()
+					.addPoints(PointVectors.newBuilder()
+						.setId(id(9))
+						.setVectors(vectors(0.6f, 0.7f))))
+				.build());
 
 		List<UpdateResult> response = client.batchUpdateAsync(testName, operations).get();
 
@@ -603,6 +617,21 @@ private void createAndSeedCollection(String collectionName) throws ExecutionExce
 
 		client.createCollectionAsync(request).get();
 
+		// ToDo: create params for integer index, so that only Range is enabled
+		//
+		// Collections.PayloadIndexParams params = Collections.PayloadIndexParamsOrBuilder()
+
+		UpdateResult resultIndex = client.createPayloadIndexAsync(
+			testName,
+			"bar",
+			PayloadSchemaType.Integer,
+			null,
+			true,
+			null,
+			null).get();
+
+		assertEquals(UpdateStatus.Completed, resultIndex.getStatus());
+
 		UpdateResult result = client.upsertAsync(collectionName, ImmutableList.of(
 			PointStruct.newBuilder()
 				.setId(id(8))

From 3d7c72277de2e99661d09d67e72bb48488e44047 Mon Sep 17 00:00:00 2001
From: generall <andrey@vasnetsov.com>
Date: Thu, 20 Jun 2024 09:46:00 +0200
Subject: [PATCH 2/4] use parametrized integer index

---
 src/test/java/io/qdrant/client/PointsTest.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/test/java/io/qdrant/client/PointsTest.java b/src/test/java/io/qdrant/client/PointsTest.java
index 9e57960..6da2b72 100644
--- a/src/test/java/io/qdrant/client/PointsTest.java
+++ b/src/test/java/io/qdrant/client/PointsTest.java
@@ -617,15 +617,16 @@ private void createAndSeedCollection(String collectionName) throws ExecutionExce
 
 		client.createCollectionAsync(request).get();
 
-		// ToDo: create params for integer index, so that only Range is enabled
-		//
-		// Collections.PayloadIndexParams params = Collections.PayloadIndexParamsOrBuilder()
+		Collections.PayloadIndexParams params = Collections.PayloadIndexParams.newBuilder()
+			.setIntegerIndexParams(
+				Collections.IntegerIndexParams.newBuilder().setLookup(false).setRange(true).build())
+			.build();
 
 		UpdateResult resultIndex = client.createPayloadIndexAsync(
 			testName,
 			"bar",
 			PayloadSchemaType.Integer,
-			null,
+			params,
 			true,
 			null,
 			null).get();

From 961595df6233c6a3d6ed9ad8c000d4755bc4cc12 Mon Sep 17 00:00:00 2001
From: generall <andrey@vasnetsov.com>
Date: Thu, 20 Jun 2024 10:07:38 +0200
Subject: [PATCH 3/4] fix tests

---
 .../java/io/qdrant/client/PointsTest.java     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/test/java/io/qdrant/client/PointsTest.java b/src/test/java/io/qdrant/client/PointsTest.java
index 6da2b72..a549a2a 100644
--- a/src/test/java/io/qdrant/client/PointsTest.java
+++ b/src/test/java/io/qdrant/client/PointsTest.java
@@ -363,6 +363,22 @@ public void searchGroups() throws ExecutionException, InterruptedException {
 	public void scroll() throws ExecutionException, InterruptedException {
 		createAndSeedCollection(testName);
 
+		Collections.PayloadIndexParams params = Collections.PayloadIndexParams.newBuilder()
+			.setIntegerIndexParams(
+				Collections.IntegerIndexParams.newBuilder().setLookup(false).setRange(true).build())
+			.build();
+
+		UpdateResult resultIndex = client.createPayloadIndexAsync(
+			testName,
+			"bar",
+			PayloadSchemaType.Integer,
+			params,
+			true,
+			null,
+			null).get();
+
+		assertEquals(UpdateStatus.Completed, resultIndex.getStatus());
+
 		ScrollResponse scrollResponse = client.scrollAsync(ScrollPoints.newBuilder()
 			.setCollectionName(testName)
 			.setLimit(1)
@@ -617,22 +633,6 @@ private void createAndSeedCollection(String collectionName) throws ExecutionExce
 
 		client.createCollectionAsync(request).get();
 
-		Collections.PayloadIndexParams params = Collections.PayloadIndexParams.newBuilder()
-			.setIntegerIndexParams(
-				Collections.IntegerIndexParams.newBuilder().setLookup(false).setRange(true).build())
-			.build();
-
-		UpdateResult resultIndex = client.createPayloadIndexAsync(
-			testName,
-			"bar",
-			PayloadSchemaType.Integer,
-			params,
-			true,
-			null,
-			null).get();
-
-		assertEquals(UpdateStatus.Completed, resultIndex.getStatus());
-
 		UpdateResult result = client.upsertAsync(collectionName, ImmutableList.of(
 			PointStruct.newBuilder()
 				.setId(id(8))

From 6aacf718cc9622f3d631469432dcac16706b6aea Mon Sep 17 00:00:00 2001
From: Anush <anushshetty90@gmail.com>
Date: Thu, 20 Jun 2024 15:19:40 +0530
Subject: [PATCH 4/4] test: separate test for order-by scroll (#43)

---
 gradle.properties                             |  4 +-
 .../java/io/qdrant/client/PointsTest.java     | 44 ++++++++++++-------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 047ef1f..8db2040 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 # The version of qdrant to use to download protos
-qdrantProtosVersion=v1.9.2
+qdrantProtosVersion=v1.9.5
 
 # The version of qdrant docker image to run integration tests against
-qdrantVersion=v1.9.2
+qdrantVersion=v1.9.5
 
 # The version of the client to generate
 packageVersion=1.9.1
diff --git a/src/test/java/io/qdrant/client/PointsTest.java b/src/test/java/io/qdrant/client/PointsTest.java
index a549a2a..ecf0845 100644
--- a/src/test/java/io/qdrant/client/PointsTest.java
+++ b/src/test/java/io/qdrant/client/PointsTest.java
@@ -363,22 +363,6 @@ public void searchGroups() throws ExecutionException, InterruptedException {
 	public void scroll() throws ExecutionException, InterruptedException {
 		createAndSeedCollection(testName);
 
-		Collections.PayloadIndexParams params = Collections.PayloadIndexParams.newBuilder()
-			.setIntegerIndexParams(
-				Collections.IntegerIndexParams.newBuilder().setLookup(false).setRange(true).build())
-			.build();
-
-		UpdateResult resultIndex = client.createPayloadIndexAsync(
-			testName,
-			"bar",
-			PayloadSchemaType.Integer,
-			params,
-			true,
-			null,
-			null).get();
-
-		assertEquals(UpdateStatus.Completed, resultIndex.getStatus());
-
 		ScrollResponse scrollResponse = client.scrollAsync(ScrollPoints.newBuilder()
 			.setCollectionName(testName)
 			.setLimit(1)
@@ -397,8 +381,32 @@ public void scroll() throws ExecutionException, InterruptedException {
 
 		assertEquals(1, scrollResponse.getResultCount());
 		assertFalse(scrollResponse.hasNextPageOffset());
+	}
 
-		scrollResponse = client.scrollAsync(ScrollPoints.newBuilder()
+	@Test
+	public void scrollWithOrdering() throws ExecutionException, InterruptedException {
+		createAndSeedCollection(testName);
+
+		Collections.PayloadIndexParams params = Collections.PayloadIndexParams.newBuilder()
+			.setIntegerIndexParams(
+				Collections.IntegerIndexParams.newBuilder().setLookup(false).setRange(true).build())
+			.build();
+
+		UpdateResult resultIndex = client.createPayloadIndexAsync(
+			testName,
+			"bar",
+			PayloadSchemaType.Integer,
+			params,
+			true,
+			null,
+			null).get();
+
+		assertEquals(UpdateStatus.Completed, resultIndex.getStatus());
+
+		CollectionInfo collectionInfo = client.getCollectionInfoAsync(testName).get();
+		assertEquals(ImmutableSet.of("bar"), collectionInfo.getPayloadSchemaMap().keySet());
+
+		ScrollResponse scrollResponse = client.scrollAsync(ScrollPoints.newBuilder()
 			.setCollectionName(testName)
 			.setLimit(1)
 			.setOrderBy(Points.OrderBy.newBuilder()
@@ -407,8 +415,10 @@ public void scroll() throws ExecutionException, InterruptedException {
 			.build()
 		).get();
 
+		
 		assertEquals(1, scrollResponse.getResultCount());
 		assertFalse(scrollResponse.hasNextPageOffset());
+		assertEquals(scrollResponse.getResult(0).getId(), id(9));
 	}
 
 	@Test