HIVE-16922: Typo in serde.thrift: COLLECTION_DELIM = "colelction.deli…

…m" (Bing Li reviewed by Ashutosh and Rui)
apache · Jul 18, 2017 · c59a8c6 · c59a8c6
1 parent e708103
commit c59a8c6
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 19 deletions.
diff --git a/hcatalog/src/test/e2e/hcatalog/tests/hcat.conf b/hcatalog/src/test/e2e/hcatalog/tests/hcat.conf
@@ -122,7 +122,7 @@ describe extended hcat_createtable_6;
 #,
 				,'rc'   => 0
                                 ,'expected_out_regex' =>
-                                'a(\s)+int(\s)+None(\s)+\nb(\s)+array<int>(\s)+None(\s)+\nc(\s)+map<string,string>(\s)+None(\s)+\n(.*(\s))*.*parameters:.*colelction.delim=,, mapkey.delim=:, serialization.format=|, line.delim=\n, field.delim=^'
+                                'a(\s)+int(\s)+None(\s)+\nb(\s)+array<int>(\s)+None(\s)+\nc(\s)+map<string,string>(\s)+None(\s)+\n(.*(\s))*.*parameters:.*collection.delim=,, mapkey.delim=:, serialization.format=|, line.delim=\n, field.delim=^'
                                 ,'expected_err_regex' => 'OK(.*)OK(.*)OK'
 				}, 
 

diff --git a/metastore/scripts/upgrade/derby/043-HIVE-16922.derby.sql b/metastore/scripts/upgrade/derby/043-HIVE-16922.derby.sql
@@ -0,0 +1,3 @@
+UPDATE SERDE_PARAMS
+SET PARAM_KEY='collection.delim'
+WHERE PARAM_KEY='colelction.delim';
diff --git a/metastore/scripts/upgrade/derby/upgrade-2.3.0-to-3.0.0.derby.sql b/metastore/scripts/upgrade/derby/upgrade-2.3.0-to-3.0.0.derby.sql
@@ -1,5 +1,6 @@
 -- Upgrade MetaStore schema from 2.3.0 to 3.0.0
 RUN '041-HIVE-16556.derby.sql';
 RUN '042-HIVE-16575.derby.sql';
+RUN '043-HIVE-16922.derby.sql';
 
 UPDATE "APP".VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1;
diff --git a/metastore/scripts/upgrade/mssql/028-HIVE-16922.mssql.sql b/metastore/scripts/upgrade/mssql/028-HIVE-16922.mssql.sql
@@ -0,0 +1,3 @@
+UPDATE SERDE_PARAMS
+SET PARAM_KEY='collection.delim'
+WHERE PARAM_KEY='colelction.delim';
diff --git a/metastore/scripts/upgrade/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql b/metastore/scripts/upgrade/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql
@@ -2,6 +2,7 @@ SELECT 'Upgrading MetaStore schema from 2.3.0 to 3.0.0' AS MESSAGE;
 
 :r 026-HIVE-16556.mssql.sql
 :r 027-HIVE-16575.mssql.sql
+:r 028-HIVE-16922.mssql.sql
 
 UPDATE VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1;
 SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0' AS MESSAGE;
diff --git a/metastore/scripts/upgrade/mysql/043-HIVE-16922.mysql.sql b/metastore/scripts/upgrade/mysql/043-HIVE-16922.mysql.sql
@@ -0,0 +1,3 @@
+UPDATE SERDE_PARAMS
+SET PARAM_KEY='collection.delim'
+WHERE PARAM_KEY='colelction.delim';
diff --git a/metastore/scripts/upgrade/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql b/metastore/scripts/upgrade/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql
@@ -2,6 +2,7 @@ SELECT 'Upgrading MetaStore schema from 2.3.0 to 3.0.0' AS ' ';
 
 SOURCE 041-HIVE-16556.mysql.sql;
 SOURCE 042-HIVE-16575.mysql.sql;
+SOURCE 043-HIVE-16922.mysql.sql;
 
 UPDATE VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1;
 SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0' AS ' ';

