asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject incubator-asterixdb-hyracks git commit: ASTERIXDB-1330: fix NPE in ExternalGroupByOperator.
Date Fri, 04 Mar 2016 01:42:38 GMT
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 <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Ian Maxon <imaxon@apache.org>


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 <yingyi@couchbase.com>
Authored: Thu Mar 3 17:16:31 2016 -0800
Committer: Yingyi Bu <buyingyi@gmail.com>
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;


Mime
View raw message