| commit | fb530551b5f5efd8d2dba350bf9958a40b4a63a7 | [log] [tgz] |
|---|---|---|
| author | Yingyi Bu <yingyi@couchbase.com> | Thu Mar 03 17:16:31 2016 -0800 |
| committer | Yingyi Bu <buyingyi@gmail.com> | Thu Mar 03 17:37:42 2016 -0800 |
| tree | 7519bb738cbd3320b1bac7252f33236bf40c7e09 | |
| parent | a672f4421761f27b8b9f3974855c40bc70e76a52 [diff] |
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>
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 @@ 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;
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 @@ 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;