You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2014/10/24 01:05:54 UTC

svn commit: r1633978 - /hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java

Author: prasanthj
Date: Thu Oct 23 23:05:53 2014
New Revision: 1633978

URL: http://svn.apache.org/r1633978
Log:
HIVE-8576: Guaranteed NPE in StatsRulesProcFactory (Lars Francke via Prasanth J)

Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java?rev=1633978&r1=1633977&r2=1633978&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java Thu Oct 23 23:05:53 2014
@@ -1394,7 +1394,7 @@ public class StatsRulesProcFactory {
      */
     private List<Integer> getPrimaryKeyCandidates(List<Operator<? extends OperatorDesc>> ops) {
       List<Integer> result = Lists.newArrayList();
-      if (ops != null || !ops.isEmpty()) {
+      if (ops != null && !ops.isEmpty()) {
         for (int i = 0; i < ops.size(); i++) {
           Operator<? extends OperatorDesc> op = ops.get(i);
           if (op instanceof ReduceSinkOperator) {