diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java index 987ecc2..01c1d30 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java @@ -104,7 +104,8 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, tsop.setStatistics(stats.clone()); if (LOG.isDebugEnabled()) { - LOG.debug("[0] STATS-" + tsop.toString() + ": " + stats.extendedToString()); + LOG.debug("[0] STATS-" + tsop.toString() + " (" + table.getTableName() + + "): " + stats.extendedToString()); } } catch (CloneNotSupportedException e) { throw new SemanticException(ErrorMsg.STATISTICS_CLONING_FAILED.getMsg()); @@ -1092,7 +1093,9 @@ private void updateJoinColumnsNDV(Map> joinKeys, String key = entry.getValue().get(joinColIdx); key = StatsUtils.stripPrefixFromColumnName(key); ColStatistics cs = joinedColStats.get(key); - cs.setCountDistint(minNDV); + if (cs != null) { + cs.setCountDistint(minNDV); + } } }