From commits-return-119777-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Thu Aug 23 10:07:53 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id ADCD918061A for ; Thu, 23 Aug 2018 10:07:52 +0200 (CEST) Received: (qmail 51248 invoked by uid 500); 23 Aug 2018 08:07:51 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 51239 invoked by uid 99); 23 Aug 2018 08:07:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Aug 2018 08:07:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B04A4DFB32; Thu, 23 Aug 2018 08:07:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-9235: Fixed GridMergeIndexSorted compare routine. This closes #4498. Date: Thu, 23 Aug 2018 08:07:51 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/master 68374ad52 -> 394d5ea7d 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/master Commit: 394d5ea7d2713827a89da53b8a4acd03efae6344 Parents: 68374ad Author: AMedvedev Authored: Thu Aug 23 11:07:43 2018 +0300 Committer: devozerov 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 streamCmp = new Comparator() { @Override public int compare(RowStream o1, RowStream o2) { - // Nulls at the beginning. + if (o1 == o2) // both nulls + return 0; + if (o1 == null) return -1;