Return-Path: X-Original-To: apmail-asterixdb-commits-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3DE7F1876B for ; Fri, 4 Mar 2016 01:42:42 +0000 (UTC) Received: (qmail 78561 invoked by uid 500); 4 Mar 2016 01:42:41 -0000 Delivered-To: apmail-asterixdb-commits-archive@asterixdb.apache.org Received: (qmail 78452 invoked by uid 500); 4 Mar 2016 01:42:41 -0000 Mailing-List: contact commits-help@asterixdb.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.incubator.apache.org Delivered-To: mailing list commits@asterixdb.incubator.apache.org Received: (qmail 78307 invoked by uid 99); 4 Mar 2016 01:42:41 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2016 01:42:41 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 07A311A066B for ; Fri, 4 Mar 2016 01:42:41 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id c2vYz_KGYXH6 for ; Fri, 4 Mar 2016 01:42:39 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 52A335F570 for ; Fri, 4 Mar 2016 01:42:39 +0000 (UTC) Received: (qmail 77597 invoked by uid 99); 4 Mar 2016 01:42:38 -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; Fri, 04 Mar 2016 01:42:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 88A69E7901; Fri, 4 Mar 2016 01:42:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: buyingyi@apache.org To: commits@asterixdb.incubator.apache.org Message-Id: <1de5a680574b4907b4bf365ffe60dcd2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-asterixdb-hyracks git commit: ASTERIXDB-1330: fix NPE in ExternalGroupByOperator. Date: Fri, 4 Mar 2016 01:42:38 +0000 (UTC) Repository: incubator-asterixdb-hyracks Updated Branches: refs/heads/master a672f4421 -> fb530551b ASTERIXDB-1330: fix NPE in ExternalGroupByOperator. Change-Id: I2279221abbef1440179a31df180a24f6a642c641 Reviewed-on: https://asterix-gerrit.ics.uci.edu/687 Tested-by: Jenkins Reviewed-by: Ian Maxon Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/commit/fb530551 Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/tree/fb530551 Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/diff/fb530551 Branch: refs/heads/master Commit: fb530551b5f5efd8d2dba350bf9958a40b4a63a7 Parents: a672f44 Author: Yingyi Bu Authored: Thu Mar 3 17:16:31 2016 -0800 Committer: Yingyi Bu Committed: Thu Mar 3 17:37:42 2016 -0800 ---------------------------------------------------------------------- .../group/external/ExternalGroupBuildOperatorNodePushable.java | 3 ++- .../group/external/ExternalGroupWriteOperatorNodePushable.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/fb530551/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupBuildOperatorNodePushable.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupBuildOperatorNodePushable.java b/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupBuildOperatorNodePushable.java index ba3853c..852a160 100644 --- a/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupBuildOperatorNodePushable.java +++ b/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupBuildOperatorNodePushable.java @@ -71,7 +71,8 @@ public class ExternalGroupBuildOperatorNodePushable extends AbstractUnaryInputSi for (int i = 0; i < comparatorFactories.length; ++i) { comparators[i] = comparatorFactories[i].createBinaryComparator(); } - this.firstNormalizerComputer = firstNormalizerFactory.createNormalizedKeyComputer(); + this.firstNormalizerComputer = firstNormalizerFactory == null ? null + : firstNormalizerFactory.createNormalizedKeyComputer(); this.spillableTableFactory = spillableTableFactory; this.inRecordDescriptor = inRecordDescriptor; this.outRecordDescriptor = outRecordDescriptor; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/fb530551/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupWriteOperatorNodePushable.java ---------------------------------------------------------------------- diff --git a/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupWriteOperatorNodePushable.java b/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupWriteOperatorNodePushable.java index a2922ae..0dbb063 100644 --- a/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupWriteOperatorNodePushable.java +++ b/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupWriteOperatorNodePushable.java @@ -64,7 +64,7 @@ public class ExternalGroupWriteOperatorNodePushable extends AbstractUnaryOutputS this.stateId = stateId; this.spillableTableFactory = spillableTableFactory; this.frameLimit = framesLimit; - this.nmkComputer = nmkFactory.createNormalizedKeyComputer(); + this.nmkComputer = nmkFactory == null ? null : nmkFactory.createNormalizedKeyComputer(); this.partialAggRecordDesc = partialAggRecordDesc; this.outRecordDesc = outRecordDesc;