diff --git a/metastore/scripts/upgrade/oracle/043-HIVE-16922.oracle.sql b/metastore/scripts/upgrade/oracle/043-HIVE-16922.oracle.sql
@@ -0,0 +1,3 @@
+UPDATE SERDE_PARAMS
+SET PARAM_KEY='collection.delim'
+WHERE PARAM_KEY='colelction.delim';
diff --git a/metastore/scripts/upgrade/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql b/metastore/scripts/upgrade/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql
@@ -2,6 +2,7 @@ SELECT 'Upgrading MetaStore schema from 2.3.0 to 3.0.0' AS Status from dual;
 
 @041-HIVE-16556.oracle.sql;
 @042-HIVE-16575.oracle.sql;
+@043-HIVE-16922.oracle.sql;
 
 UPDATE VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1;
 SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0' AS Status from dual;
diff --git a/metastore/scripts/upgrade/postgres/042-HIVE-16922.postgres.sql b/metastore/scripts/upgrade/postgres/042-HIVE-16922.postgres.sql
@@ -0,0 +1,3 @@
+UPDATE SERDE_PARAMS
+SET PARAM_KEY='collection.delim'
+WHERE PARAM_KEY='colelction.delim';
diff --git a/metastore/scripts/upgrade/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql b/metastore/scripts/upgrade/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql
@@ -2,6 +2,7 @@ SELECT 'Upgrading MetaStore schema from 2.3.0 to 3.0.0';
 
 \i 040-HIVE-16556.postgres.sql;
 \i 041-HIVE-16575.postgres.sql;
+\i 042-HIVE-16922.postgres.sql;
 
 UPDATE "VERSION" SET "SCHEMA_VERSION"='3.0.0', "VERSION_COMMENT"='Hive release version 3.0.0' where "VER_ID"=1;
 SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0';

diff --git a/ql/src/test/queries/clientpositive/insert_overwrite_directory.q b/ql/src/test/queries/clientpositive/insert_overwrite_directory.q
@@ -81,7 +81,7 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
 WITH SERDEPROPERTIES (
 'serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol',
 'quote.delim'= '(\"|\\[|\\])',  'field.delim'=',',
-'serialization.null.format'='-NA-', 'colelction.delim'='#') STORED AS TEXTFILE
+'serialization.null.format'='-NA-', 'collection.delim'='#') STORED AS TEXTFILE
 select a, null, b from array_table;
 
 dfs -cat ../../data/files/array_table_4/000000_0;
@@ -98,7 +98,7 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
 WITH SERDEPROPERTIES (
 'serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol',
 'quote.delim'= '(\"|\\[|\\])',  'field.delim'=':',
-'serialization.null.format'='-NA-', 'colelction.delim'='#', 'mapkey.delim'='%') STORED AS TEXTFILE
+'serialization.null.format'='-NA-', 'collection.delim'='#', 'mapkey.delim'='%') STORED AS TEXTFILE
 select foo, null, bar from map_table;
 
 dfs -cat ../../data/files/map_table_4/000000_0;

diff --git a/ql/src/test/results/clientpositive/insert_overwrite_directory.q.out b/ql/src/test/results/clientpositive/insert_overwrite_directory.q.out
@@ -1191,7 +1191,7 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
 WITH SERDEPROPERTIES (
 'serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol',
 'quote.delim'= '(\"|\\[|\\])',  'field.delim'=',',
-'serialization.null.format'='-NA-', 'colelction.delim'='#') STORED AS TEXTFILE
+'serialization.null.format'='-NA-', 'collection.delim'='#') STORED AS TEXTFILE
 select a, null, b from array_table
 PREHOOK: type: QUERY
 PREHOOK: Input: default@array_table
@@ -1201,7 +1201,7 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
 WITH SERDEPROPERTIES (
 'serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol',
 'quote.delim'= '(\"|\\[|\\])',  'field.delim'=',',
-'serialization.null.format'='-NA-', 'colelction.delim'='#') STORED AS TEXTFILE
+'serialization.null.format'='-NA-', 'collection.delim'='#') STORED AS TEXTFILE
 select a, null, b from array_table
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@array_table
@@ -1229,7 +1229,7 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
 WITH SERDEPROPERTIES (
 'serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol',
 'quote.delim'= '(\"|\\[|\\])',  'field.delim'=':',
-'serialization.null.format'='-NA-', 'colelction.delim'='#', 'mapkey.delim'='%') STORED AS TEXTFILE
+'serialization.null.format'='-NA-', 'collection.delim'='#', 'mapkey.delim'='%') STORED AS TEXTFILE
 select foo, null, bar from map_table
 PREHOOK: type: QUERY
 PREHOOK: Input: default@map_table
