Yingyi Bu has submitted this change and it was merged. Change subject: ASTERIXDB-1330: fix NPE in ExternalGroupByOperator. ......................................................................
ASTERIXDB-1330: fix NPE in ExternalGroupByOperator. Change-Id: I2279221abbef1440179a31df180a24f6a642c641 Reviewed-on: https://asterix-gerrit.ics.uci.edu/687 Tested-by: Jenkins <[email protected]> Reviewed-by: Ian Maxon <[email protected]> --- M hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupBuildOperatorNodePushable.java M hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/group/external/ExternalGroupWriteOperatorNodePushable.java 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Ian Maxon: Looks good to me, approved Jenkins: Verified 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; -- To view, visit https://asterix-gerrit.ics.uci.edu/687 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2279221abbef1440179a31df180a24f6a642c641 Gerrit-PatchSet: 2 Gerrit-Project: hyracks Gerrit-Branch: master Gerrit-Owner: Yingyi Bu <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Jianfeng Jia <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-Reviewer: Yingyi Bu <[email protected]>
