You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/06/11 19:04:10 UTC

svn commit: r1491878 - in /hive/trunk/ql/src/test: queries/clientpositive/truncate_column.q queries/clientpositive/truncate_column_merge.q results/clientpositive/truncate_column.q.out results/clientpositive/truncate_column_merge.q.out

Author: hashutosh
Date: Tue Jun 11 17:04:09 2013
New Revision: 1491878

URL: http://svn.apache.org/r1491878
Log:
HIVE-4712 : Fix TestCliDriver.truncate_* on 0.23 (Brock Noland via Ashutosh Chauhan)

Modified:
    hive/trunk/ql/src/test/queries/clientpositive/truncate_column.q
    hive/trunk/ql/src/test/queries/clientpositive/truncate_column_merge.q
    hive/trunk/ql/src/test/results/clientpositive/truncate_column.q.out
    hive/trunk/ql/src/test/results/clientpositive/truncate_column_merge.q.out

Modified: hive/trunk/ql/src/test/queries/clientpositive/truncate_column.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/truncate_column.q?rev=1491878&r1=1491877&r2=1491878&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/truncate_column.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/truncate_column.q Tue Jun 11 17:04:09 2013
@@ -9,7 +9,7 @@ INSERT OVERWRITE TABLE test_tab SELECT *
 
 DESC FORMATTED test_tab;
 
-SELECT * FROM test_tab;
+SELECT * FROM test_tab ORDER BY value;
 
 -- Truncate 1 column
 TRUNCATE TABLE test_tab COLUMNS (key);
@@ -17,7 +17,7 @@ TRUNCATE TABLE test_tab COLUMNS (key);
 DESC FORMATTED test_tab;
 
 -- First column should be null
-SELECT * FROM test_tab;
+SELECT * FROM test_tab ORDER BY value;
 
 -- Truncate multiple columns
 INSERT OVERWRITE TABLE test_tab SELECT * FROM src LIMIT 10;
