hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r1448518 - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/ test/queries/clientnegative/ test/results/clientnegative/
Date Thu, 21 Feb 2013 06:06:33 GMT
Author: namit
Date: Thu Feb 21 06:06:32 2013
New Revision: 1448518

URL: http://svn.apache.org/r1448518
Log:
HIVE-3741 Driver.validateConfVariables() should perform more validations
(Gang Tim Liu via namit)


Added:
    hive/trunk/ql/src/test/queries/clientnegative/invalid_config2.q
    hive/trunk/ql/src/test/results/clientnegative/invalid_config2.q.out
Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
    hive/trunk/ql/src/test/results/clientnegative/invalid_config1.q.out

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java?rev=1448518&r1=1448517&r2=1448518&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java Thu Feb 21 06:06:32 2013
@@ -975,7 +975,8 @@ public class Driver implements CommandPr
     boolean valid = true;
     if ((!conf.getBoolVar(HiveConf.ConfVars.HIVE_HADOOP_SUPPORTS_SUBDIRECTORIES))
         && ((conf.getBoolVar(HiveConf.ConfVars.HADOOPMAPREDINPUTDIRRECURSIVE)) ||
(conf
-              .getBoolVar(HiveConf.ConfVars.HIVEOPTLISTBUCKETING)))) {
+              .getBoolVar(HiveConf.ConfVars.HIVEOPTLISTBUCKETING)) || ((conf
+                  .getBoolVar(HiveConf.ConfVars.HIVE_OPTIMIZE_UNION_REMOVE))))) {
       errorMessage = "FAILED: Hive Internal Error: "
           + ErrorMsg.SUPPORT_DIR_MUST_TRUE_FOR_LIST_BUCKETING.getMsg();
       SQLState = ErrorMsg.findSQLState(errorMessage);

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java?rev=1448518&r1=1448517&r2=1448518&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java Thu Feb 21 06:06:32 2013
@@ -256,7 +256,8 @@ public enum ErrorMsg {
       10199,
       "hive.mapred.supports.subdirectories must be true"
           + " if any one of following is true: "
-          + " hive.optimize.listbucketing and mapred.input.dir.recursive"),
+          + " hive.optimize.listbucketing , mapred.input.dir.recursive"
+          + " and hive.optimize.union.remove."),
   SKEWED_TABLE_NO_COLUMN_NAME(10200, "No skewed column name."),
   SKEWED_TABLE_NO_COLUMN_VALUE(10201, "No skewed values."),
   SKEWED_TABLE_DUPLICATE_COLUMN_NAMES(10202,

Added: hive/trunk/ql/src/test/queries/clientnegative/invalid_config2.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/invalid_config2.q?rev=1448518&view=auto
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/invalid_config2.q (added)
+++ hive/trunk/ql/src/test/queries/clientnegative/invalid_config2.q Thu Feb 21 06:06:32 2013
@@ -0,0 +1,4 @@
+set hive.mapred.supports.subdirectories=false;
+set hive.optimize.union.remove=true;
+
+select count(1) from src;

Modified: hive/trunk/ql/src/test/results/clientnegative/invalid_config1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/invalid_config1.q.out?rev=1448518&r1=1448517&r2=1448518&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/invalid_config1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/invalid_config1.q.out Thu Feb 21 06:06:32
2013
@@ -1,2 +1,2 @@
-FAILED: Hive Internal Error: hive.mapred.supports.subdirectories must be true if any one
of following is true:  hive.optimize.listbucketing and mapred.input.dir.recursive
+FAILED: Hive Internal Error: hive.mapred.supports.subdirectories must be true if any one
of following is true:  hive.optimize.listbucketing , mapred.input.dir.recursive and hive.optimize.union.remove.
 

Added: hive/trunk/ql/src/test/results/clientnegative/invalid_config2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/invalid_config2.q.out?rev=1448518&view=auto
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/invalid_config2.q.out (added)
+++ hive/trunk/ql/src/test/results/clientnegative/invalid_config2.q.out Thu Feb 21 06:06:32
2013
@@ -0,0 +1,2 @@
+FAILED: Hive Internal Error: hive.mapred.supports.subdirectories must be true if any one
of following is true:  hive.optimize.listbucketing , mapred.input.dir.recursive and hive.optimize.union.remove.
+



Mime
View raw message