This is an automated email from the ASF dual-hosted git repository.

timoninmaxim pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 15380a52c5c IGNITE-29191 Fix local IndexQuery ignoring setLimit() 
(#13735)
15380a52c5c is described below

commit 15380a52c5c69151e20b2c5ffefe063cc255cce2
Author: Reza Taroosheh <[email protected]>
AuthorDate: Sun Oct 25 19:48:30 2026 +0100

    IGNITE-29191 Fix local IndexQuery ignoring setLimit() (#13735)
---
 .../processors/cache/query/GridCacheQueryManager.java        |  7 +++++++
 .../org/apache/ignite/cache/query/IndexQueryLimitTest.java   | 12 ++++++++++++
 2 files changed, 19 insertions(+)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index bbfa9960908..f875972047c 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -1156,13 +1156,20 @@ public abstract class GridCacheQueryManager<K, V> 
extends GridCacheManagerAdapte
             GridCloseableIterator<IgniteBiTuple<K, V>> iter = idxQryRes.iter();
 
             return new GridCloseableIteratorAdapter() {
+                /** */
+                private int cnt;
+
                 @Override protected Object onNext() throws 
IgniteCheckedException {
                     IgniteBiTuple<K, V> entry = iter.nextX();
+                    cnt++;
 
                     return new CacheEntryImpl<>(entry.getKey(), 
entry.getValue());
                 }
 
                 @Override protected boolean onHasNext() throws 
IgniteCheckedException {
+                    if (qry.limit() > 0 && qry.limit() <= cnt)
+                        return false;
+
                     return iter.hasNextX();
                 }
             };
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryLimitTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryLimitTest.java
index 5c69e523356..aedc82927a7 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryLimitTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryLimitTest.java
@@ -108,6 +108,18 @@ public class IndexQueryLimitTest extends 
GridCommonAbstractTest {
         assertEquals(limit, qry.getLimit());
     }
 
+    /** */
+    @Test
+    public void testLocalQueryLimit() {
+        insertData(1);
+
+        IndexQuery<Long, Person> qry = new IndexQuery<Long, 
Person>(Person.class, IDX).setLimit(3);
+
+        qry.setLocal(true);
+
+        assertEquals(3, crd.cache(CACHE).query(qry).getAll().size());
+    }
+
     /** */
     private void checkRangeQueries(int duplicates) throws Exception {
         // Add data

Reply via email to