You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2018/06/18 09:12:25 UTC
ignite git commit: IGNITE-8806: SQL: Fixed NPE in GridH2ProxyIndex
when underlying index doesn't support lookup batches. This closes #4193.
Repository: ignite
Updated Branches:
refs/heads/master e1963d1a2 -> fe336fc64
IGNITE-8806: SQL: Fixed NPE in GridH2ProxyIndex when underlying index doesn't support lookup batches. This closes #4193.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe336fc6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe336fc6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe336fc6
Branch: refs/heads/master
Commit: fe336fc647ba61b1bcbada789c0414bdfdb1c113
Parents: e1963d1
Author: devozerov <vo...@gridgain.com>
Authored: Mon Jun 18 12:12:16 2018 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Mon Jun 18 12:12:16 2018 +0300
----------------------------------------------------------------------
.../internal/processors/query/h2/opt/GridH2ProxyIndex.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe336fc6/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java
index 7c70ded..95a253b 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java
@@ -152,7 +152,9 @@ public class GridH2ProxyIndex extends BaseIndex {
/** {@inheritDoc} */
@Override public IndexLookupBatch createLookupBatch(TableFilter[] filters, int filter) {
- return new ProxyIndexLookupBatch(idx.createLookupBatch(filters, filter));
+ IndexLookupBatch batch = idx.createLookupBatch(filters, filter);
+
+ return batch != null ? new ProxyIndexLookupBatch(batch) : null;
}
/** {@inheritDoc} */