Fix tests and minor bugs

Author: uglide

src/main/java/redis/clients/jedis/search/aggr/AggregateIterator.java

@@ -27,6 +27,11 @@
  * try (AggregateIterator iterator = new AggregateIterator(provider, "myindex", aggr)) {
  *     while (iterator.hasNext()) {
  *         AggregationResult batch = iterator.next();
+ *
+ *         if (batch.isEmpty()) {
+ *             break; // FT.AGGREGATE returned empty result set
+ *         }
+ *
  *         // Process batch - access rows via batch.getRows()
  *
  *         // Optionally terminate early and free server resources
@@ -72,9 +77,6 @@ public AggregateIterator(ConnectionProvider connectionProvider, String indexName
 
     @Override
     public boolean hasNext() {
-        // If aggrCommandResult is not null, we have initial results from FT.AGGREGATE that haven't been returned yet
-        // For subsequent batches, check if there are more cursor results available
-        // If cursor has been removed (cursorId <= 0), no more results are available
         return aggrCommandResult != null || cursorId > 0;
     }
 
@@ -111,6 +113,8 @@ public Long getCursorId() {
 
     @Override
     public void remove() {
+        aggrCommandResult = null;
+
         if (cursorId == null || cursorId <= 0) {
             // Cursor is already closed or not initialized, nothing to do
             return;

src/test/java/redis/clients/jedis/search/aggr/AggregateIteratorTest.java renamed to src/test/java/redis/clients/jedis/modules/search/AggregateIteratorTest.java

@@ -1,4 +1,4 @@
-package redis.clients.jedis.search.aggr;
+package redis.clients.jedis.modules.search;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -28,7 +28,7 @@
 import redis.clients.jedis.search.Document;
 import redis.clients.jedis.search.IndexOptions;
 import redis.clients.jedis.search.Schema;
-
+import redis.clients.jedis.search.aggr.*;
 
 @ParameterizedClass
 @MethodSource("redis.clients.jedis.commands.CommandsTestsParameters#respVersions")
@@ -190,7 +190,8 @@ public void testAggregateIteratorFirstBatchReturnsInitialResults() {
             assertEquals(10, rows.get(1).getLong("sum"));
 
             // Should be no more batches since we got all results in first batch
-            assertFalse(iterator.hasNext());
+            AggregationResult secondBatch = iterator.next();
+            assertEquals(0, secondBatch.getRows().size());
         }
     }
 
@@ -210,7 +211,7 @@ public void testAggregateIteratorEmptyResult() {
         // Test the iterator with empty results using the integrated method
         try (AggregateIterator iterator = client.ftAggregateIterator(index, aggr)) {
             // Should have no results
-            assertFalse(iterator.hasNext());
+            assertTrue(iterator.next().isEmpty());
         }
     }
 
@@ -269,11 +270,12 @@ public void testAggregateIteratorRemoveBeforeNext() {
         client.ftCreate(index, IndexOptions.defaultOptions(), sc);
 
         addDocument(new Document("data1").set("name", "abc").set("count", 10));
+        addDocument(new Document("data2").set("name", "cde").set("count", 8));
 
         // Create aggregation with cursor
         AggregationBuilder aggr = new AggregationBuilder()
             .groupBy("@name", Reducers.sum("@count").as("sum"))
-            .cursor(10, 10000);
+            .cursor(1, 10000);
 
         // Test calling remove() before next() - should work since cursor is initialized
         try (AggregateIterator iterator = client.ftAggregateIterator(index, aggr)) {
@@ -324,11 +326,12 @@ public void testAggregateIteratorRemoveMultipleTimes() {
         client.ftCreate(index, IndexOptions.defaultOptions(), sc);
 
         addDocument(new Document("data1").set("name", "abc").set("count", 10));
+        addDocument(new Document("data2").set("name", "cde").set("count", 3));
 
         // Create aggregation with cursor
         AggregationBuilder aggr = new AggregationBuilder()
             .groupBy("@name", Reducers.sum("@count").as("sum"))
-            .cursor(10, 10000);
+            .cursor(1, 10000);
 
         // Test calling remove() multiple times
         try (AggregateIterator iterator = client.ftAggregateIterator(index, aggr)) {
@@ -337,11 +340,11 @@ public void testAggregateIteratorRemoveMultipleTimes() {
             // First remove should work
             iterator.remove();
             assertFalse(iterator.hasNext());
-            assertEquals(Long.valueOf(-1), iterator.getCursorId());
+            assertEquals(-1L, iterator.getCursorId());
 
             // Second remove should not throw exception, just return silently
             iterator.remove(); // Should not throw
-            assertEquals(Long.valueOf(-1), iterator.getCursorId());
+            assertEquals(-1L, iterator.getCursorId());
         }
     }
 }