ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [13/50] ignite git commit: Done.
Date Mon, 14 Aug 2017 10:30:23 GMT
Done.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d465d11c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d465d11c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d465d11c

Branch: refs/heads/ignite-5991-6019
Commit: d465d11ce0efbe35a58e3e78e2cb5895b9b80444
Parents: f7afc0d
Author: devozerov <vozerov@gridgain.com>
Authored: Thu Aug 10 17:04:08 2017 +0300
Committer: devozerov <vozerov@gridgain.com>
Committed: Thu Aug 10 17:04:08 2017 +0300

----------------------------------------------------------------------
 .../internal/processors/query/h2/twostep/GridMergeIndex.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d465d11c/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 86601cd..e19d29b 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
@@ -46,7 +46,6 @@ import org.h2.index.IndexType;
 import org.h2.message.DbException;
 import org.h2.result.Row;
 import org.h2.result.SearchRow;
-import org.h2.table.Column;
 import org.h2.table.IndexColumn;
 import org.h2.value.Value;
 import org.jetbrains.annotations.Nullable;
@@ -329,7 +328,7 @@ public abstract class GridMergeIndex extends BaseIndex {
     private void markLastPage(GridResultPage page) {
         GridQueryNextPageResponse res = page.response();
 
-        if (res.allRows() != -2) { // -2 means the last page.
+        if (res.allRows() != -2 && !res.last()) { // -2 means the last page.
             UUID nodeId = page.source();
 
             initLastPages(nodeId, res);


Mime
View raw message