You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2012/09/20 06:13:31 UTC

svn commit: r1387855 - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/parse/ test/queries/clientpositive/ test/results/clientpositive/

Author: namit
Date: Thu Sep 20 04:13:31 2012
New Revision: 1387855

URL: http://svn.apache.org/viewvc?rev=1387855&view=rev
Log:
HIVE-3485 Skewed DDL doesn't support skewed value with string quote
(Gang Tim Liu via namit)


Added:
    hive/trunk/ql/src/test/queries/clientpositive/create_skewed_table1.q
      - copied, changed from r1387849, hive/trunk/ql/src/test/queries/clientpositive/create_skewed_table.q
    hive/trunk/ql/src/test/results/clientpositive/create_skewed_table1.q.out
      - copied, changed from r1387849, hive/trunk/ql/src/test/results/clientpositive/create_skewed_table.q.out
Removed:
    hive/trunk/ql/src/test/queries/clientpositive/create_skewed_table.q
    hive/trunk/ql/src/test/results/clientpositive/create_skewed_table.q.out
Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1387855&r1=1387854&r2=1387855&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Thu Sep 20 04:13:31 2012
@@ -8222,7 +8222,7 @@ public class SemanticAnalyzer extends Ba
     int numCh = ast.getChildCount();
     for (int i = 0; i < numCh; i++) {
       ASTNode child = (ASTNode) ast.getChild(i);
-      colList.add(unescapeIdentifier(child.getText()).toLowerCase());
+      colList.add(stripQuotes(child.getText()).toLowerCase());
     }
     return colList;
   }

Copied: hive/trunk/ql/src/test/queries/clientpositive/create_skewed_table1.q (from r1387849, hive/trunk/ql/src/test/queries/clientpositive/create_skewed_table.q)
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/create_skewed_table1.q?p2=hive/trunk/ql/src/test/queries/clientpositive/create_skewed_table1.q&p1=hive/trunk/ql/src/test/queries/clientpositive/create_skewed_table.q&r1=1387849&r2=1387855&rev=1387855&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/create_skewed_table.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/create_skewed_table1.q Thu Sep 20 04:13:31 2012
@@ -1,5 +1,5 @@
 set hive.internal.ddl.list.bucketing.enable=true;
-CREATE TABLE list_bucket_single (key STRING, value STRING) SKEWED BY (key) ON (1,5,6);
+CREATE TABLE list_bucket_single (key STRING, value STRING) SKEWED BY (key) ON ('1','5','6');
 CREATE TABLE list_bucket_single_2 (key STRING, value STRING) SKEWED BY (key) ON ((1),(5),(6));
 CREATE TABLE list_bucket_multiple (col1 STRING, col2 int, col3 STRING) SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78));
 describe formatted list_bucket_single_2;

Copied: hive/trunk/ql/src/test/results/clientpositive/create_skewed_table1.q.out (from r1387849, hive/trunk/ql/src/test/results/clientpositive/create_skewed_table.q.out)
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/create_skewed_table1.q.out?p2=hive/trunk/ql/src/test/results/clientpositive/create_skewed_table1.q.out&p1=hive/trunk/ql/src/test/results/clientpositive/create_skewed_table.q.out&r1=1387849&r2=1387855&rev=1387855&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/create_skewed_table.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/create_skewed_table1.q.out Thu Sep 20 04:13:31 2012
@@ -1,6 +1,6 @@
-PREHOOK: query: CREATE TABLE list_bucket_single (key STRING, value STRING) SKEWED BY (key) ON (1,5,6)
+PREHOOK: query: CREATE TABLE list_bucket_single (key STRING, value STRING) SKEWED BY (key) ON ('1','5','6')
 PREHOOK: type: CREATETABLE
-POSTHOOK: query: CREATE TABLE list_bucket_single (key STRING, value STRING) SKEWED BY (key) ON (1,5,6)
+POSTHOOK: query: CREATE TABLE list_bucket_single (key STRING, value STRING) SKEWED BY (key) ON ('1','5','6')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@list_bucket_single
 PREHOOK: query: CREATE TABLE list_bucket_single_2 (key STRING, value STRING) SKEWED BY (key) ON ((1),(5),(6))
@@ -104,7 +104,7 @@ Num Buckets:        	-1                 
 Bucket Columns:     	[]                  	 
 Sort Columns:       	[]                  	 
 Skewed Columns:     	[col1, col2]        	 
-Skewed Values:      	[['s1', 1], ['s3', 3], ['s13', 13], ['s78', 78]]	 
+Skewed Values:      	[[s1, 1], [s3, 3], [s13, 13], [s78, 78]]	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: drop table list_bucket_single