Fix queries with binary marshaller.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de6e52ba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de6e52ba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de6e52ba Branch: refs/heads/master Commit: de6e52ba54ce58f0dadad16de8aae14b55ab8478 Parents: f4d36cb Author: Andrey V. Mashenkov <[email protected]> Authored: Tue Feb 21 16:27:08 2017 +0300 Committer: Andrey V. Mashenkov <[email protected]> Committed: Tue Feb 21 16:27:08 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/query/h2/opt/GridH2TreeIndex.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/de6e52ba/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java index 07c3e6d..80597f2 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java @@ -439,7 +439,11 @@ public class GridH2TreeIndex extends GridH2IndexBase implements Comparator<GridS assert ctx != null; - Object o = ctx.toCacheKeyObject(row.getValue(KEY_COL)); + final Value keyColValue = row.getValue(KEY_COL); + + assert keyColValue != null; + + final Object o = keyColValue.getObject(); if (o instanceof CacheObject) key = (CacheObject)o;