@@ -27,7 +27,7 @@ TRUNCATE TABLE test_tab COLUMNS (key, va
 DESC FORMATTED test_tab;
 
 -- Both columns should be null
-SELECT * FROM test_tab;
+SELECT * FROM test_tab ORDER BY value;
 
 -- Truncate columns again
 TRUNCATE TABLE test_tab COLUMNS (key, value);
@@ -35,7 +35,7 @@ TRUNCATE TABLE test_tab COLUMNS (key, va
 DESC FORMATTED test_tab;
 
 -- Both columns should be null
-SELECT * FROM test_tab;
+SELECT * FROM test_tab ORDER BY value;
 
 -- Test truncating with a binary serde
 ALTER TABLE test_tab SET SERDE 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe';
@@ -44,7 +44,7 @@ INSERT OVERWRITE TABLE test_tab SELECT *
 
 DESC FORMATTED test_tab;
 
-SELECT * FROM test_tab;
+SELECT * FROM test_tab ORDER BY value;
 
 -- Truncate 1 column
 TRUNCATE TABLE test_tab COLUMNS (key);
@@ -52,7 +52,7 @@ TRUNCATE TABLE test_tab COLUMNS (key);
 DESC FORMATTED test_tab;
 
 -- First column should be null
-SELECT * FROM test_tab;
+SELECT * FROM test_tab ORDER BY value;
 
 -- Truncate 2 columns
 TRUNCATE TABLE test_tab COLUMNS (key, value);
@@ -60,7 +60,7 @@ TRUNCATE TABLE test_tab COLUMNS (key, va
 DESC FORMATTED test_tab;
 
 -- Both columns should be null
-SELECT * FROM test_tab;
+SELECT * FROM test_tab ORDER BY value;
 
 -- Test truncating a partition
 CREATE TABLE test_tab_part (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE;
@@ -69,11 +69,11 @@ INSERT OVERWRITE TABLE test_tab_part PAR
 
 DESC FORMATTED test_tab_part PARTITION (part = '1');
 
-SELECT * FROM test_tab_part WHERE part = '1';
+SELECT * FROM test_tab_part WHERE part = '1' ORDER BY value;
 
 TRUNCATE TABLE test_tab_part PARTITION (part = '1') COLUMNS (key);
 
 DESC FORMATTED test_tab_part PARTITION (part = '1');
 
 -- First column should be null
-SELECT * FROM test_tab_part WHERE part = '1';
+SELECT * FROM test_tab_part WHERE part = '1' ORDER BY value;

Modified: hive/trunk/ql/src/test/queries/clientpositive/truncate_column_merge.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/truncate_column_merge.q?rev=1491878&r1=1491877&r2=1491878&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/truncate_column_merge.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/truncate_column_merge.q Tue Jun 11 17:04:09 2013
@@ -14,7 +14,7 @@ TRUNCATE TABLE test_tab COLUMNS (key);
 ALTER TABLE test_tab CONCATENATE;
 
 -- The first column (key) should be null for all 10 rows
-SELECT * FROM test_tab;
+SELECT * FROM test_tab ORDER BY value;
 
 -- The value should be 1 indicating the table has 1 file
 SELECT COUNT(DISTINCT INPUT__FILE__NAME) FROM test_tab;

Modified: hive/trunk/ql/src/test/results/clientpositive/truncate_column.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/truncate_column.q.out?rev=1491878&r1=1491877&r2=1491878&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/truncate_column.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/truncate_column.q.out Tue Jun 11 17:04:09 2013
@@ -55,26 +55,26 @@ Bucket Columns:     	[]                 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: SELECT * FROM test_tab
+PREHOOK: query: SELECT * FROM test_tab ORDER BY value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_tab
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM test_tab
+POSTHOOK: query: SELECT * FROM test_tab ORDER BY value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab
 #### A masked pattern was here ####
 POSTHOOK: Lineage: test_tab.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-238	val_238
-86	val_86
-311	val_311
-27	val_27
 165	val_165
-409	val_409
+238	val_238
 255	val_255
+27	val_27
 278	val_278
-98	val_98
+311	val_311
+409	val_409
 484	val_484
+86	val_86
+98	val_98
 PREHOOK: query: -- Truncate 1 column
 TRUNCATE TABLE test_tab COLUMNS (key)
 PREHOOK: type: TRUNCATETABLE
@@ -124,27 +124,27 @@ Sort Columns:       	[]                 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: -- First column should be null
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_tab
 #### A masked pattern was here ####
 POSTHOOK: query: -- First column should be null
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab
 #### A masked pattern was here ####
 POSTHOOK: Lineage: test_tab.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-NULL	val_238
-NULL	val_86
-NULL	val_311
-NULL	val_27
 NULL	val_165
-NULL	val_409
+NULL	val_238
 NULL	val_255
+NULL	val_27
 NULL	val_278
-NULL	val_98
+NULL	val_311
+NULL	val_409
 NULL	val_484
+NULL	val_86
+NULL	val_98
 PREHOOK: query: -- Truncate multiple columns
 INSERT OVERWRITE TABLE test_tab SELECT * FROM src LIMIT 10
 PREHOOK: type: QUERY
@@ -210,12 +210,12 @@ Sort Columns:       	[]                 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: -- Both columns should be null
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_tab
 #### A masked pattern was here ####
 POSTHOOK: query: -- Both columns should be null
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab
 #### A masked pattern was here ####
@@ -286,12 +286,12 @@ Sort Columns:       	[]                 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: -- Both columns should be null
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_tab
 #### A masked pattern was here ####
 POSTHOOK: query: -- Both columns should be null
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab
 #### A masked pattern was here ####
@@ -378,11 +378,11 @@ Bucket Columns:     	[]                 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: SELECT * FROM test_tab
+PREHOOK: query: SELECT * FROM test_tab ORDER BY value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_tab
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM test_tab
+POSTHOOK: query: SELECT * FROM test_tab ORDER BY value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab
 #### A masked pattern was here ####
@@ -392,16 +392,16 @@ POSTHOOK: Lineage: test_tab.key SIMPLE [
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-238	val_238
-86	val_86
-311	val_311
-27	val_27
 165	val_165
-409	val_409
+238	val_238
 255	val_255
+27	val_27
 278	val_278
-98	val_98
+311	val_311
+409	val_409
 484	val_484
+86	val_86
+98	val_98
 PREHOOK: query: -- Truncate 1 column
 TRUNCATE TABLE test_tab COLUMNS (key)
 PREHOOK: type: TRUNCATETABLE
@@ -460,12 +460,12 @@ Sort Columns:       	[]                 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: -- First column should be null
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_tab
 #### A masked pattern was here ####
 POSTHOOK: query: -- First column should be null
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab
 #### A masked pattern was here ####
@@ -475,16 +475,16 @@ POSTHOOK: Lineage: test_tab.key SIMPLE [
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-NULL	val_238
-NULL	val_86
-NULL	val_311
-NULL	val_27
 NULL	val_165
-NULL	val_409
+NULL	val_238
 NULL	val_255
+NULL	val_27
 NULL	val_278
-NULL	val_98
+NULL	val_311
+NULL	val_409
 NULL	val_484
+NULL	val_86
+NULL	val_98
 PREHOOK: query: -- Truncate 2 columns
 TRUNCATE TABLE test_tab COLUMNS (key, value)
 PREHOOK: type: TRUNCATETABLE
@@ -543,12 +543,12 @@ Sort Columns:       	[]                 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: -- Both columns should be null
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_tab
 #### A masked pattern was here ####
 POSTHOOK: query: -- Both columns should be null
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab
 #### A masked pattern was here ####
@@ -643,12 +643,12 @@ Bucket Columns:     	[]                 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
-PREHOOK: query: SELECT * FROM test_tab_part WHERE part = '1'
+PREHOOK: query: SELECT * FROM test_tab_part WHERE part = '1' ORDER BY value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_tab_part
 PREHOOK: Input: default@test_tab_part@part=1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM test_tab_part WHERE part = '1'
+POSTHOOK: query: SELECT * FROM test_tab_part WHERE part = '1' ORDER BY value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab_part
 POSTHOOK: Input: default@test_tab_part@part=1
@@ -661,16 +661,16 @@ POSTHOOK: Lineage: test_tab.value SIMPLE
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab_part PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab_part PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-238	val_238	1
-86	val_86	1
-311	val_311	1
-27	val_27	1
 165	val_165	1
-409	val_409	1
+238	val_238	1
 255	val_255	1
+27	val_27	1
 278	val_278	1
-98	val_98	1
+311	val_311	1
+409	val_409	1
 484	val_484	1
+86	val_86	1
+98	val_98	1
 PREHOOK: query: TRUNCATE TABLE test_tab_part PARTITION (part = '1') COLUMNS (key)
 PREHOOK: type: TRUNCATETABLE
 PREHOOK: Input: default@test_tab_part
@@ -734,13 +734,13 @@ Sort Columns:       	[]                 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: -- First column should be null
-SELECT * FROM test_tab_part WHERE part = '1'
+SELECT * FROM test_tab_part WHERE part = '1' ORDER BY value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_tab_part
 PREHOOK: Input: default@test_tab_part@part=1
 #### A masked pattern was here ####
 POSTHOOK: query: -- First column should be null
-SELECT * FROM test_tab_part WHERE part = '1'
+SELECT * FROM test_tab_part WHERE part = '1' ORDER BY value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab_part
 POSTHOOK: Input: default@test_tab_part@part=1
@@ -753,13 +753,13 @@ POSTHOOK: Lineage: test_tab.value SIMPLE
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab_part PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab_part PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-NULL	val_238	1
-NULL	val_86	1
-NULL	val_311	1
-NULL	val_27	1
 NULL	val_165	1
-NULL	val_409	1
+NULL	val_238	1
 NULL	val_255	1
+NULL	val_27	1
 NULL	val_278	1
-NULL	val_98	1
+NULL	val_311	1
+NULL	val_409	1
 NULL	val_484	1
+NULL	val_86	1
+NULL	val_98	1

Modified: hive/trunk/ql/src/test/results/clientpositive/truncate_column_merge.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/truncate_column_merge.q.out?rev=1491878&r1=1491877&r2=1491878&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/truncate_column_merge.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/truncate_column_merge.q.out Tue Jun 11 17:04:09 2013
@@ -69,12 +69,12 @@ POSTHOOK: Lineage: test_tab.key SIMPLE [
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: -- The first column (key) should be null for all 10 rows
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_tab
 #### A masked pattern was here ####
 POSTHOOK: query: -- The first column (key) should be null for all 10 rows
-SELECT * FROM test_tab
+SELECT * FROM test_tab ORDER BY value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab
 #### A masked pattern was here ####
@@ -82,16 +82,16 @@ POSTHOOK: Lineage: test_tab.key SIMPLE [
 POSTHOOK: Lineage: test_tab.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
-NULL	val_238
-NULL	val_86
-NULL	val_311
-NULL	val_27
+NULL	val_165
 NULL	val_165
 NULL	val_238
-NULL	val_86
-NULL	val_311
+NULL	val_238
 NULL	val_27
-NULL	val_165
+NULL	val_27
+NULL	val_311
+NULL	val_311
+NULL	val_86
+NULL	val_86
 PREHOOK: query: -- The value should be 1 indicating the table has 1 file
 SELECT COUNT(DISTINCT INPUT__FILE__NAME) FROM test_tab
 PREHOOK: type: QUERY