diff --git a/hcatalog/src/test/e2e/hcatalog/tests/hcat.conf b/hcatalog/src/test/e2e/hcatalog/tests/hcat.conf index fa7893b..411b7d3 100644 --- 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(\s)+None(\s)+\nc(\s)+map(\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(\s)+None(\s)+\nc(\s)+map(\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 new file mode 100644 index 0000000..ee8bc5d --- /dev/null +++ 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 index a31fc5e..30513dc 100644 --- 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/mysql/043-HIVE-16922.mysql.sql b/metastore/scripts/upgrade/mysql/043-HIVE-16922.mysql.sql new file mode 100644 index 0000000..ee8bc5d --- /dev/null +++ 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 index 9371f35..ba62939 100644 --- 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 new file mode 100644 index 0000000..ee8bc5d --- /dev/null +++ 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 index 33791d5..0a70d47 100644 --- 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 new file mode 100644 index 0000000..ee8bc5d --- /dev/null +++ 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 index 314198c..c44dd06 100644 --- 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 index 4431f45..2efe41f 100644 --- 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 index 0519371..40441a0 100644 --- 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 index 849fc46..7e7c889 100644 --- 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 index 40d127c..4f95a64 100644 --- 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 index 7693539..30a5c7d 100644 --- 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 index 00ed838..9fb35c5 100644 --- 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 index 56d8beb..c331242 100644 --- 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 index 18a3458..5674b5e 100644 --- a/serde/src/gen/thrift/gen-cpp/serde_constants.cpp +++ b/serde/src/gen/thrift/gen-cpp/serde_constants.cpp @@ -35,7 +35,7 @@ serdeConstants::serdeConstants() { FIELD_DELIM = "field.delim"; - COLLECTION_DELIM = "colelction.delim"; + COLLECTION_DELIM = "collection.delim"; LINE_DELIM = "line.delim"; 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 index 398ec6f..4da1d3b 100644 --- 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 @@ -60,7 +60,7 @@ public static final String FIELD_DELIM = "field.delim"; - public static final String COLLECTION_DELIM = "colelction.delim"; + public static final String COLLECTION_DELIM = "collection.delim"; public static final String LINE_DELIM = "line.delim"; 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 index 2141e8f..1a2e8d7 100644 --- 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 @@ -117,7 +117,7 @@ final class Constant extends \Thrift\Type\TConstant { } static protected function init_COLLECTION_DELIM() { - return "colelction.delim"; + return "collection.delim"; } static protected function init_LINE_DELIM() { 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 index bc8387b..79ff525 100644 --- 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 @@ -21,7 +21,7 @@ SERIALIZATION_USE_JSON_OBJECTS = "serialization.use.json.object" SERIALIZATION_ENCODING = "serialization.encoding" FIELD_DELIM = "field.delim" -COLLECTION_DELIM = "colelction.delim" +COLLECTION_DELIM = "collection.delim" LINE_DELIM = "line.delim" MAPKEY_DELIM = "mapkey.delim" QUOTE_CHAR = "quote.delim" diff --git a/serde/src/gen/thrift/gen-rb/serde_constants.rb b/serde/src/gen/thrift/gen-rb/serde_constants.rb index da8748d..2810324 100644 --- a/serde/src/gen/thrift/gen-rb/serde_constants.rb +++ b/serde/src/gen/thrift/gen-rb/serde_constants.rb @@ -31,7 +31,7 @@ SERIALIZATION_ENCODING = %q"serialization.encoding" FIELD_DELIM = %q"field.delim" -COLLECTION_DELIM = %q"colelction.delim" +COLLECTION_DELIM = %q"collection.delim" LINE_DELIM = %q"line.delim"