@@ -1239,7 +1239,7 @@ ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
 WITH SERDEPROPERTIES (
 'serialization.format'= 'org.apache.hadoop.hive.serde2.thrift.TCTLSeparatedProtocol',
 'quote.delim'= '(\"|\\[|\\])',  'field.delim'=':',
-'serialization.null.format'='-NA-', 'colelction.delim'='#', 'mapkey.delim'='%') STORED AS TEXTFILE
+'serialization.null.format'='-NA-', 'collection.delim'='#', 'mapkey.delim'='%') STORED AS TEXTFILE
 select foo, null, bar from map_table
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@map_table

diff --git a/ql/src/test/results/clientpositive/llap/orc_create.q.out b/ql/src/test/results/clientpositive/llap/orc_create.q.out
@@ -82,7 +82,7 @@ Num Buckets:        	-1
 Bucket Columns:     	[]                  	 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
-	colelction.delim    	,                   
+	collection.delim    	,                   
 	field.delim         	|                   
 	mapkey.delim        	:                   
 	serialization.format	|                   

diff --git a/ql/src/test/results/clientpositive/orc_create.q.out b/ql/src/test/results/clientpositive/orc_create.q.out
@@ -86,7 +86,7 @@ Num Buckets:        	-1
 Bucket Columns:     	[]                  	 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
-	colelction.delim    	,                   
+	collection.delim    	,
 	field.delim         	|                   
 	mapkey.delim        	:                   
 	serialization.format	|                   

diff --git a/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out b/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out
@@ -138,7 +138,7 @@ Num Buckets:        	-1
 Bucket Columns:     	[]                  	 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
-	colelction.delim    	,                   
+	collection.delim    	,                   
 	field.delim         	|                   
 	mapkey.delim        	:                   
 	serialization.format	|                   
@@ -210,7 +210,7 @@ Num Buckets:        	-1
 Bucket Columns:     	[]                  	 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
-	colelction.delim    	,                   
+	collection.delim    	,                   
 	field.delim         	|                   
 	mapkey.delim        	:                   
 	serialization.format	|                   
@@ -263,7 +263,7 @@ Num Buckets:        	-1
 Bucket Columns:     	[]                  	 
 Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
-	colelction.delim    	,                   
+	collection.delim    	,                   
 	field.delim         	|                   
 	mapkey.delim        	:                   
 	serialization.format	|                   

diff --git a/ql/src/test/results/clientpositive/show_create_table_delimited.q.out b/ql/src/test/results/clientpositive/show_create_table_delimited.q.out
@@ -27,7 +27,7 @@ CREATE TABLE `tmp_showcrt1`(
 ROW FORMAT SERDE 
   'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' 
 WITH SERDEPROPERTIES ( 
-  'colelction.delim'='|', 
+  'collection.delim'='|', 
   'field.delim'=',', 
   'line.delim'='\n', 
   'mapkey.delim'='%', 

diff --git a/serde/if/serde.thrift b/serde/if/serde.thrift
@@ -35,7 +35,7 @@ const string SERIALIZATION_USE_JSON_OBJECTS = "serialization.use.json.object"
 const string SERIALIZATION_ENCODING = "serialization.encoding"
 
 const string FIELD_DELIM = "field.delim"
-const string COLLECTION_DELIM = "colelction.delim"
+const string COLLECTION_DELIM = "collection.delim"
 const string LINE_DELIM = "line.delim"
 const string MAPKEY_DELIM = "mapkey.delim"
 const string QUOTE_CHAR = "quote.delim"

diff --git a/serde/src/gen/thrift/gen-cpp/serde_constants.cpp b/serde/src/gen/thrift/gen-cpp/serde_constants.cpp
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/serdeConstants.java
diff --git a/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Types.php b/serde/src/gen/thrift/gen-php/org/apache/hadoop/hive/serde/Types.php
diff --git a/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py b/serde/src/gen/thrift/gen-py/org_apache_hadoop_hive_serde/constants.py
diff --git a/serde/src/gen/thrift/gen-rb/serde_constants.rb b/serde/src/gen/thrift/gen-rb/serde_constants.rb