Repository: incubator-ignite Updated Branches: refs/heads/ignite-sprint-3 572d81bcf -> 9c8160bf7
ignite-718 - fix Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6a53351f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a53351f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a53351f Branch: refs/heads/ignite-sprint-3 Commit: 6a53351f9ddf2e185c9b1fa645ab4e4d4424f856 Parents: b30b14c Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Apr 10 16:18:35 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Apr 10 16:18:35 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/query/h2/twostep/GridMergeIndex.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a53351f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java index 65a2de9..5138013 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java @@ -51,6 +51,9 @@ public abstract class GridMergeIndex extends BaseIndex { */ private ArrayList<Row> fetched = new ArrayList<>(); + /** */ + private int fetchedCnt; + /** * @param tbl Table. * @param name Index name. @@ -164,7 +167,7 @@ public abstract class GridMergeIndex extends BaseIndex { * @return {@code true} If we have fetched all the remote rows. */ public boolean fetchedAll() { - return fetched.size() == rowsCnt.get(); + return fetchedCnt == rowsCnt.get(); } /** @@ -308,6 +311,8 @@ public abstract class GridMergeIndex extends BaseIndex { fetched.add(cur); } + fetchedCnt++; + return true; }
