You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by cw...@apache.org on 2012/08/21 01:24:49 UTC
svn commit: r1375313 - in /hive/trunk/hbase-handler/src/test:
queries/negative/ results/negative/ templates/
Author: cws
Date: Mon Aug 20 23:24:48 2012
New Revision: 1375313
URL: http://svn.apache.org/viewvc?rev=1375313&view=rev
Log:
HIVE-3242. Fix cascade_dbdrop.q when building hive on hadoop0.23 (Zhenxiao Luo via cws)
Added:
hive/trunk/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q
hive/trunk/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out
Modified:
hive/trunk/hbase-handler/src/test/queries/negative/cascade_dbdrop.q
hive/trunk/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
hive/trunk/hbase-handler/src/test/templates/TestHBaseCliDriver.vm
hive/trunk/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm
Modified: hive/trunk/hbase-handler/src/test/queries/negative/cascade_dbdrop.q
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/queries/negative/cascade_dbdrop.q?rev=1375313&r1=1375312&r2=1375313&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/queries/negative/cascade_dbdrop.q (original)
+++ hive/trunk/hbase-handler/src/test/queries/negative/cascade_dbdrop.q Mon Aug 20 23:24:48 2012
@@ -1,6 +1,16 @@
CREATE DATABASE hbaseDB;
+-- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+-- Hadoop 0.23 changes the behavior FsShell on Exit Codes
+-- In Hadoop 0.20
+-- Exit Code == 0 on success
+-- Exit code < 0 on any failure
+-- In Hadoop 0.23
+-- Exit Code == 0 on success
+-- Exit Code < 0 on syntax/usage error
+-- Exit Code > 0 operation failed
+
CREATE TABLE hbaseDB.hbase_table_0(key int, value string)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
Added: hive/trunk/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q?rev=1375313&view=auto
==============================================================================
--- hive/trunk/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q (added)
+++ hive/trunk/hbase-handler/src/test/queries/negative/cascade_dbdrop_hadoop20.q Mon Aug 20 23:24:48 2012
@@ -0,0 +1,29 @@
+
+CREATE DATABASE hbaseDB;
+
+-- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+-- Hadoop 0.23 changes the behavior FsShell on Exit Codes
+-- In Hadoop 0.20
+-- Exit Code == 0 on success
+-- Exit code < 0 on any failure
+-- In Hadoop 0.23
+-- Exit Code == 0 on success
+-- Exit Code < 0 on syntax/usage error
+-- Exit Code > 0 operation failed
+
+CREATE TABLE hbaseDB.hbase_table_0(key int, value string)
+STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
+WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
+TBLPROPERTIES ("hbase.table.name" = "hbase_table_0");
+
+dfs -ls ../build/ql/tmp/hbase/hbase_table_0;
+
+DROP DATABASE IF EXISTS hbaseDB CASCADE;
+
+dfs -ls ../build/ql/tmp/hbase/hbase_table_0;
+
+
+
+
+
+
Modified: hive/trunk/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out?rev=1375313&r1=1375312&r2=1375313&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out (original)
+++ hive/trunk/hbase-handler/src/test/results/negative/cascade_dbdrop.q.out Mon Aug 20 23:24:48 2012
@@ -2,12 +2,32 @@ PREHOOK: query: CREATE DATABASE hbaseDB
PREHOOK: type: CREATEDATABASE
POSTHOOK: query: CREATE DATABASE hbaseDB
POSTHOOK: type: CREATEDATABASE
-PREHOOK: query: CREATE TABLE hbaseDB.hbase_table_0(key int, value string)
+PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+-- Hadoop 0.23 changes the behavior FsShell on Exit Codes
+-- In Hadoop 0.20
+-- Exit Code == 0 on success
+-- Exit code < 0 on any failure
+-- In Hadoop 0.23
+-- Exit Code == 0 on success
+-- Exit Code < 0 on syntax/usage error
+-- Exit Code > 0 operation failed
+
+CREATE TABLE hbaseDB.hbase_table_0(key int, value string)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
TBLPROPERTIES ("hbase.table.name" = "hbase_table_0")
PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE hbaseDB.hbase_table_0(key int, value string)
+POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+-- Hadoop 0.23 changes the behavior FsShell on Exit Codes
+-- In Hadoop 0.20
+-- Exit Code == 0 on success
+-- Exit code < 0 on any failure
+-- In Hadoop 0.23
+-- Exit Code == 0 on success
+-- Exit Code < 0 on syntax/usage error
+-- Exit Code > 0 operation failed
+
+CREATE TABLE hbaseDB.hbase_table_0(key int, value string)
STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
TBLPROPERTIES ("hbase.table.name" = "hbase_table_0")
@@ -19,5 +39,5 @@ PREHOOK: query: DROP DATABASE IF EXISTS
PREHOOK: type: DROPDATABASE
POSTHOOK: query: DROP DATABASE IF EXISTS hbaseDB CASCADE
POSTHOOK: type: DROPDATABASE
-Command failed with exit code = -1
-Query returned non-zero code: -1, cause: null
+Command failed with exit code = 1
+Query returned non-zero code: 1, cause: null
Added: hive/trunk/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out?rev=1375313&view=auto
==============================================================================
--- hive/trunk/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out (added)
+++ hive/trunk/hbase-handler/src/test/results/negative/cascade_dbdrop_hadoop20.q.out Mon Aug 20 23:24:48 2012
@@ -0,0 +1,43 @@
+PREHOOK: query: CREATE DATABASE hbaseDB
+PREHOOK: type: CREATEDATABASE
+POSTHOOK: query: CREATE DATABASE hbaseDB
+POSTHOOK: type: CREATEDATABASE
+PREHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+-- Hadoop 0.23 changes the behavior FsShell on Exit Codes
+-- In Hadoop 0.20
+-- Exit Code == 0 on success
+-- Exit code < 0 on any failure
+-- In Hadoop 0.23
+-- Exit Code == 0 on success
+-- Exit Code < 0 on syntax/usage error
+-- Exit Code > 0 operation failed
+
+CREATE TABLE hbaseDB.hbase_table_0(key int, value string)
+STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
+WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
+TBLPROPERTIES ("hbase.table.name" = "hbase_table_0")
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 1.0)
+-- Hadoop 0.23 changes the behavior FsShell on Exit Codes
+-- In Hadoop 0.20
+-- Exit Code == 0 on success
+-- Exit code < 0 on any failure
+-- In Hadoop 0.23
+-- Exit Code == 0 on success
+-- Exit Code < 0 on syntax/usage error
+-- Exit Code > 0 operation failed
+
+CREATE TABLE hbaseDB.hbase_table_0(key int, value string)
+STORED BY 'org.apache.hadoop.hive.hbase.HBaseStorageHandler'
+WITH SERDEPROPERTIES ("hbase.columns.mapping" = ":key,cf:string")
+TBLPROPERTIES ("hbase.table.name" = "hbase_table_0")
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: hbaseDB@hbase_table_0
+Found 3 items
+#### A masked pattern was here ####
+PREHOOK: query: DROP DATABASE IF EXISTS hbaseDB CASCADE
+PREHOOK: type: DROPDATABASE
+POSTHOOK: query: DROP DATABASE IF EXISTS hbaseDB CASCADE
+POSTHOOK: type: DROPDATABASE
+Command failed with exit code = -1
+Query returned non-zero code: -1, cause: null
Modified: hive/trunk/hbase-handler/src/test/templates/TestHBaseCliDriver.vm
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/templates/TestHBaseCliDriver.vm?rev=1375313&r1=1375312&r2=1375313&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/templates/TestHBaseCliDriver.vm (original)
+++ hive/trunk/hbase-handler/src/test/templates/TestHBaseCliDriver.vm Mon Aug 20 23:24:48 2012
@@ -58,9 +58,6 @@ public class $className extends TestCase
}
qt = new HBaseQTestUtil("$resultsDir", "$logDir", miniMR, setup);
-#foreach ($qf in $qfiles)
- qt.addFile("$qfilesMap.get($qf.getName())");
-#end
} catch (Exception e) {
System.out.println("Exception: " + e.getMessage());
e.printStackTrace();
@@ -102,6 +99,14 @@ public class $className extends TestCase
long startTime = System.currentTimeMillis();
try {
System.out.println("Begin query: " + "$fname");
+
+ qt.addFile("$qf.getCanonicalPath()");
+
+ if (qt.shouldBeSkipped("$fname")) {
+ System.out.println("Test $fname skipped");
+ return;
+ }
+
qt.cliInit("$fname");
qt.clearTestSideEffects();
int ecode = qt.executeClient("$fname");
Modified: hive/trunk/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm?rev=1375313&r1=1375312&r2=1375313&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm (original)
+++ hive/trunk/hbase-handler/src/test/templates/TestHBaseNegativeCliDriver.vm Mon Aug 20 23:24:48 2012
@@ -42,9 +42,6 @@ public class $className extends TestCase
qt = new HBaseQTestUtil("$resultsDir", "$logDir", miniMR, setup);
-#foreach ($qf in $qfiles)
- qt.addFile("$qfilesMap.get($qf.getName())");
-#end
} catch (Exception e) {
System.out.println("Exception: " + e.getMessage());
e.printStackTrace();
@@ -86,6 +83,14 @@ public class $className extends TestCase
long startTime = System.currentTimeMillis();
try {
System.out.println("Begin query: " + "$fname");
+
+ qt.addFile("$qf.getCanonicalPath()");
+
+ if (qt.shouldBeSkipped("$fname")) {
+ System.out.println("Test $fname skipped");
+ return;
+ }
+
qt.cliInit("$fname");
qt.clearTestSideEffects();
int ecode = qt.executeClient("$fname");