diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnOutputMapping.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnOutputMapping.java index 7940b12783..0a2bb25bfd 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnOutputMapping.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnOutputMapping.java @@ -47,6 +47,10 @@ public boolean containsOutputColumn(int outputColumn) { @Override public void finalize() { + if (vectorColumnMapping == null) { + return; + } + Mapping mapping = vectorColumnMapping.getMapping(); // Ordered columns are the output columns. @@ -58,4 +62,4 @@ public void finalize() { vectorColumnMapping = null; } -} \ No newline at end of file +} diff --git ql/src/java/org/apache/hadoop/hive/ql/plan/AbstractOperatorDesc.java ql/src/java/org/apache/hadoop/hive/ql/plan/AbstractOperatorDesc.java index e04a783892..65a107e724 100644 --- ql/src/java/org/apache/hadoop/hive/ql/plan/AbstractOperatorDesc.java +++ ql/src/java/org/apache/hadoop/hive/ql/plan/AbstractOperatorDesc.java @@ -54,6 +54,9 @@ public Statistics getStatistics() { @Explain(skipHeader = true, displayName = "Statistics", explainLevels = { Level.USER }) public String getUserLevelStatistics() { + if (statistics == null) { + return null; + } return statistics.toUserLevelExplainString(); } @@ -143,6 +146,9 @@ public boolean isSame(OperatorDesc other) { @Explain(displayName = "columnExprMap", jsonOnly = true) public Map getColumnExprMapForExplain() { + if (this.colExprMap == null) { + return null; + } Map colExprMapForExplain = new HashMap<>(); for(String col:this.colExprMap.keySet()) { colExprMapForExplain.put(col, this.colExprMap.get(col).getExprString());