hadoop-hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r756226 - in /hadoop/hive/trunk: ./ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ ql/src/java/org/apache/hadoop/hive/ql/parse/ ql/src/test/queries/clientnegative/ ql/src/test/results/clientnegative/
Date Thu, 19 Mar 2009 21:47:30 GMT
Author: namit
Date: Thu Mar 19 21:47:30 2009
New Revision: 756226

URL: http://svn.apache.org/viewvc?rev=756226&view=rev
Log:
HIVE-347. undo for Fix lot of partition scans in strict mode in case of error in 
partition specification error. (namit)


Removed:
    hadoop/hive/trunk/ql/src/test/queries/clientnegative/strict_pruning_2.q
    hadoop/hive/trunk/ql/src/test/results/clientnegative/strict_pruning_2.q.out
Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ErrorMsg.java

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=756226&r1=756225&r2=756226&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Thu Mar 19 21:47:30 2009
@@ -58,6 +58,9 @@
     HIVE-350. Fix wrong order of aggregations in explain plan.
     (namit)
 
+    HIVE-347. undo for Fix lot of partition scans in strict mode in case of error in 
+    partition specification error. (namit)
+
 Release 0.2.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java?rev=756226&r1=756225&r2=756226&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
(original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
Thu Mar 19 21:47:30 2009
@@ -185,19 +185,9 @@
         // pass both confirmed and unknown partitions through the map-reduce framework
         PartitionPruner.PrunedPartitionList partsList = pruner.prune();
 
-        // If all partitions are unknown, throw an error. 
-        if ((opProcCtx.getParseCtx().getConf().getVar(HiveConf.ConfVars.HIVEPARTITIONPRUNER).equalsIgnoreCase("strict"))
&&
-            (partsList.getConfirmedPartns().size() == 0) &&
-            (partsList.getUnknownPartns().size() != 0))
-          throw new SemanticException(ErrorMsg.INCORRECT_PARTITION_PREDICATE.getMsg(" for
Alias " + alias_id));
-
         parts = partsList.getConfirmedPartns();
         parts.addAll(partsList.getUnknownPartns());
-        
-      } catch (SemanticException e) {
-        throw e;
-      }
-      catch (HiveException e) {
+      } catch (HiveException e) {
         // Has to use full name to make sure it does not conflict with org.apache.commons.lang.StringUtils
         LOG.error(org.apache.hadoop.util.StringUtils.stringifyException(e));
         throw new SemanticException(e.getMessage(), e);

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ErrorMsg.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ErrorMsg.java?rev=756226&r1=756225&r2=756226&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ErrorMsg.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ErrorMsg.java Thu Mar 19
21:47:30 2009
@@ -60,7 +60,6 @@
   SAMPLE_RESTRICTION("Cannot Sample on More Than Two Columns"),
   SAMPLE_COLUMN_NOT_FOUND("Sample Column Not Found"),
   NO_PARTITION_PREDICATE("No Partition Predicate Found"),
-  INCORRECT_PARTITION_PREDICATE("Incorrect Partition Predicate Found, probably wrong type,"),
   INVALID_DOT(". operator is only supported on struct or list of struct types"),
   INVALID_TBL_DDL_SERDE("Either list of columns or a custom serializer should be specified"),
   TARGET_TABLE_COLUMN_MISMATCH("Cannot insert into target table because column number/types
are different"),
@@ -122,8 +121,4 @@
     return mesg;
   }
 
-  public String getMsg(String reason) {
-    return mesg + " " + reason;
-  }
-
 }



Mime
View raw message