IGNITE-9235: Fixed GridMergeIndexSorted compare routine. This closes #4498.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/394d5ea7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/394d5ea7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/394d5ea7 Branch: refs/heads/ignite-9273 Commit: 394d5ea7d2713827a89da53b8a4acd03efae6344 Parents: 68374ad Author: AMedvedev <andrew.y.medvedev> Authored: Thu Aug 23 11:07:43 2018 +0300 Committer: devozerov <voze...@gridgain.com> Committed: Thu Aug 23 11:07:43 2018 +0300 ---------------------------------------------------------------------- .../processors/query/h2/twostep/GridMergeIndexSorted.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/394d5ea7/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java index 0dc8354..9f5547a 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexSorted.java @@ -61,7 +61,9 @@ public final class GridMergeIndexSorted extends GridMergeIndex { /** */ private final Comparator<RowStream> streamCmp = new Comparator<RowStream>() { @Override public int compare(RowStream o1, RowStream o2) { - // Nulls at the beginning. + if (o1 == o2) // both nulls + return 0; + if (o1 == null) return -1;
