From d3abeb281e910816e9ca8d59ac66d9be895f492c Mon Sep 17 00:00:00 2001 From: Ashutosh Chauhan Date: Tue, 15 Nov 2016 09:10:44 -0800 Subject: [PATCH] HIVE-15173 : Allow dec as an alias for decimal --- .../org/apache/hadoop/hive/ql/parse/HiveLexer.g | 2 +- .../hadoop/hive/ql/parse/TestHiveDecimalParse.java | 23 ++- .../clientpositive/annotate_stats_deep_filters.q | 2 +- ql/src/test/queries/clientpositive/avro_decimal.q | 14 +- .../queries/clientpositive/avro_decimal_native.q | 14 +- .../test/queries/clientpositive/char_pad_convert.q | 12 +- ql/src/test/queries/clientpositive/decimal_10_0.q | 6 +- .../queries/clientpositive/decimal_precision.q | 28 ++-- .../queries/clientpositive/distinct_windowing.q | 2 +- .../clientpositive/distinct_windowing_no_cbo.q | 2 +- .../dynpart_sort_opt_vectorization.q | 2 +- .../clientpositive/dynpart_sort_optimization.q | 2 +- .../test/queries/clientpositive/mapjoin_decimal.q | 16 +- .../queries/clientpositive/metadata_only_queries.q | 6 +- .../metadata_only_queries_with_filters.q | 8 +- ql/src/test/queries/clientpositive/orc_file_dump.q | 6 +- .../queries/clientpositive/orc_llap_counters.q | 10 +- .../queries/clientpositive/orc_llap_counters1.q | 10 +- ql/src/test/queries/clientpositive/orc_ppd_basic.q | 10 +- .../clientpositive/orc_ppd_schema_evol_3a.q | 10 +- .../clientpositive/orc_predicate_pushdown.q | 4 +- .../test/queries/clientpositive/parquet_decimal.q | 12 +- .../clientpositive/parquet_predicate_pushdown.q | 6 +- .../test/queries/clientpositive/primitive_types.q | 4 +- .../temp_table_windowing_expressions.q | 2 +- .../clientpositive/vector_binary_join_groupby.q | 6 +- .../queries/clientpositive/vector_cast_constant.q | 4 +- .../queries/clientpositive/vector_data_types.q | 16 +- .../queries/clientpositive/vector_decimal_10_0.q | 8 +- .../clientpositive/vector_decimal_mapjoin.q | 14 +- .../clientpositive/vector_decimal_precision.q | 26 +-- .../queries/clientpositive/vector_decimal_round.q | 30 ++-- .../clientpositive/vector_decimal_round_2.q | 92 +++++------ .../queries/clientpositive/vector_string_concat.q | 4 +- .../queries/clientpositive/windowing_distinct.q | 8 +- .../clientpositive/windowing_multipartitioning.q | 4 +- .../test/queries/clientpositive/windowing_navfn.q | 2 +- .../test/queries/clientpositive/windowing_ntile.q | 4 +- .../queries/clientpositive/windowing_order_null.q | 2 +- .../clientpositive/windowing_range_multiorder.q | 2 +- .../test/queries/clientpositive/windowing_rank.q | 6 +- .../queries/clientpositive/windowing_streaming.q | 4 +- .../test/queries/clientpositive/windowing_udaf.q | 4 +- .../queries/clientpositive/windowing_windowspec.q | 2 +- .../queries/clientpositive/windowing_windowspec2.q | 2 +- .../annotate_stats_deep_filters.q.out | 4 +- .../test/results/clientpositive/avro_decimal.q.out | 28 ++-- .../clientpositive/avro_decimal_native.q.out | 28 ++-- .../results/clientpositive/char_pad_convert.q.out | 20 +-- .../test/results/clientpositive/decimal_10_0.q.out | 8 +- .../results/clientpositive/decimal_precision.q.out | 56 +++---- .../clientpositive/distinct_windowing.q.out | 4 +- .../clientpositive/distinct_windowing_no_cbo.q.out | 4 +- .../llap/dynpart_sort_opt_vectorization.q.out | 4 +- .../llap/dynpart_sort_optimization.q.out | 4 +- .../clientpositive/llap/mapjoin_decimal.q.out | 32 ++-- .../llap/metadata_only_queries.q.out | 12 +- .../llap/metadata_only_queries_with_filters.q.out | 16 +- .../clientpositive/llap/orc_llap_counters.q.out | 20 +-- .../clientpositive/llap/orc_llap_counters1.q.out | 20 +-- .../clientpositive/llap/orc_ppd_basic.q.out | 20 +-- .../llap/orc_ppd_schema_evol_3a.q.out | 20 +-- .../llap/orc_predicate_pushdown.q.out | 8 +- .../llap/parquet_predicate_pushdown.q.out | 8 +- .../llap/vector_binary_join_groupby.q.out | 8 +- .../clientpositive/llap/vector_cast_constant.q.out | 8 +- .../clientpositive/llap/vector_data_types.q.out | 32 ++-- .../clientpositive/llap/vector_decimal_10_0.q.out | 12 +- .../llap/vector_decimal_mapjoin.q.out | 28 ++-- .../llap/vector_decimal_precision.q.out | 52 +++--- .../clientpositive/llap/vector_decimal_round.q.out | 60 +++---- .../llap/vector_decimal_round_2.q.out | 184 ++++++++++----------- .../clientpositive/llap/vector_string_concat.q.out | 8 +- .../llap/windowing_windowspec2.q.out | 4 +- .../clientpositive/metadata_only_queries.q.out | 12 +- .../results/clientpositive/orc_file_dump.q.out | 10 +- .../results/clientpositive/parquet_decimal.q.out | 24 +-- .../results/clientpositive/primitive_types.q.out | 10 +- .../clientpositive/spark/avro_decimal_native.q.out | 28 ++-- .../clientpositive/spark/mapjoin_decimal.q.out | 32 ++-- .../spark/metadata_only_queries.q.out | 12 +- .../spark/metadata_only_queries_with_filters.q.out | 16 +- .../spark/vector_cast_constant.q.out | 8 +- .../clientpositive/spark/vector_data_types.q.out | 32 ++-- .../spark/vector_decimal_mapjoin.q.out | 28 ++-- .../spark/vector_string_concat.q.out | 8 +- .../temp_table_windowing_expressions.q.out | 4 +- .../vector_binary_join_groupby.q.out | 8 +- .../clientpositive/vector_cast_constant.q.out | 8 +- .../results/clientpositive/vector_data_types.q.out | 32 ++-- .../clientpositive/windowing_distinct.q.out | 16 +- 91 files changed, 730 insertions(+), 723 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g index 4357328..7382877 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g @@ -130,7 +130,7 @@ KW_DATE: 'DATE'; KW_DATETIME: 'DATETIME'; KW_TIMESTAMP: 'TIMESTAMP'; KW_INTERVAL: 'INTERVAL'; -KW_DECIMAL: 'DECIMAL'; +KW_DECIMAL: 'DECIMAL' | 'DEC'; KW_STRING: 'STRING'; KW_CHAR: 'CHAR'; KW_VARCHAR: 'VARCHAR'; diff --git a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java index 0275906..7073374 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestHiveDecimalParse.java @@ -18,8 +18,6 @@ package org.apache.hadoop.hive.ql.parse; -import junit.framework.Assert; - import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.ql.Driver; @@ -28,34 +26,35 @@ import org.apache.hadoop.hive.ql.plan.CreateTableDesc; import org.apache.hadoop.hive.ql.plan.DDLWork; import org.apache.hadoop.hive.ql.session.SessionState; +import org.junit.Assert; import org.junit.Test; public class TestHiveDecimalParse { @Test public void testDecimalType() throws ParseException { - String query = "create table dec (d decimal)"; + String query = "create table `dec` (d decimal)"; String type = getColumnType(query); Assert.assertEquals("decimal(10,0)", type); } @Test public void testDecimalType1() throws ParseException { - String query = "create table dec (d decimal(5))"; + String query = "create table `dec` (d decimal(5))"; String type = getColumnType(query); Assert.assertEquals("decimal(5,0)", type); } @Test public void testDecimalType2() throws ParseException { - String query = "create table dec (d decimal(9,7))"; + String query = "create table `dec` (d decimal(9,7))"; String type = getColumnType(query); Assert.assertEquals("decimal(9,7)", type); } @Test public void testDecimalType3() throws ParseException { - String query = "create table dec (d decimal(66,7))"; + String query = "create table `dec` (d decimal(66,7))"; Driver driver = createDriver(); int rc = driver.compile(query); @@ -66,7 +65,7 @@ public void testDecimalType3() throws ParseException { @Test public void testDecimalType4() throws ParseException { - String query = "create table dec (d decimal(0,7))"; + String query = "create table `dec` (d decimal(0,7))"; Driver driver = createDriver(); int rc = driver.compile(query); @@ -77,7 +76,7 @@ public void testDecimalType4() throws ParseException { @Test public void testDecimalType5() throws ParseException { - String query = "create table dec (d decimal(7,33))"; + String query = "create table `dec` (d decimal(7,33))"; Driver driver = createDriver(); int rc = driver.compile(query); @@ -88,7 +87,7 @@ public void testDecimalType5() throws ParseException { @Test public void testDecimalType6() throws ParseException { - String query = "create table dec (d decimal(7,-1))"; + String query = "create table `dec` (d decimal(7,-1))"; Driver driver = createDriver(); int rc = driver.compile(query); @@ -99,7 +98,7 @@ public void testDecimalType6() throws ParseException { @Test public void testDecimalType7() throws ParseException { - String query = "create table dec (d decimal(7,33,4))"; + String query = "create table `dec` (d decimal(7,33,4))"; Driver driver = createDriver(); int rc = driver.compile(query); @@ -110,7 +109,7 @@ public void testDecimalType7() throws ParseException { @Test public void testDecimalType8() throws ParseException { - String query = "create table dec (d decimal(7a))"; + String query = "create table `dec` (d decimal(7a))"; Driver driver = createDriver(); int rc = driver.compile(query); @@ -121,7 +120,7 @@ public void testDecimalType8() throws ParseException { @Test public void testDecimalType9() throws ParseException { - String query = "create table dec (d decimal(20,23))"; + String query = "create table `dec` (d decimal(20,23))"; Driver driver = createDriver(); int rc = driver.compile(query); diff --git a/ql/src/test/queries/clientpositive/annotate_stats_deep_filters.q b/ql/src/test/queries/clientpositive/annotate_stats_deep_filters.q index e01a654..dd5b9dd 100644 --- a/ql/src/test/queries/clientpositive/annotate_stats_deep_filters.q +++ b/ql/src/test/queries/clientpositive/annotate_stats_deep_filters.q @@ -8,7 +8,7 @@ d double, bo boolean, s string, ts timestamp, -dec decimal(4,2), +`dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; diff --git a/ql/src/test/queries/clientpositive/avro_decimal.q b/ql/src/test/queries/clientpositive/avro_decimal.q index ca1533a..7dce0a6 100644 --- a/ql/src/test/queries/clientpositive/avro_decimal.q +++ b/ql/src/test/queries/clientpositive/avro_decimal.q @@ -1,11 +1,11 @@ -DROP TABLE IF EXISTS dec; +DROP TABLE IF EXISTS `dec`; -CREATE TABLE dec(name string, value decimal(8,4)); +CREATE TABLE `dec`(name string, value decimal(8,4)); -LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE dec; +LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE `dec`; -ANALYZE TABLE dec COMPUTE STATISTICS FOR COLUMNS value; -DESC FORMATTED dec value; +ANALYZE TABLE `dec` COMPUTE STATISTICS FOR COLUMNS value; +DESC FORMATTED `dec` value; DROP TABLE IF EXISTS avro_dec; @@ -26,7 +26,7 @@ TBLPROPERTIES ( DESC avro_dec; -INSERT OVERWRITE TABLE avro_dec select name, value from dec; +INSERT OVERWRITE TABLE avro_dec select name, value from `dec`; SELECT * FROM avro_dec; @@ -53,6 +53,6 @@ LOAD DATA LOCAL INPATH '../../data/files/dec.avro' into TABLE avro_dec1; select value from avro_dec1; -DROP TABLE dec; +DROP TABLE `dec`; DROP TABLE avro_dec; DROP TABLE avro_dec1; diff --git a/ql/src/test/queries/clientpositive/avro_decimal_native.q b/ql/src/test/queries/clientpositive/avro_decimal_native.q index e856586..b9a4163 100644 --- a/ql/src/test/queries/clientpositive/avro_decimal_native.q +++ b/ql/src/test/queries/clientpositive/avro_decimal_native.q @@ -1,13 +1,13 @@ -DROP TABLE IF EXISTS dec; +DROP TABLE IF EXISTS `dec`; -CREATE TABLE dec ( +CREATE TABLE `dec` ( name string, value decimal(8,4)); -LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE dec; +LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE `dec`; -ANALYZE TABLE dec COMPUTE STATISTICS FOR COLUMNS value; -DESC FORMATTED dec value; +ANALYZE TABLE `dec` COMPUTE STATISTICS FOR COLUMNS value; +DESC FORMATTED `dec` value; DROP TABLE IF EXISTS avro_dec; @@ -19,7 +19,7 @@ STORED AS AVRO; DESC avro_dec; -INSERT OVERWRITE TABLE avro_dec SELECT name, value FROM dec; +INSERT OVERWRITE TABLE avro_dec SELECT name, value FROM `dec`; SELECT * FROM avro_dec; @@ -37,6 +37,6 @@ LOAD DATA LOCAL INPATH '../../data/files/dec.avro' INTO TABLE avro_dec1; SELECT value FROM avro_dec1; -DROP TABLE dec; +DROP TABLE `dec`; DROP TABLE avro_dec; DROP TABLE avro_dec1; diff --git a/ql/src/test/queries/clientpositive/char_pad_convert.q b/ql/src/test/queries/clientpositive/char_pad_convert.q index dad7d15..a65132b 100644 --- a/ql/src/test/queries/clientpositive/char_pad_convert.q +++ b/ql/src/test/queries/clientpositive/char_pad_convert.q @@ -9,7 +9,7 @@ create table over1k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; @@ -45,26 +45,26 @@ select lpad(f, 4, ' '), lpad(d, 2, ' '), lpad(bo, 9, 'z'), lpad(ts, 2, 'a'), - lpad(dec, 7, 'd'), + lpad(`dec`, 7, 'd'), lpad(bin, 8, 'b') from over1k limit 5; select lpad("oh", 10, f), lpad("my", 6, d), lpad("other", 14, bo), lpad("one", 12, ts), - lpad("two", 7, dec), + lpad("two", 7, `dec`), lpad("three", 8, bin) from over1k limit 5; select rpad(f, 4, ' '), rpad(d, 2, ' '), rpad(bo, 9, 'z'), rpad(ts, 2, 'a'), - rpad(dec, 7, 'd'), + rpad(`dec`, 7, 'd'), rpad(bin, 8, 'b') from over1k limit 5; select rpad("oh", 10, f), rpad("my", 6, d), rpad("other", 14, bo), rpad("one", 12, ts), - rpad("two", 7, dec), - rpad("three", 8, bin) from over1k limit 5; \ No newline at end of file + rpad("two", 7, `dec`), + rpad("three", 8, bin) from over1k limit 5; diff --git a/ql/src/test/queries/clientpositive/decimal_10_0.q b/ql/src/test/queries/clientpositive/decimal_10_0.q index c3e031d..713eacf 100644 --- a/ql/src/test/queries/clientpositive/decimal_10_0.q +++ b/ql/src/test/queries/clientpositive/decimal_10_0.q @@ -1,9 +1,9 @@ DROP TABLE IF EXISTS `DECIMAL`; -CREATE TABLE `DECIMAL` (dec decimal); +CREATE TABLE `DECIMAL` (`dec` decimal); LOAD DATA LOCAL INPATH '../../data/files/decimal_10_0.txt' OVERWRITE INTO TABLE `DECIMAL`; -SELECT dec FROM `DECIMAL`; +SELECT `dec` FROM `DECIMAL`; -DROP TABLE `DECIMAL`; \ No newline at end of file +DROP TABLE `DECIMAL`; diff --git a/ql/src/test/queries/clientpositive/decimal_precision.q b/ql/src/test/queries/clientpositive/decimal_precision.q index e917f20..7ebfcaf 100644 --- a/ql/src/test/queries/clientpositive/decimal_precision.q +++ b/ql/src/test/queries/clientpositive/decimal_precision.q @@ -1,27 +1,27 @@ set hive.mapred.mode=nonstrict; DROP TABLE IF EXISTS DECIMAL_PRECISION; -CREATE TABLE DECIMAL_PRECISION(dec decimal(20,10)) +CREATE TABLE DECIMAL_PRECISION(`dec` decimal(20,10)) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE; LOAD DATA LOCAL INPATH '../../data/files/kv8.txt' INTO TABLE DECIMAL_PRECISION; -SELECT * FROM DECIMAL_PRECISION ORDER BY dec; +SELECT * FROM DECIMAL_PRECISION ORDER BY `dec`; -SELECT dec, dec + 1, dec - 1 FROM DECIMAL_PRECISION ORDER BY dec; -SELECT dec, dec * 2, dec / 3 FROM DECIMAL_PRECISION ORDER BY dec; -SELECT dec, dec / 9 FROM DECIMAL_PRECISION ORDER BY dec; -SELECT dec, dec / 27 FROM DECIMAL_PRECISION ORDER BY dec; -SELECT dec, dec * dec FROM DECIMAL_PRECISION ORDER BY dec; +SELECT `dec`, `dec` + 1, `dec` - 1 FROM DECIMAL_PRECISION ORDER BY `dec`; +SELECT `dec`, `dec` * 2, `dec` / 3 FROM DECIMAL_PRECISION ORDER BY `dec`; +SELECT `dec`, `dec` / 9 FROM DECIMAL_PRECISION ORDER BY `dec`; +SELECT `dec`, `dec` / 27 FROM DECIMAL_PRECISION ORDER BY `dec`; +SELECT `dec`, `dec` * `dec` FROM DECIMAL_PRECISION ORDER BY `dec`; -EXPLAIN SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION; -SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION; +EXPLAIN SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION; +SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION; -SELECT dec * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1; -SELECT * from DECIMAL_PRECISION WHERE dec > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1; -SELECT dec * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1; +SELECT `dec` * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1; +SELECT * from DECIMAL_PRECISION WHERE `dec` > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1; +SELECT `dec` * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1; SELECT MIN(cast('12345678901234567890.12345678' as decimal(38,18))) FROM DECIMAL_PRECISION; SELECT COUNT(cast('12345678901234567890.12345678' as decimal(38,18))) FROM DECIMAL_PRECISION; @@ -29,8 +29,8 @@ SELECT COUNT(cast('12345678901234567890.12345678' as decimal(38,18))) FROM DECIM DROP TABLE DECIMAL_PRECISION; -- Expect overflow and return null as the value -CREATE TABLE DECIMAL_PRECISION(dec decimal(38,18)); +CREATE TABLE DECIMAL_PRECISION(`dec` decimal(38,18)); INSERT INTO DECIMAL_PRECISION VALUES(98765432109876543210.12345), (98765432109876543210.12345); -SELECT SUM(dec) FROM DECIMAL_PRECISION; +SELECT SUM(`dec`) FROM DECIMAL_PRECISION; DROP TABLE DECIMAL_PRECISION; diff --git a/ql/src/test/queries/clientpositive/distinct_windowing.q b/ql/src/test/queries/clientpositive/distinct_windowing.q index f6a00f0..ca863cb 100644 --- a/ql/src/test/queries/clientpositive/distinct_windowing.q +++ b/ql/src/test/queries/clientpositive/distinct_windowing.q @@ -10,7 +10,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; diff --git a/ql/src/test/queries/clientpositive/distinct_windowing_no_cbo.q b/ql/src/test/queries/clientpositive/distinct_windowing_no_cbo.q index 029974d..36f071f 100644 --- a/ql/src/test/queries/clientpositive/distinct_windowing_no_cbo.q +++ b/ql/src/test/queries/clientpositive/distinct_windowing_no_cbo.q @@ -12,7 +12,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_opt_vectorization.q b/ql/src/test/queries/clientpositive/dynpart_sort_opt_vectorization.q index a300f91..6a90f83 100644 --- a/ql/src/test/queries/clientpositive/dynpart_sort_opt_vectorization.q +++ b/ql/src/test/queries/clientpositive/dynpart_sort_opt_vectorization.q @@ -20,7 +20,7 @@ create table over1k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; diff --git a/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q b/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q index 5ef8ead..d07f016 100644 --- a/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q +++ b/ql/src/test/queries/clientpositive/dynpart_sort_optimization.q @@ -19,7 +19,7 @@ create table over1k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; diff --git a/ql/src/test/queries/clientpositive/mapjoin_decimal.q b/ql/src/test/queries/clientpositive/mapjoin_decimal.q index 1f3b081..b562484 100644 --- a/ql/src/test/queries/clientpositive/mapjoin_decimal.q +++ b/ql/src/test/queries/clientpositive/mapjoin_decimal.q @@ -15,25 +15,25 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; LOAD DATA LOCAL INPATH '../../data/files/over1k' OVERWRITE INTO TABLE over1k; -CREATE TABLE t1(dec decimal(4,2)) STORED AS ORC; -INSERT INTO TABLE t1 select dec from over1k; -CREATE TABLE t2(dec decimal(4,0)) STORED AS ORC; -INSERT INTO TABLE t2 select dec from over1k; +CREATE TABLE t1(`dec` decimal(4,2)) STORED AS ORC; +INSERT INTO TABLE t1 select `dec` from over1k; +CREATE TABLE t2(`dec` decimal(4,0)) STORED AS ORC; +INSERT INTO TABLE t2 select `dec` from over1k; explain -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec; +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec`; set hive.mapjoin.optimized.hashtable=false; -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec; +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec`; set hive.mapjoin.optimized.hashtable=true; -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec; +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec`; diff --git a/ql/src/test/queries/clientpositive/metadata_only_queries.q b/ql/src/test/queries/clientpositive/metadata_only_queries.q index cc72bb3..8581a46 100644 --- a/ql/src/test/queries/clientpositive/metadata_only_queries.q +++ b/ql/src/test/queries/clientpositive/metadata_only_queries.q @@ -12,7 +12,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|'; @@ -29,7 +29,7 @@ create table stats_tbl( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary); create table stats_tbl_part( @@ -42,7 +42,7 @@ create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt string); diff --git a/ql/src/test/queries/clientpositive/metadata_only_queries_with_filters.q b/ql/src/test/queries/clientpositive/metadata_only_queries_with_filters.q index 95d033f..1af813e 100644 --- a/ql/src/test/queries/clientpositive/metadata_only_queries_with_filters.q +++ b/ql/src/test/queries/clientpositive/metadata_only_queries_with_filters.q @@ -11,7 +11,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|'; @@ -28,13 +28,13 @@ create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt int); from over10k -insert overwrite table stats_tbl_part partition (dt=2010) select t,si,i,b,f,d,bo,s,ts,dec,bin where t>0 and t<30 -insert overwrite table stats_tbl_part partition (dt=2014) select t,si,i,b,f,d,bo,s,ts,dec,bin where t > 30 and t<60; +insert overwrite table stats_tbl_part partition (dt=2010) select t,si,i,b,f,d,bo,s,ts,`dec`,bin where t>0 and t<30 +insert overwrite table stats_tbl_part partition (dt=2014) select t,si,i,b,f,d,bo,s,ts,`dec`,bin where t > 30 and t<60; analyze table stats_tbl_part partition(dt) compute statistics; analyze table stats_tbl_part partition(dt=2010) compute statistics for columns t,si,i,b,f,d,bo,s,bin; diff --git a/ql/src/test/queries/clientpositive/orc_file_dump.q b/ql/src/test/queries/clientpositive/orc_file_dump.q index 3d4f1a9..07c755c 100644 --- a/ql/src/test/queries/clientpositive/orc_file_dump.q +++ b/ql/src/test/queries/clientpositive/orc_file_dump.q @@ -8,7 +8,7 @@ CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; @@ -24,7 +24,7 @@ CREATE TABLE orc_ppd(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*"); @@ -49,7 +49,7 @@ CREATE TABLE orc_ppd_part(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) PARTITIONED BY (ds string, hr int) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*"); diff --git a/ql/src/test/queries/clientpositive/orc_llap_counters.q b/ql/src/test/queries/clientpositive/orc_llap_counters.q index cc0e991..cd3cccf 100644 --- a/ql/src/test/queries/clientpositive/orc_llap_counters.q +++ b/ql/src/test/queries/clientpositive/orc_llap_counters.q @@ -14,7 +14,7 @@ CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; @@ -34,11 +34,11 @@ CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*"); -insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s; +insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s; -- just to introduce a gap in min/max range for bloom filters. The dataset has contiguous values -- which makes it hard to test bloom filters @@ -57,11 +57,11 @@ CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*"); -insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s; +insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s; describe formatted orc_ppd; diff --git a/ql/src/test/queries/clientpositive/orc_llap_counters1.q b/ql/src/test/queries/clientpositive/orc_llap_counters1.q index 06d6c4f..7fc85fd 100644 --- a/ql/src/test/queries/clientpositive/orc_llap_counters1.q +++ b/ql/src/test/queries/clientpositive/orc_llap_counters1.q @@ -13,7 +13,7 @@ CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; @@ -33,11 +33,11 @@ CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*"); -insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s; +insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s; -- just to introduce a gap in min/max range for bloom filters. The dataset has contiguous values -- which makes it hard to test bloom filters @@ -56,11 +56,11 @@ CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*"); -insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s; +insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s; describe formatted orc_ppd; diff --git a/ql/src/test/queries/clientpositive/orc_ppd_basic.q b/ql/src/test/queries/clientpositive/orc_ppd_basic.q index 41134a0..17dbec9 100644 --- a/ql/src/test/queries/clientpositive/orc_ppd_basic.q +++ b/ql/src/test/queries/clientpositive/orc_ppd_basic.q @@ -13,7 +13,7 @@ CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; @@ -33,11 +33,11 @@ CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*"); -insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s; +insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s; -- just to introduce a gap in min/max range for bloom filters. The dataset has contiguous values -- which makes it hard to test bloom filters @@ -56,11 +56,11 @@ CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*"); -insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s; +insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s; SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecTezSummaryPrinter; diff --git a/ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q b/ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q index 88a94eb..49f9872 100644 --- a/ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q +++ b/ql/src/test/queries/clientpositive/orc_ppd_schema_evol_3a.q @@ -11,7 +11,7 @@ CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; @@ -31,11 +31,11 @@ CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*"); -insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s; +insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s; -- just to introduce a gap in min/max range for bloom filters. The dataset has contiguous values -- which makes it hard to test bloom filters @@ -54,11 +54,11 @@ CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*"); -insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s; +insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s; SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.PostExecTezSummaryPrinter; SET hive.optimize.index.filter=false; diff --git a/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q b/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q index fb1933d..9be815e 100644 --- a/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q +++ b/ql/src/test/queries/clientpositive/orc_predicate_pushdown.q @@ -10,7 +10,7 @@ CREATE TABLE orc_pred(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC; @@ -25,7 +25,7 @@ CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; diff --git a/ql/src/test/queries/clientpositive/parquet_decimal.q b/ql/src/test/queries/clientpositive/parquet_decimal.q index 1c74401..ccb6713 100644 --- a/ql/src/test/queries/clientpositive/parquet_decimal.q +++ b/ql/src/test/queries/clientpositive/parquet_decimal.q @@ -1,9 +1,9 @@ set hive.mapred.mode=nonstrict; -DROP TABLE IF EXISTS dec; +DROP TABLE IF EXISTS `dec`; -CREATE TABLE dec(name string, value decimal(8,4)); +CREATE TABLE `dec`(name string, value decimal(8,4)); -LOAD DATA LOCAL INPATH '../../data/files/dec.txt' INTO TABLE dec; +LOAD DATA LOCAL INPATH '../../data/files/dec.txt' INTO TABLE `dec`; DROP TABLE IF EXISTS parq_dec; @@ -11,7 +11,7 @@ CREATE TABLE parq_dec(name string, value decimal(5,2)) STORED AS PARQUET; DESC parq_dec; -INSERT OVERWRITE TABLE parq_dec SELECT name, value FROM dec; +INSERT OVERWRITE TABLE parq_dec SELECT name, value FROM `dec`; SELECT * FROM parq_dec; @@ -19,7 +19,7 @@ SELECT value, count(*) FROM parq_dec GROUP BY value ORDER BY value; TRUNCATE TABLE parq_dec; -INSERT OVERWRITE TABLE parq_dec SELECT name, NULL FROM dec; +INSERT OVERWRITE TABLE parq_dec SELECT name, NULL FROM `dec`; SELECT * FROM parq_dec; @@ -33,6 +33,6 @@ LOAD DATA LOCAL INPATH '../../data/files/dec.parq' INTO TABLE parq_dec1; SELECT VALUE FROM parq_dec1; -DROP TABLE dec; +DROP TABLE `dec`; DROP TABLE parq_dec; DROP TABLE parq_dec1; diff --git a/ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q b/ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q index 53d84aa..a38cdbe 100644 --- a/ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q +++ b/ql/src/test/queries/clientpositive/parquet_predicate_pushdown.q @@ -11,7 +11,7 @@ CREATE TABLE tbl_pred(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS PARQUET; @@ -24,7 +24,7 @@ CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; @@ -294,4 +294,4 @@ EXPLAIN SELECT f, i, b FROM tbl_pred AND b BETWEEN 4294967261 AND 4294967861 SORT BY f DESC LIMIT 3; -SET hive.optimize.index.filter=false; \ No newline at end of file +SET hive.optimize.index.filter=false; diff --git a/ql/src/test/queries/clientpositive/primitive_types.q b/ql/src/test/queries/clientpositive/primitive_types.q index 74729be..c3fe464 100644 --- a/ql/src/test/queries/clientpositive/primitive_types.q +++ b/ql/src/test/queries/clientpositive/primitive_types.q @@ -5,7 +5,9 @@ create table t ( i int, ii integer, si smallint, - bi bigint + bi bigint, + de dec, + dc dec(3,2) ); describe t; diff --git a/ql/src/test/queries/clientpositive/temp_table_windowing_expressions.q b/ql/src/test/queries/clientpositive/temp_table_windowing_expressions.q index b227048..1b97fa1 100644 --- a/ql/src/test/queries/clientpositive/temp_table_windowing_expressions.q +++ b/ql/src/test/queries/clientpositive/temp_table_windowing_expressions.q @@ -10,7 +10,7 @@ create temporary table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; diff --git a/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q b/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q index 1d99e34..dbcbe5c 100644 --- a/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q +++ b/ql/src/test/queries/clientpositive/vector_binary_join_groupby.q @@ -18,7 +18,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; @@ -34,7 +34,7 @@ CREATE TABLE hundredorc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC; @@ -60,4 +60,4 @@ GROUP BY bin; EXPLAIN SELECT t1.i, t1.bin, t2.bin -FROM hundredorc t1 JOIN hundredorc t2 ON t1.i = t2.i; \ No newline at end of file +FROM hundredorc t1 JOIN hundredorc t2 ON t1.i = t2.i; diff --git a/ql/src/test/queries/clientpositive/vector_cast_constant.q b/ql/src/test/queries/clientpositive/vector_cast_constant.q index 94bee09..fd306fc 100644 --- a/ql/src/test/queries/clientpositive/vector_cast_constant.q +++ b/ql/src/test/queries/clientpositive/vector_cast_constant.q @@ -16,7 +16,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; @@ -32,7 +32,7 @@ CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC; diff --git a/ql/src/test/queries/clientpositive/vector_data_types.q b/ql/src/test/queries/clientpositive/vector_data_types.q index c7e0d1b..825d857 100644 --- a/ql/src/test/queries/clientpositive/vector_data_types.q +++ b/ql/src/test/queries/clientpositive/vector_data_types.q @@ -14,7 +14,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; @@ -30,7 +30,7 @@ CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC; @@ -38,18 +38,18 @@ INSERT INTO TABLE over1korc SELECT * FROM over1k; SET hive.vectorized.execution.enabled=false; -EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20; +EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20; -SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20; +SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20; SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q; +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q; SET hive.vectorized.execution.enabled=true; -EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20; +EXPLAIN select t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20; -SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20; +SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20; SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q; \ No newline at end of file +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q; diff --git a/ql/src/test/queries/clientpositive/vector_decimal_10_0.q b/ql/src/test/queries/clientpositive/vector_decimal_10_0.q index 596b2bd..893fdab 100644 --- a/ql/src/test/queries/clientpositive/vector_decimal_10_0.q +++ b/ql/src/test/queries/clientpositive/vector_decimal_10_0.q @@ -6,16 +6,16 @@ set hive.fetch.task.conversion=minimal; DROP TABLE IF EXISTS decimal_txt; DROP TABLE IF EXISTS `decimal`; -CREATE TABLE decimal_txt (dec decimal); +CREATE TABLE decimal_txt (`dec` decimal); LOAD DATA LOCAL INPATH '../../data/files/decimal_10_0.txt' OVERWRITE INTO TABLE decimal_txt; CREATE TABLE `DECIMAL` STORED AS ORC AS SELECT * FROM decimal_txt; EXPLAIN -SELECT dec FROM `DECIMAL` order by dec; +SELECT `dec` FROM `DECIMAL` order by `dec`; -SELECT dec FROM `DECIMAL` order by dec; +SELECT `dec` FROM `DECIMAL` order by `dec`; DROP TABLE DECIMAL_txt; -DROP TABLE `DECIMAL`; \ No newline at end of file +DROP TABLE `DECIMAL`; diff --git a/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q b/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q index 3007239..deb869b 100644 --- a/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q +++ b/ql/src/test/queries/clientpositive/vector_decimal_mapjoin.q @@ -14,21 +14,21 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; LOAD DATA LOCAL INPATH '../../data/files/over1k' OVERWRITE INTO TABLE over1k; -CREATE TABLE t1(dec decimal(4,2)) STORED AS ORC; -INSERT INTO TABLE t1 select dec from over1k; -CREATE TABLE t2(dec decimal(4,0)) STORED AS ORC; -INSERT INTO TABLE t2 select dec from over1k; +CREATE TABLE t1(`dec` decimal(4,2)) STORED AS ORC; +INSERT INTO TABLE t1 select `dec` from over1k; +CREATE TABLE t2(`dec` decimal(4,0)) STORED AS ORC; +INSERT INTO TABLE t2 select `dec` from over1k; explain -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec); +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`); -- SORT_QUERY_RESULTS -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec); +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`); diff --git a/ql/src/test/queries/clientpositive/vector_decimal_precision.q b/ql/src/test/queries/clientpositive/vector_decimal_precision.q index cc3fb63..6439ff3 100644 --- a/ql/src/test/queries/clientpositive/vector_decimal_precision.q +++ b/ql/src/test/queries/clientpositive/vector_decimal_precision.q @@ -6,32 +6,32 @@ set hive.fetch.task.conversion=minimal; DROP TABLE IF EXISTS DECIMAL_PRECISION_txt; DROP TABLE IF EXISTS DECIMAL_PRECISION; -CREATE TABLE DECIMAL_PRECISION_txt(dec decimal(20,10)) +CREATE TABLE DECIMAL_PRECISION_txt(`dec` decimal(20,10)) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE; LOAD DATA LOCAL INPATH '../../data/files/kv8.txt' INTO TABLE DECIMAL_PRECISION_txt; -CREATE TABLE DECIMAL_PRECISION(dec decimal(20,10)) +CREATE TABLE DECIMAL_PRECISION(`dec` decimal(20,10)) STORED AS ORC; INSERT OVERWRITE TABLE DECIMAL_PRECISION SELECT * FROM DECIMAL_PRECISION_txt; -SELECT * FROM DECIMAL_PRECISION ORDER BY dec; +SELECT * FROM DECIMAL_PRECISION ORDER BY `dec`; -SELECT dec, dec + 1, dec - 1 FROM DECIMAL_PRECISION ORDER BY dec; -SELECT dec, dec * 2, dec / 3 FROM DECIMAL_PRECISION ORDER BY dec; -SELECT dec, dec / 9 FROM DECIMAL_PRECISION ORDER BY dec; -SELECT dec, dec / 27 FROM DECIMAL_PRECISION ORDER BY dec; -SELECT dec, dec * dec FROM DECIMAL_PRECISION ORDER BY dec; +SELECT `dec`, `dec` + 1, `dec` - 1 FROM DECIMAL_PRECISION ORDER BY `dec`; +SELECT `dec`, `dec` * 2, `dec` / 3 FROM DECIMAL_PRECISION ORDER BY `dec`; +SELECT `dec`, `dec` / 9 FROM DECIMAL_PRECISION ORDER BY `dec`; +SELECT `dec`, `dec` / 27 FROM DECIMAL_PRECISION ORDER BY `dec`; +SELECT `dec`, `dec` * `dec` FROM DECIMAL_PRECISION ORDER BY `dec`; -EXPLAIN SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION; -SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION; +EXPLAIN SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION; +SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION; -SELECT dec * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1; -SELECT * from DECIMAL_PRECISION WHERE dec > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1; -SELECT dec * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1; +SELECT `dec` * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1; +SELECT * from DECIMAL_PRECISION WHERE `dec` > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1; +SELECT `dec` * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1; SELECT MIN(cast('12345678901234567890.12345678' as decimal(38,18))) FROM DECIMAL_PRECISION; SELECT COUNT(cast('12345678901234567890.12345678' as decimal(38,18))) FROM DECIMAL_PRECISION; diff --git a/ql/src/test/queries/clientpositive/vector_decimal_round.q b/ql/src/test/queries/clientpositive/vector_decimal_round.q index bf83163..430a156 100644 --- a/ql/src/test/queries/clientpositive/vector_decimal_round.q +++ b/ql/src/test/queries/clientpositive/vector_decimal_round.q @@ -3,7 +3,7 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=minimal; -create table decimal_tbl_txt (dec decimal(10,0)) +create table decimal_tbl_txt (`dec` decimal(10,0)) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE; @@ -13,16 +13,16 @@ insert into table decimal_tbl_txt values(101); select * from decimal_tbl_txt; explain -select dec, round(dec, -1) from decimal_tbl_txt order by dec; +select `dec`, round(`dec`, -1) from decimal_tbl_txt order by `dec`; -select dec, round(dec, -1) from decimal_tbl_txt order by dec; +select `dec`, round(`dec`, -1) from decimal_tbl_txt order by `dec`; explain -select dec, round(dec, -1) from decimal_tbl_txt order by round(dec, -1); +select `dec`, round(`dec`, -1) from decimal_tbl_txt order by round(`dec`, -1); -select dec, round(dec, -1) from decimal_tbl_txt order by round(dec, -1); +select `dec`, round(`dec`, -1) from decimal_tbl_txt order by round(`dec`, -1); -create table decimal_tbl_rc (dec decimal(10,0)) +create table decimal_tbl_rc (`dec` decimal(10,0)) row format serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe' stored as rcfile; insert into table decimal_tbl_rc values(101); @@ -30,16 +30,16 @@ insert into table decimal_tbl_rc values(101); select * from decimal_tbl_rc; explain -select dec, round(dec, -1) from decimal_tbl_rc order by dec; +select `dec`, round(`dec`, -1) from decimal_tbl_rc order by `dec`; -select dec, round(dec, -1) from decimal_tbl_rc order by dec; +select `dec`, round(`dec`, -1) from decimal_tbl_rc order by `dec`; explain -select dec, round(dec, -1) from decimal_tbl_rc order by round(dec, -1); +select `dec`, round(`dec`, -1) from decimal_tbl_rc order by round(`dec`, -1); -select dec, round(dec, -1) from decimal_tbl_rc order by round(dec, -1); +select `dec`, round(`dec`, -1) from decimal_tbl_rc order by round(`dec`, -1); -create table decimal_tbl_orc (dec decimal(10,0)) +create table decimal_tbl_orc (`dec` decimal(10,0)) stored as orc; insert into table decimal_tbl_orc values(101); @@ -47,11 +47,11 @@ insert into table decimal_tbl_orc values(101); select * from decimal_tbl_orc; explain -select dec, round(dec, -1) from decimal_tbl_orc order by dec; +select `dec`, round(`dec`, -1) from decimal_tbl_orc order by `dec`; -select dec, round(dec, -1) from decimal_tbl_orc order by dec; +select `dec`, round(`dec`, -1) from decimal_tbl_orc order by `dec`; explain -select dec, round(dec, -1) from decimal_tbl_orc order by round(dec, -1); +select `dec`, round(`dec`, -1) from decimal_tbl_orc order by round(`dec`, -1); -select dec, round(dec, -1) from decimal_tbl_orc order by round(dec, -1); \ No newline at end of file +select `dec`, round(`dec`, -1) from decimal_tbl_orc order by round(`dec`, -1); diff --git a/ql/src/test/queries/clientpositive/vector_decimal_round_2.q b/ql/src/test/queries/clientpositive/vector_decimal_round_2.q index 0020325..e5bdc45 100644 --- a/ql/src/test/queries/clientpositive/vector_decimal_round_2.q +++ b/ql/src/test/queries/clientpositive/vector_decimal_round_2.q @@ -3,7 +3,7 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=minimal; -create table decimal_tbl_1_orc (dec decimal(38,18)) +create table decimal_tbl_1_orc (`dec` decimal(38,18)) STORED AS ORC; insert into table decimal_tbl_1_orc values(55555); @@ -11,25 +11,25 @@ insert into table decimal_tbl_1_orc values(55555); select * from decimal_tbl_1_orc; -- EXPLAIN --- SELECT dec, round(null), round(null, 0), round(125, null), +-- SELECT `dec`, round(null), round(null, 0), round(125, null), -- round(1.0/0.0, 0), round(power(-1.0,0.5), 0) --- FROM decimal_tbl_1_orc ORDER BY dec; +-- FROM decimal_tbl_1_orc ORDER BY `dec`; --- SELECT dec, round(null), round(null, 0), round(125, null), +-- SELECT `dec`, round(null), round(null, 0), round(125, null), -- round(1.0/0.0, 0), round(power(-1.0,0.5), 0) --- FROM decimal_tbl_1_orc ORDER BY dec; +-- FROM decimal_tbl_1_orc ORDER BY `dec`; EXPLAIN SELECT - round(dec) as d, round(dec, 0), round(dec, 1), round(dec, 2), round(dec, 3), - round(dec, -1), round(dec, -2), round(dec, -3), round(dec, -4), - round(dec, -5), round(dec, -6), round(dec, -7), round(dec, -8) + round(`dec`) as d, round(`dec`, 0), round(`dec`, 1), round(`dec`, 2), round(`dec`, 3), + round(`dec`, -1), round(`dec`, -2), round(`dec`, -3), round(`dec`, -4), + round(`dec`, -5), round(`dec`, -6), round(`dec`, -7), round(`dec`, -8) FROM decimal_tbl_1_orc ORDER BY d; SELECT - round(dec) as d, round(dec, 0), round(dec, 1), round(dec, 2), round(dec, 3), - round(dec, -1), round(dec, -2), round(dec, -3), round(dec, -4), - round(dec, -5), round(dec, -6), round(dec, -7), round(dec, -8) + round(`dec`) as d, round(`dec`, 0), round(`dec`, 1), round(`dec`, 2), round(`dec`, 3), + round(`dec`, -1), round(`dec`, -2), round(`dec`, -3), round(`dec`, -4), + round(`dec`, -5), round(`dec`, -6), round(`dec`, -7), round(`dec`, -8) FROM decimal_tbl_1_orc ORDER BY d; create table decimal_tbl_2_orc (pos decimal(38,18), neg decimal(38,18)) @@ -58,7 +58,7 @@ SELECT round(neg, -1), round(neg, -2), round(neg, -3), round(neg, -4) FROM decimal_tbl_2_orc ORDER BY p; -create table decimal_tbl_3_orc (dec decimal(38,18)) +create table decimal_tbl_3_orc (`dec` decimal(38,18)) STORED AS ORC; insert into table decimal_tbl_3_orc values(3.141592653589793); @@ -67,43 +67,43 @@ select * from decimal_tbl_3_orc; EXPLAIN SELECT - round(dec, -15) as d, round(dec, -16), - round(dec, -13), round(dec, -14), - round(dec, -11), round(dec, -12), - round(dec, -9), round(dec, -10), - round(dec, -7), round(dec, -8), - round(dec, -5), round(dec, -6), - round(dec, -3), round(dec, -4), - round(dec, -1), round(dec, -2), - round(dec, 0), round(dec, 1), - round(dec, 2), round(dec, 3), - round(dec, 4), round(dec, 5), - round(dec, 6), round(dec, 7), - round(dec, 8), round(dec, 9), - round(dec, 10), round(dec, 11), - round(dec, 12), round(dec, 13), - round(dec, 13), round(dec, 14), - round(dec, 15), round(dec, 16) + round(`dec`, -15) as d, round(`dec`, -16), + round(`dec`, -13), round(`dec`, -14), + round(`dec`, -11), round(`dec`, -12), + round(`dec`, -9), round(`dec`, -10), + round(`dec`, -7), round(`dec`, -8), + round(`dec`, -5), round(`dec`, -6), + round(`dec`, -3), round(`dec`, -4), + round(`dec`, -1), round(`dec`, -2), + round(`dec`, 0), round(`dec`, 1), + round(`dec`, 2), round(`dec`, 3), + round(`dec`, 4), round(`dec`, 5), + round(`dec`, 6), round(`dec`, 7), + round(`dec`, 8), round(`dec`, 9), + round(`dec`, 10), round(`dec`, 11), + round(`dec`, 12), round(`dec`, 13), + round(`dec`, 13), round(`dec`, 14), + round(`dec`, 15), round(`dec`, 16) FROM decimal_tbl_3_orc ORDER BY d; SELECT - round(dec, -15) as d, round(dec, -16), - round(dec, -13), round(dec, -14), - round(dec, -11), round(dec, -12), - round(dec, -9), round(dec, -10), - round(dec, -7), round(dec, -8), - round(dec, -5), round(dec, -6), - round(dec, -3), round(dec, -4), - round(dec, -1), round(dec, -2), - round(dec, 0), round(dec, 1), - round(dec, 2), round(dec, 3), - round(dec, 4), round(dec, 5), - round(dec, 6), round(dec, 7), - round(dec, 8), round(dec, 9), - round(dec, 10), round(dec, 11), - round(dec, 12), round(dec, 13), - round(dec, 13), round(dec, 14), - round(dec, 15), round(dec, 16) + round(`dec`, -15) as d, round(`dec`, -16), + round(`dec`, -13), round(`dec`, -14), + round(`dec`, -11), round(`dec`, -12), + round(`dec`, -9), round(`dec`, -10), + round(`dec`, -7), round(`dec`, -8), + round(`dec`, -5), round(`dec`, -6), + round(`dec`, -3), round(`dec`, -4), + round(`dec`, -1), round(`dec`, -2), + round(`dec`, 0), round(`dec`, 1), + round(`dec`, 2), round(`dec`, 3), + round(`dec`, 4), round(`dec`, 5), + round(`dec`, 6), round(`dec`, 7), + round(`dec`, 8), round(`dec`, 9), + round(`dec`, 10), round(`dec`, 11), + round(`dec`, 12), round(`dec`, 13), + round(`dec`, 13), round(`dec`, 14), + round(`dec`, 15), round(`dec`, 16) FROM decimal_tbl_3_orc ORDER BY d; create table decimal_tbl_4_orc (pos decimal(38,18), neg decimal(38,18)) diff --git a/ql/src/test/queries/clientpositive/vector_string_concat.q b/ql/src/test/queries/clientpositive/vector_string_concat.q index f3a5965..30ca2b2 100644 --- a/ql/src/test/queries/clientpositive/vector_string_concat.q +++ b/ql/src/test/queries/clientpositive/vector_string_concat.q @@ -15,7 +15,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE; @@ -31,7 +31,7 @@ CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC; diff --git a/ql/src/test/queries/clientpositive/windowing_distinct.q b/ql/src/test/queries/clientpositive/windowing_distinct.q index 6b49978..63f10fe 100644 --- a/ql/src/test/queries/clientpositive/windowing_distinct.q +++ b/ql/src/test/queries/clientpositive/windowing_distinct.q @@ -11,7 +11,7 @@ create table windowing_distinct( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|'; @@ -25,7 +25,7 @@ SELECT COUNT(DISTINCT t) OVER (PARTITION BY index), COUNT(DISTINCT s) OVER (PARTITION BY index), COUNT(DISTINCT concat('Mr.', s)) OVER (PARTITION BY index), COUNT(DISTINCT ts) OVER (PARTITION BY index), - COUNT(DISTINCT dec) OVER (PARTITION BY index), + COUNT(DISTINCT `dec`) OVER (PARTITION BY index), COUNT(DISTINCT bin) OVER (PARTITION BY index) FROM windowing_distinct; @@ -34,7 +34,7 @@ SELECT SUM(DISTINCT t) OVER (PARTITION BY index), SUM(DISTINCT s) OVER (PARTITION BY index), SUM(DISTINCT concat('Mr.', s)) OVER (PARTITION BY index), SUM(DISTINCT ts) OVER (PARTITION BY index), - SUM(DISTINCT dec) OVER (PARTITION BY index) + SUM(DISTINCT `dec`) OVER (PARTITION BY index) FROM windowing_distinct; SELECT AVG(DISTINCT t) OVER (PARTITION BY index), @@ -42,7 +42,7 @@ SELECT AVG(DISTINCT t) OVER (PARTITION BY index), AVG(DISTINCT s) OVER (PARTITION BY index), AVG(DISTINCT concat('Mr.', s)) OVER (PARTITION BY index), AVG(DISTINCT ts) OVER (PARTITION BY index), - AVG(DISTINCT dec) OVER (PARTITION BY index) + AVG(DISTINCT `dec`) OVER (PARTITION BY index) FROM windowing_distinct; -- count diff --git a/ql/src/test/queries/clientpositive/windowing_multipartitioning.q b/ql/src/test/queries/clientpositive/windowing_multipartitioning.q index 1c6e1aa..61b4770 100644 --- a/ql/src/test/queries/clientpositive/windowing_multipartitioning.q +++ b/ql/src/test/queries/clientpositive/windowing_multipartitioning.q @@ -10,7 +10,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; @@ -20,7 +20,7 @@ load data local inpath '../../data/files/over10k' into table over10k; select s, rank() over (partition by s order by si), sum(b) over (partition by s order by si) from over10k limit 100; select s, -rank() over (partition by s order by dec desc), +rank() over (partition by s order by `dec` desc), sum(b) over (partition by s order by ts desc) from over10k where s = 'tom allen' or s = 'bob steinbeck'; diff --git a/ql/src/test/queries/clientpositive/windowing_navfn.q b/ql/src/test/queries/clientpositive/windowing_navfn.q index 78eb29b..607932b 100644 --- a/ql/src/test/queries/clientpositive/windowing_navfn.q +++ b/ql/src/test/queries/clientpositive/windowing_navfn.q @@ -10,7 +10,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; diff --git a/ql/src/test/queries/clientpositive/windowing_ntile.q b/ql/src/test/queries/clientpositive/windowing_ntile.q index 73e8192..2382ca8 100644 --- a/ql/src/test/queries/clientpositive/windowing_ntile.q +++ b/ql/src/test/queries/clientpositive/windowing_ntile.q @@ -10,7 +10,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; @@ -23,6 +23,6 @@ select s, ntile(100) over (partition by i order by s) from over10k limit 100; select f, ntile(4) over (partition by d order by f) from over10k limit 100; -select d, ntile(1000) over (partition by dec order by d) from over10k limit 100; +select d, ntile(1000) over (partition by `dec` order by d) from over10k limit 100; diff --git a/ql/src/test/queries/clientpositive/windowing_order_null.q b/ql/src/test/queries/clientpositive/windowing_order_null.q index 6d8ece0..5d17d94 100644 --- a/ql/src/test/queries/clientpositive/windowing_order_null.q +++ b/ql/src/test/queries/clientpositive/windowing_order_null.q @@ -10,7 +10,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|'; diff --git a/ql/src/test/queries/clientpositive/windowing_range_multiorder.q b/ql/src/test/queries/clientpositive/windowing_range_multiorder.q index 24ea1e6..e727d27 100644 --- a/ql/src/test/queries/clientpositive/windowing_range_multiorder.q +++ b/ql/src/test/queries/clientpositive/windowing_range_multiorder.q @@ -10,7 +10,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; diff --git a/ql/src/test/queries/clientpositive/windowing_rank.q b/ql/src/test/queries/clientpositive/windowing_rank.q index 4b95117..9261dfa 100644 --- a/ql/src/test/queries/clientpositive/windowing_rank.q +++ b/ql/src/test/queries/clientpositive/windowing_rank.q @@ -10,7 +10,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; @@ -23,7 +23,7 @@ select s, dense_rank() over (partition by ts order by i,s desc) from over10k lim select s, cume_dist() over (partition by bo order by b,s) from over10k limit 100; -select s, percent_rank() over (partition by dec order by f) from over10k limit 100; +select s, percent_rank() over (partition by `dec` order by f) from over10k limit 100; -- If following tests fail, look for the comments in class PTFPPD::process() @@ -49,7 +49,7 @@ from join over10k on (other.b = over10k.b) ) joined ) ranked -where dec = 89.5 limit 10; +where `dec` = 89.5 limit 10; select ts, dec, rnk from diff --git a/ql/src/test/queries/clientpositive/windowing_streaming.q b/ql/src/test/queries/clientpositive/windowing_streaming.q index b8442e6..4699e69 100644 --- a/ql/src/test/queries/clientpositive/windowing_streaming.q +++ b/ql/src/test/queries/clientpositive/windowing_streaming.q @@ -10,7 +10,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|'; @@ -67,4 +67,4 @@ create table sD ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' STORED AS TEXTFIL select * from (select ctinyint, cdouble, rank() over(partition by ctinyint order by cdouble) r from alltypesorc) a where r < 5; select * from sD -where ctinyint is null; \ No newline at end of file +where ctinyint is null; diff --git a/ql/src/test/queries/clientpositive/windowing_udaf.q b/ql/src/test/queries/clientpositive/windowing_udaf.q index 45c5e5b..19bae8a 100644 --- a/ql/src/test/queries/clientpositive/windowing_udaf.q +++ b/ql/src/test/queries/clientpositive/windowing_udaf.q @@ -10,7 +10,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|'; @@ -29,4 +29,4 @@ select s, avg(d) over (partition by t order by f) from over10k limit 100; select key, max(value) over (order by key rows between 10 preceding and 20 following) -from src1 where length(key) > 10; \ No newline at end of file +from src1 where length(key) > 10; diff --git a/ql/src/test/queries/clientpositive/windowing_windowspec.q b/ql/src/test/queries/clientpositive/windowing_windowspec.q index 63f97b7..08b7d5c 100644 --- a/ql/src/test/queries/clientpositive/windowing_windowspec.q +++ b/ql/src/test/queries/clientpositive/windowing_windowspec.q @@ -10,7 +10,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|'; diff --git a/ql/src/test/queries/clientpositive/windowing_windowspec2.q b/ql/src/test/queries/clientpositive/windowing_windowspec2.q index 0ec1e99..24e3b32 100644 --- a/ql/src/test/queries/clientpositive/windowing_windowspec2.q +++ b/ql/src/test/queries/clientpositive/windowing_windowspec2.q @@ -10,7 +10,7 @@ create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|'; diff --git a/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out b/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out index 32644dc..95dd6ab 100644 --- a/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out +++ b/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out @@ -8,7 +8,7 @@ d double, bo boolean, s string, ts timestamp, -dec decimal(4,2), +`dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -25,7 +25,7 @@ d double, bo boolean, s string, ts timestamp, -dec decimal(4,2), +`dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE diff --git a/ql/src/test/results/clientpositive/avro_decimal.q.out b/ql/src/test/results/clientpositive/avro_decimal.q.out index 64e65ca..b619622 100644 --- a/ql/src/test/results/clientpositive/avro_decimal.q.out +++ b/ql/src/test/results/clientpositive/avro_decimal.q.out @@ -1,35 +1,35 @@ -PREHOOK: query: DROP TABLE IF EXISTS dec +PREHOOK: query: DROP TABLE IF EXISTS `dec` PREHOOK: type: DROPTABLE -POSTHOOK: query: DROP TABLE IF EXISTS dec +POSTHOOK: query: DROP TABLE IF EXISTS `dec` POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE TABLE dec(name string, value decimal(8,4)) +PREHOOK: query: CREATE TABLE `dec`(name string, value decimal(8,4)) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dec -POSTHOOK: query: CREATE TABLE dec(name string, value decimal(8,4)) +POSTHOOK: query: CREATE TABLE `dec`(name string, value decimal(8,4)) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dec -PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE dec +PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE `dec` PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@dec -POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE dec +POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE `dec` POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@dec -PREHOOK: query: ANALYZE TABLE dec COMPUTE STATISTICS FOR COLUMNS value +PREHOOK: query: ANALYZE TABLE `dec` COMPUTE STATISTICS FOR COLUMNS value PREHOOK: type: QUERY PREHOOK: Input: default@dec #### A masked pattern was here #### -POSTHOOK: query: ANALYZE TABLE dec COMPUTE STATISTICS FOR COLUMNS value +POSTHOOK: query: ANALYZE TABLE `dec` COMPUTE STATISTICS FOR COLUMNS value POSTHOOK: type: QUERY POSTHOOK: Input: default@dec #### A masked pattern was here #### -PREHOOK: query: DESC FORMATTED dec value +PREHOOK: query: DESC FORMATTED `dec` value PREHOOK: type: DESCTABLE PREHOOK: Input: default@dec -POSTHOOK: query: DESC FORMATTED dec value +POSTHOOK: query: DESC FORMATTED `dec` value POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@dec # col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment @@ -81,11 +81,11 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@avro_dec name string value decimal(5,2) -PREHOOK: query: INSERT OVERWRITE TABLE avro_dec select name, value from dec +PREHOOK: query: INSERT OVERWRITE TABLE avro_dec select name, value from `dec` PREHOOK: type: QUERY PREHOOK: Input: default@dec PREHOOK: Output: default@avro_dec -POSTHOOK: query: INSERT OVERWRITE TABLE avro_dec select name, value from dec +POSTHOOK: query: INSERT OVERWRITE TABLE avro_dec select name, value from `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@dec POSTHOOK: Output: default@avro_dec @@ -181,11 +181,11 @@ POSTHOOK: Input: default@avro_dec1 19.0 3.2 79.9 -PREHOOK: query: DROP TABLE dec +PREHOOK: query: DROP TABLE `dec` PREHOOK: type: DROPTABLE PREHOOK: Input: default@dec PREHOOK: Output: default@dec -POSTHOOK: query: DROP TABLE dec +POSTHOOK: query: DROP TABLE `dec` POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@dec POSTHOOK: Output: default@dec diff --git a/ql/src/test/results/clientpositive/avro_decimal_native.q.out b/ql/src/test/results/clientpositive/avro_decimal_native.q.out index cebc342..3b5ca5d 100644 --- a/ql/src/test/results/clientpositive/avro_decimal_native.q.out +++ b/ql/src/test/results/clientpositive/avro_decimal_native.q.out @@ -1,39 +1,39 @@ -PREHOOK: query: DROP TABLE IF EXISTS dec +PREHOOK: query: DROP TABLE IF EXISTS `dec` PREHOOK: type: DROPTABLE -POSTHOOK: query: DROP TABLE IF EXISTS dec +POSTHOOK: query: DROP TABLE IF EXISTS `dec` POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE TABLE dec ( +PREHOOK: query: CREATE TABLE `dec` ( name string, value decimal(8,4)) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dec -POSTHOOK: query: CREATE TABLE dec ( +POSTHOOK: query: CREATE TABLE `dec` ( name string, value decimal(8,4)) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dec -PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE dec +PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE `dec` PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@dec -POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE dec +POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE `dec` POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@dec -PREHOOK: query: ANALYZE TABLE dec COMPUTE STATISTICS FOR COLUMNS value +PREHOOK: query: ANALYZE TABLE `dec` COMPUTE STATISTICS FOR COLUMNS value PREHOOK: type: QUERY PREHOOK: Input: default@dec #### A masked pattern was here #### -POSTHOOK: query: ANALYZE TABLE dec COMPUTE STATISTICS FOR COLUMNS value +POSTHOOK: query: ANALYZE TABLE `dec` COMPUTE STATISTICS FOR COLUMNS value POSTHOOK: type: QUERY POSTHOOK: Input: default@dec #### A masked pattern was here #### -PREHOOK: query: DESC FORMATTED dec value +PREHOOK: query: DESC FORMATTED `dec` value PREHOOK: type: DESCTABLE PREHOOK: Input: default@dec -POSTHOOK: query: DESC FORMATTED dec value +POSTHOOK: query: DESC FORMATTED `dec` value POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@dec # col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment @@ -67,11 +67,11 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@avro_dec name string value decimal(5,2) -PREHOOK: query: INSERT OVERWRITE TABLE avro_dec SELECT name, value FROM dec +PREHOOK: query: INSERT OVERWRITE TABLE avro_dec SELECT name, value FROM `dec` PREHOOK: type: QUERY PREHOOK: Input: default@dec PREHOOK: Output: default@avro_dec -POSTHOOK: query: INSERT OVERWRITE TABLE avro_dec SELECT name, value FROM dec +POSTHOOK: query: INSERT OVERWRITE TABLE avro_dec SELECT name, value FROM `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@dec POSTHOOK: Output: default@avro_dec @@ -149,11 +149,11 @@ POSTHOOK: Input: default@avro_dec1 19.0 3.2 79.9 -PREHOOK: query: DROP TABLE dec +PREHOOK: query: DROP TABLE `dec` PREHOOK: type: DROPTABLE PREHOOK: Input: default@dec PREHOOK: Output: default@dec -POSTHOOK: query: DROP TABLE dec +POSTHOOK: query: DROP TABLE `dec` POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@dec POSTHOOK: Output: default@dec diff --git a/ql/src/test/results/clientpositive/char_pad_convert.q.out b/ql/src/test/results/clientpositive/char_pad_convert.q.out index 26102e4..8ae257c 100644 --- a/ql/src/test/results/clientpositive/char_pad_convert.q.out +++ b/ql/src/test/results/clientpositive/char_pad_convert.q.out @@ -8,7 +8,7 @@ PREHOOK: query: create table over1k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' @@ -25,7 +25,7 @@ POSTHOOK: query: create table over1k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' @@ -129,7 +129,7 @@ select lpad(f, 4, ' '), lpad(d, 2, ' '), lpad(bo, 9, 'z'), lpad(ts, 2, 'a'), - lpad(dec, 7, 'd'), + lpad(`dec`, 7, 'd'), lpad(bin, 8, 'b') from over1k limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@over1k @@ -139,7 +139,7 @@ select lpad(f, 4, ' '), lpad(d, 2, ' '), lpad(bo, 9, 'z'), lpad(ts, 2, 'a'), - lpad(dec, 7, 'd'), + lpad(`dec`, 7, 'd'), lpad(bin, 8, 'b') from over1k limit 5 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k @@ -153,7 +153,7 @@ PREHOOK: query: select lpad("oh", 10, f), lpad("my", 6, d), lpad("other", 14, bo), lpad("one", 12, ts), - lpad("two", 7, dec), + lpad("two", 7, `dec`), lpad("three", 8, bin) from over1k limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@over1k @@ -162,7 +162,7 @@ POSTHOOK: query: select lpad("oh", 10, f), lpad("my", 6, d), lpad("other", 14, bo), lpad("one", 12, ts), - lpad("two", 7, dec), + lpad("two", 7, `dec`), lpad("three", 8, bin) from over1k limit 5 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k @@ -176,7 +176,7 @@ PREHOOK: query: select rpad(f, 4, ' '), rpad(d, 2, ' '), rpad(bo, 9, 'z'), rpad(ts, 2, 'a'), - rpad(dec, 7, 'd'), + rpad(`dec`, 7, 'd'), rpad(bin, 8, 'b') from over1k limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@over1k @@ -185,7 +185,7 @@ POSTHOOK: query: select rpad(f, 4, ' '), rpad(d, 2, ' '), rpad(bo, 9, 'z'), rpad(ts, 2, 'a'), - rpad(dec, 7, 'd'), + rpad(`dec`, 7, 'd'), rpad(bin, 8, 'b') from over1k limit 5 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k @@ -199,7 +199,7 @@ PREHOOK: query: select rpad("oh", 10, f), rpad("my", 6, d), rpad("other", 14, bo), rpad("one", 12, ts), - rpad("two", 7, dec), + rpad("two", 7, `dec`), rpad("three", 8, bin) from over1k limit 5 PREHOOK: type: QUERY PREHOOK: Input: default@over1k @@ -208,7 +208,7 @@ POSTHOOK: query: select rpad("oh", 10, f), rpad("my", 6, d), rpad("other", 14, bo), rpad("one", 12, ts), - rpad("two", 7, dec), + rpad("two", 7, `dec`), rpad("three", 8, bin) from over1k limit 5 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k diff --git a/ql/src/test/results/clientpositive/decimal_10_0.q.out b/ql/src/test/results/clientpositive/decimal_10_0.q.out index ee2d0fe..6b891b1 100644 --- a/ql/src/test/results/clientpositive/decimal_10_0.q.out +++ b/ql/src/test/results/clientpositive/decimal_10_0.q.out @@ -2,11 +2,11 @@ PREHOOK: query: DROP TABLE IF EXISTS `DECIMAL` PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE IF EXISTS `DECIMAL` POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE TABLE `DECIMAL` (dec decimal) +PREHOOK: query: CREATE TABLE `DECIMAL` (`dec` decimal) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@DECIMAL -POSTHOOK: query: CREATE TABLE `DECIMAL` (dec decimal) +POSTHOOK: query: CREATE TABLE `DECIMAL` (`dec` decimal) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL @@ -18,11 +18,11 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/decimal_10_0.txt' OVER POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@decimal -PREHOOK: query: SELECT dec FROM `DECIMAL` +PREHOOK: query: SELECT `dec` FROM `DECIMAL` PREHOOK: type: QUERY PREHOOK: Input: default@decimal #### A masked pattern was here #### -POSTHOOK: query: SELECT dec FROM `DECIMAL` +POSTHOOK: query: SELECT `dec` FROM `DECIMAL` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/decimal_precision.q.out b/ql/src/test/results/clientpositive/decimal_precision.q.out index a607d9f..28fb80e 100644 --- a/ql/src/test/results/clientpositive/decimal_precision.q.out +++ b/ql/src/test/results/clientpositive/decimal_precision.q.out @@ -2,14 +2,14 @@ PREHOOK: query: DROP TABLE IF EXISTS DECIMAL_PRECISION PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE IF EXISTS DECIMAL_PRECISION POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE TABLE DECIMAL_PRECISION(dec decimal(20,10)) +PREHOOK: query: CREATE TABLE DECIMAL_PRECISION(`dec` decimal(20,10)) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@DECIMAL_PRECISION -POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION(dec decimal(20,10)) +POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION(`dec` decimal(20,10)) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE @@ -24,11 +24,11 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv8.txt' INTO TABLE DE POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@decimal_precision -PREHOOK: query: SELECT * FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT * FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT * FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -107,11 +107,11 @@ NULL 123456789.0123456789 1234567890.1234560000 1234567890.1234567890 -PREHOOK: query: SELECT dec, dec + 1, dec - 1 FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT `dec`, `dec` + 1, `dec` - 1 FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec, dec + 1, dec - 1 FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT `dec`, `dec` + 1, `dec` - 1 FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -190,11 +190,11 @@ NULL NULL NULL 123456789.0123456789 123456790.0123456789 123456788.0123456789 1234567890.1234560000 1234567891.1234560000 1234567889.1234560000 1234567890.1234567890 1234567891.1234567890 1234567889.1234567890 -PREHOOK: query: SELECT dec, dec * 2, dec / 3 FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT `dec`, `dec` * 2, `dec` / 3 FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec, dec * 2, dec / 3 FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT `dec`, `dec` * 2, `dec` / 3 FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -273,11 +273,11 @@ NULL NULL NULL 123456789.0123456789 246913578.0246913578 41152263.004115226300000000 1234567890.1234560000 2469135780.2469120000 411522630.041152000000000000 1234567890.1234567890 2469135780.2469135780 411522630.041152263000000000 -PREHOOK: query: SELECT dec, dec / 9 FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT `dec`, `dec` / 9 FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec, dec / 9 FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT `dec`, `dec` / 9 FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -356,11 +356,11 @@ NULL NULL 123456789.0123456789 13717421.001371742100000000 1234567890.1234560000 137174210.013717333333333333 1234567890.1234567890 137174210.013717421000000000 -PREHOOK: query: SELECT dec, dec / 27 FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT `dec`, `dec` / 27 FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec, dec / 27 FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT `dec`, `dec` / 27 FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -439,11 +439,11 @@ NULL NULL 123456789.0123456789 4572473.667123914033333333 1234567890.1234560000 45724736.671239111111111111 1234567890.1234567890 45724736.671239140333333333 -PREHOOK: query: SELECT dec, dec * dec FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT `dec`, `dec` * `dec` FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec, dec * dec FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT `dec`, `dec` * `dec` FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -522,9 +522,9 @@ NULL NULL 123456789.0123456789 15241578753238836.75019051998750190521 1234567890.1234560000 NULL 1234567890.1234567890 NULL -PREHOOK: query: EXPLAIN SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION +PREHOOK: query: EXPLAIN SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION +POSTHOOK: query: EXPLAIN SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -570,37 +570,37 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION +PREHOOK: query: SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION +POSTHOOK: query: SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### 88499534.57586576220645 2743485571.8518386284 -PREHOOK: query: SELECT dec * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1 +PREHOOK: query: SELECT `dec` * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1 PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1 +POSTHOOK: query: SELECT `dec` * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### NULL -PREHOOK: query: SELECT * from DECIMAL_PRECISION WHERE dec > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1 +PREHOOK: query: SELECT * from DECIMAL_PRECISION WHERE `dec` > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1 PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT * from DECIMAL_PRECISION WHERE dec > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1 +POSTHOOK: query: SELECT * from DECIMAL_PRECISION WHERE `dec` > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### -PREHOOK: query: SELECT dec * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1 +PREHOOK: query: SELECT `dec` * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1 PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1 +POSTHOOK: query: SELECT `dec` * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -632,12 +632,12 @@ POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@decimal_precision POSTHOOK: Output: default@decimal_precision PREHOOK: query: -- Expect overflow and return null as the value -CREATE TABLE DECIMAL_PRECISION(dec decimal(38,18)) +CREATE TABLE DECIMAL_PRECISION(`dec` decimal(38,18)) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@DECIMAL_PRECISION POSTHOOK: query: -- Expect overflow and return null as the value -CREATE TABLE DECIMAL_PRECISION(dec decimal(38,18)) +CREATE TABLE DECIMAL_PRECISION(`dec` decimal(38,18)) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL_PRECISION @@ -650,11 +650,11 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@values__tmp__table__1 POSTHOOK: Output: default@decimal_precision POSTHOOK: Lineage: decimal_precision.dec EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, type:string, comment:), ] -PREHOOK: query: SELECT SUM(dec) FROM DECIMAL_PRECISION +PREHOOK: query: SELECT SUM(`dec`) FROM DECIMAL_PRECISION PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT SUM(dec) FROM DECIMAL_PRECISION +POSTHOOK: query: SELECT SUM(`dec`) FROM DECIMAL_PRECISION POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/distinct_windowing.q.out b/ql/src/test/results/clientpositive/distinct_windowing.q.out index e6cde90..e946a25 100644 --- a/ql/src/test/results/clientpositive/distinct_windowing.q.out +++ b/ql/src/test/results/clientpositive/distinct_windowing.q.out @@ -12,7 +12,7 @@ PREHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' @@ -29,7 +29,7 @@ POSTHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' diff --git a/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out b/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out index 0e9091e..f19c279 100644 --- a/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out +++ b/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out @@ -12,7 +12,7 @@ PREHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' @@ -29,7 +29,7 @@ POSTHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out index 2248a35..1a31e3e 100644 --- a/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out +++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out @@ -8,7 +8,7 @@ PREHOOK: query: create table over1k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' @@ -25,7 +25,7 @@ POSTHOOK: query: create table over1k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out index 5569011..2ef482c 100644 --- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out +++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out @@ -8,7 +8,7 @@ PREHOOK: query: create table over1k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' @@ -25,7 +25,7 @@ POSTHOOK: query: create table over1k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out b/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out index 01f1f80..8cad495 100644 --- a/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out +++ b/ql/src/test/results/clientpositive/llap/mapjoin_decimal.q.out @@ -9,7 +9,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -27,7 +27,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -42,45 +42,45 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/over1k' OVERWRITE INTO POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@over1k -PREHOOK: query: CREATE TABLE t1(dec decimal(4,2)) STORED AS ORC +PREHOOK: query: CREATE TABLE t1(`dec` decimal(4,2)) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t1 -POSTHOOK: query: CREATE TABLE t1(dec decimal(4,2)) STORED AS ORC +POSTHOOK: query: CREATE TABLE t1(`dec` decimal(4,2)) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 -PREHOOK: query: INSERT INTO TABLE t1 select dec from over1k +PREHOOK: query: INSERT INTO TABLE t1 select `dec` from over1k PREHOOK: type: QUERY PREHOOK: Input: default@over1k PREHOOK: Output: default@t1 -POSTHOOK: query: INSERT INTO TABLE t1 select dec from over1k +POSTHOOK: query: INSERT INTO TABLE t1 select `dec` from over1k POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k POSTHOOK: Output: default@t1 POSTHOOK: Lineage: t1.dec SIMPLE [(over1k)over1k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ] -PREHOOK: query: CREATE TABLE t2(dec decimal(4,0)) STORED AS ORC +PREHOOK: query: CREATE TABLE t2(`dec` decimal(4,0)) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t2 -POSTHOOK: query: CREATE TABLE t2(dec decimal(4,0)) STORED AS ORC +POSTHOOK: query: CREATE TABLE t2(`dec` decimal(4,0)) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t2 -PREHOOK: query: INSERT INTO TABLE t2 select dec from over1k +PREHOOK: query: INSERT INTO TABLE t2 select `dec` from over1k PREHOOK: type: QUERY PREHOOK: Input: default@over1k PREHOOK: Output: default@t2 -POSTHOOK: query: INSERT INTO TABLE t2 select dec from over1k +POSTHOOK: query: INSERT INTO TABLE t2 select `dec` from over1k POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k POSTHOOK: Output: default@t2 POSTHOOK: Lineage: t2.dec EXPRESSION [(over1k)over1k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ] PREHOOK: query: explain -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` PREHOOK: type: QUERY POSTHOOK: query: explain -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -164,12 +164,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +PREHOOK: query: select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### -POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +POSTHOOK: query: select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t2 @@ -280,12 +280,12 @@ POSTHOOK: Input: default@t2 9.00 9 9.00 9 9.00 9 -PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +PREHOOK: query: select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### -POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +POSTHOOK: query: select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t2 diff --git a/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out b/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out index 04b556e..20d48bb 100644 --- a/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out +++ b/ql/src/test/results/clientpositive/llap/metadata_only_queries.q.out @@ -8,7 +8,7 @@ PREHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -25,7 +25,7 @@ POSTHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -50,7 +50,7 @@ PREHOOK: query: create table stats_tbl( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -65,7 +65,7 @@ POSTHOOK: query: create table stats_tbl( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -80,7 +80,7 @@ PREHOOK: query: create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -95,7 +95,7 @@ POSTHOOK: query: create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/llap/metadata_only_queries_with_filters.q.out b/ql/src/test/results/clientpositive/llap/metadata_only_queries_with_filters.q.out index 6dea3e0..6376aa7 100644 --- a/ql/src/test/results/clientpositive/llap/metadata_only_queries_with_filters.q.out +++ b/ql/src/test/results/clientpositive/llap/metadata_only_queries_with_filters.q.out @@ -8,7 +8,7 @@ PREHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -25,7 +25,7 @@ POSTHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -50,7 +50,7 @@ PREHOOK: query: create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -65,21 +65,21 @@ POSTHOOK: query: create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_tbl_part PREHOOK: query: from over10k -insert overwrite table stats_tbl_part partition (dt=2010) select t,si,i,b,f,d,bo,s,ts,dec,bin where t>0 and t<30 -insert overwrite table stats_tbl_part partition (dt=2014) select t,si,i,b,f,d,bo,s,ts,dec,bin where t > 30 and t<60 +insert overwrite table stats_tbl_part partition (dt=2010) select t,si,i,b,f,d,bo,s,ts,`dec`,bin where t>0 and t<30 +insert overwrite table stats_tbl_part partition (dt=2014) select t,si,i,b,f,d,bo,s,ts,`dec`,bin where t > 30 and t<60 PREHOOK: type: QUERY PREHOOK: Input: default@over10k PREHOOK: Output: default@stats_tbl_part@dt=2010 PREHOOK: Output: default@stats_tbl_part@dt=2014 POSTHOOK: query: from over10k -insert overwrite table stats_tbl_part partition (dt=2010) select t,si,i,b,f,d,bo,s,ts,dec,bin where t>0 and t<30 -insert overwrite table stats_tbl_part partition (dt=2014) select t,si,i,b,f,d,bo,s,ts,dec,bin where t > 30 and t<60 +insert overwrite table stats_tbl_part partition (dt=2010) select t,si,i,b,f,d,bo,s,ts,`dec`,bin where t>0 and t<30 +insert overwrite table stats_tbl_part partition (dt=2014) select t,si,i,b,f,d,bo,s,ts,`dec`,bin where t > 30 and t<60 POSTHOOK: type: QUERY POSTHOOK: Input: default@over10k POSTHOOK: Output: default@stats_tbl_part@dt=2010 diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out index 81e2277..d50a314 100644 --- a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out @@ -7,7 +7,7 @@ PREHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -23,7 +23,7 @@ POSTHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -58,7 +58,7 @@ PREHOOK: query: CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") PREHOOK: type: CREATETABLE @@ -76,17 +76,17 @@ POSTHOOK: query: CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_ppd_staging -PREHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s +PREHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s PREHOOK: type: QUERY PREHOOK: Input: default@staging PREHOOK: Output: default@orc_ppd_staging -POSTHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s +POSTHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s POSTHOOK: type: QUERY POSTHOOK: Input: default@staging POSTHOOK: Output: default@orc_ppd_staging @@ -164,7 +164,7 @@ PREHOOK: query: CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") PREHOOK: type: CREATETABLE @@ -182,17 +182,17 @@ POSTHOOK: query: CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_ppd -PREHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s +PREHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_staging PREHOOK: Output: default@orc_ppd -POSTHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s +POSTHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s POSTHOOK: type: QUERY POSTHOOK: Input: default@orc_ppd_staging POSTHOOK: Output: default@orc_ppd diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out index 213cb9f..512a4d1 100644 --- a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out @@ -7,7 +7,7 @@ PREHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -23,7 +23,7 @@ POSTHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -58,7 +58,7 @@ PREHOOK: query: CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") PREHOOK: type: CREATETABLE @@ -76,17 +76,17 @@ POSTHOOK: query: CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_ppd_staging -PREHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s +PREHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s PREHOOK: type: QUERY PREHOOK: Input: default@staging PREHOOK: Output: default@orc_ppd_staging -POSTHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s +POSTHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s POSTHOOK: type: QUERY POSTHOOK: Input: default@staging POSTHOOK: Output: default@orc_ppd_staging @@ -164,7 +164,7 @@ PREHOOK: query: CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") PREHOOK: type: CREATETABLE @@ -182,17 +182,17 @@ POSTHOOK: query: CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_ppd -PREHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s +PREHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_staging PREHOOK: Output: default@orc_ppd -POSTHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s +POSTHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s POSTHOOK: type: QUERY POSTHOOK: Input: default@orc_ppd_staging POSTHOOK: Output: default@orc_ppd diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out index 1b92cd9..5f3460e 100644 --- a/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_ppd_basic.q.out @@ -7,7 +7,7 @@ PREHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -23,7 +23,7 @@ POSTHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -58,7 +58,7 @@ PREHOOK: query: CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") PREHOOK: type: CREATETABLE @@ -76,17 +76,17 @@ POSTHOOK: query: CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_ppd_staging -PREHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s +PREHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s PREHOOK: type: QUERY PREHOOK: Input: default@staging PREHOOK: Output: default@orc_ppd_staging -POSTHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s +POSTHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s POSTHOOK: type: QUERY POSTHOOK: Input: default@staging POSTHOOK: Output: default@orc_ppd_staging @@ -164,7 +164,7 @@ PREHOOK: query: CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") PREHOOK: type: CREATETABLE @@ -182,17 +182,17 @@ POSTHOOK: query: CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_ppd -PREHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s +PREHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_staging PREHOOK: Output: default@orc_ppd -POSTHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s +POSTHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s POSTHOOK: type: QUERY POSTHOOK: Input: default@orc_ppd_staging POSTHOOK: Output: default@orc_ppd diff --git a/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out b/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out index bd81989..d1f1bd7 100644 --- a/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_ppd_schema_evol_3a.q.out @@ -7,7 +7,7 @@ PREHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -23,7 +23,7 @@ POSTHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -58,7 +58,7 @@ PREHOOK: query: CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") PREHOOK: type: CREATETABLE @@ -76,17 +76,17 @@ POSTHOOK: query: CREATE TABLE orc_ppd_staging(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_ppd_staging -PREHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s +PREHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s PREHOOK: type: QUERY PREHOOK: Input: default@staging PREHOOK: Output: default@orc_ppd_staging -POSTHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from staging order by t, s +POSTHOOK: query: insert overwrite table orc_ppd_staging select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from staging order by t, s POSTHOOK: type: QUERY POSTHOOK: Input: default@staging POSTHOOK: Output: default@orc_ppd_staging @@ -164,7 +164,7 @@ PREHOOK: query: CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") PREHOOK: type: CREATETABLE @@ -182,17 +182,17 @@ POSTHOOK: query: CREATE TABLE orc_ppd(t tinyint, v varchar(50), da date, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@orc_ppd -PREHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s +PREHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s PREHOOK: type: QUERY PREHOOK: Input: default@orc_ppd_staging PREHOOK: Output: default@orc_ppd -POSTHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, dec, bin from orc_ppd_staging order by t, s +POSTHOOK: query: insert overwrite table orc_ppd select t, si, i, b, f, d, bo, s, cast(s as char(50)), cast(s as varchar(50)), cast(ts as date), ts, `dec`, bin from orc_ppd_staging order by t, s POSTHOOK: type: QUERY POSTHOOK: Input: default@orc_ppd_staging POSTHOOK: Output: default@orc_ppd diff --git a/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out b/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out index 48a86cf..eaf853b 100644 --- a/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_predicate_pushdown.q.out @@ -9,7 +9,7 @@ CREATE TABLE orc_pred(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC PREHOOK: type: CREATETABLE @@ -26,7 +26,7 @@ CREATE TABLE orc_pred(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE @@ -49,7 +49,7 @@ PREHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -65,7 +65,7 @@ POSTHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE diff --git a/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out index 3254fb4..efe4be0 100644 --- a/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out +++ b/ql/src/test/results/clientpositive/llap/parquet_predicate_pushdown.q.out @@ -8,7 +8,7 @@ CREATE TABLE tbl_pred(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS PARQUET PREHOOK: type: CREATETABLE @@ -24,7 +24,7 @@ CREATE TABLE tbl_pred(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS PARQUET POSTHOOK: type: CREATETABLE @@ -39,7 +39,7 @@ PREHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -55,7 +55,7 @@ POSTHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE diff --git a/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out b/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out index a510e38..76692cf 100644 --- a/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_binary_join_groupby.q.out @@ -16,7 +16,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -33,7 +33,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -57,7 +57,7 @@ PREHOOK: query: CREATE TABLE hundredorc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC PREHOOK: type: CREATETABLE @@ -72,7 +72,7 @@ POSTHOOK: query: CREATE TABLE hundredorc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/llap/vector_cast_constant.q.out b/ql/src/test/results/clientpositive/llap/vector_cast_constant.q.out index cd67e7e..2a69e46 100644 --- a/ql/src/test/results/clientpositive/llap/vector_cast_constant.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_cast_constant.q.out @@ -16,7 +16,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -33,7 +33,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -57,7 +57,7 @@ PREHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC PREHOOK: type: CREATETABLE @@ -72,7 +72,7 @@ POSTHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/llap/vector_data_types.q.out b/ql/src/test/results/clientpositive/llap/vector_data_types.q.out index a7a74c3..7b6a0d2 100644 --- a/ql/src/test/results/clientpositive/llap/vector_data_types.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_data_types.q.out @@ -16,7 +16,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -33,7 +33,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -57,7 +57,7 @@ PREHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC PREHOOK: type: CREATETABLE @@ -72,7 +72,7 @@ POSTHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE @@ -97,9 +97,9 @@ POSTHOOK: Lineage: over1korc.s SIMPLE [(over1k)over1k.FieldSchema(name:s, type:s POSTHOOK: Lineage: over1korc.si SIMPLE [(over1k)over1k.FieldSchema(name:si, type:smallint, comment:null), ] POSTHOOK: Lineage: over1korc.t SIMPLE [(over1k)over1k.FieldSchema(name:t, type:tinyint, comment:null), ] POSTHOOK: Lineage: over1korc.ts SIMPLE [(over1k)over1k.FieldSchema(name:ts, type:timestamp, comment:null), ] -PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -154,11 +154,11 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### @@ -183,19 +183,19 @@ NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703 -1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided -1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -17045922556 -PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -250,11 +250,11 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### @@ -279,12 +279,12 @@ NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703 -1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided -1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_10_0.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_10_0.q.out index 5576078..f105c5a 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_10_0.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_decimal_10_0.q.out @@ -6,11 +6,11 @@ PREHOOK: query: DROP TABLE IF EXISTS `decimal` PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE IF EXISTS `decimal` POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE TABLE decimal_txt (dec decimal) +PREHOOK: query: CREATE TABLE decimal_txt (`dec` decimal) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@decimal_txt -POSTHOOK: query: CREATE TABLE decimal_txt (dec decimal) +POSTHOOK: query: CREATE TABLE decimal_txt (`dec` decimal) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@decimal_txt @@ -34,10 +34,10 @@ POSTHOOK: Output: database:default POSTHOOK: Output: default@DECIMAL POSTHOOK: Lineage: decimal.dec SIMPLE [(decimal_txt)decimal_txt.FieldSchema(name:dec, type:decimal(10,0), comment:null), ] PREHOOK: query: EXPLAIN -SELECT dec FROM `DECIMAL` order by dec +SELECT `dec` FROM `DECIMAL` order by `dec` PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN -SELECT dec FROM `DECIMAL` order by dec +SELECT `dec` FROM `DECIMAL` order by `dec` POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -87,11 +87,11 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT dec FROM `DECIMAL` order by dec +PREHOOK: query: SELECT `dec` FROM `DECIMAL` order by `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal #### A masked pattern was here #### -POSTHOOK: query: SELECT dec FROM `DECIMAL` order by dec +POSTHOOK: query: SELECT `dec` FROM `DECIMAL` order by `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_mapjoin.q.out index 361c46b..fea7a86 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_decimal_mapjoin.q.out @@ -7,7 +7,7 @@ PREHOOK: query: CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -23,7 +23,7 @@ POSTHOOK: query: CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -38,45 +38,45 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/over1k' OVERWRITE INTO POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@over1k -PREHOOK: query: CREATE TABLE t1(dec decimal(4,2)) STORED AS ORC +PREHOOK: query: CREATE TABLE t1(`dec` decimal(4,2)) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t1 -POSTHOOK: query: CREATE TABLE t1(dec decimal(4,2)) STORED AS ORC +POSTHOOK: query: CREATE TABLE t1(`dec` decimal(4,2)) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 -PREHOOK: query: INSERT INTO TABLE t1 select dec from over1k +PREHOOK: query: INSERT INTO TABLE t1 select `dec` from over1k PREHOOK: type: QUERY PREHOOK: Input: default@over1k PREHOOK: Output: default@t1 -POSTHOOK: query: INSERT INTO TABLE t1 select dec from over1k +POSTHOOK: query: INSERT INTO TABLE t1 select `dec` from over1k POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k POSTHOOK: Output: default@t1 POSTHOOK: Lineage: t1.dec SIMPLE [(over1k)over1k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ] -PREHOOK: query: CREATE TABLE t2(dec decimal(4,0)) STORED AS ORC +PREHOOK: query: CREATE TABLE t2(`dec` decimal(4,0)) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t2 -POSTHOOK: query: CREATE TABLE t2(dec decimal(4,0)) STORED AS ORC +POSTHOOK: query: CREATE TABLE t2(`dec` decimal(4,0)) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t2 -PREHOOK: query: INSERT INTO TABLE t2 select dec from over1k +PREHOOK: query: INSERT INTO TABLE t2 select `dec` from over1k PREHOOK: type: QUERY PREHOOK: Input: default@over1k PREHOOK: Output: default@t2 -POSTHOOK: query: INSERT INTO TABLE t2 select dec from over1k +POSTHOOK: query: INSERT INTO TABLE t2 select `dec` from over1k POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k POSTHOOK: Output: default@t2 POSTHOOK: Lineage: t2.dec EXPRESSION [(over1k)over1k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ] PREHOOK: query: explain -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) PREHOOK: type: QUERY POSTHOOK: query: explain -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -149,14 +149,14 @@ STAGE PLANS: PREHOOK: query: -- SORT_QUERY_RESULTS -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### POSTHOOK: query: -- SORT_QUERY_RESULTS -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t2 diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_precision.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_precision.q.out index 5583874..668fec7 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_precision.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_decimal_precision.q.out @@ -6,14 +6,14 @@ PREHOOK: query: DROP TABLE IF EXISTS DECIMAL_PRECISION PREHOOK: type: DROPTABLE POSTHOOK: query: DROP TABLE IF EXISTS DECIMAL_PRECISION POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE TABLE DECIMAL_PRECISION_txt(dec decimal(20,10)) +PREHOOK: query: CREATE TABLE DECIMAL_PRECISION_txt(`dec` decimal(20,10)) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@DECIMAL_PRECISION_txt -POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION_txt(dec decimal(20,10)) +POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION_txt(`dec` decimal(20,10)) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE @@ -28,12 +28,12 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/kv8.txt' INTO TABLE DE POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@decimal_precision_txt -PREHOOK: query: CREATE TABLE DECIMAL_PRECISION(dec decimal(20,10)) +PREHOOK: query: CREATE TABLE DECIMAL_PRECISION(`dec` decimal(20,10)) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@DECIMAL_PRECISION -POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION(dec decimal(20,10)) +POSTHOOK: query: CREATE TABLE DECIMAL_PRECISION(`dec` decimal(20,10)) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -47,11 +47,11 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision_txt POSTHOOK: Output: default@decimal_precision POSTHOOK: Lineage: decimal_precision.dec SIMPLE [(decimal_precision_txt)decimal_precision_txt.FieldSchema(name:dec, type:decimal(20,10), comment:null), ] -PREHOOK: query: SELECT * FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT * FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT * FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -130,11 +130,11 @@ NULL 123456789.0123456789 1234567890.1234560000 1234567890.1234567890 -PREHOOK: query: SELECT dec, dec + 1, dec - 1 FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT `dec`, `dec` + 1, `dec` - 1 FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec, dec + 1, dec - 1 FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT `dec`, `dec` + 1, `dec` - 1 FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -213,11 +213,11 @@ NULL NULL NULL 123456789.0123456789 123456790.0123456789 123456788.0123456789 1234567890.1234560000 1234567891.1234560000 1234567889.1234560000 1234567890.1234567890 1234567891.1234567890 1234567889.1234567890 -PREHOOK: query: SELECT dec, dec * 2, dec / 3 FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT `dec`, `dec` * 2, `dec` / 3 FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec, dec * 2, dec / 3 FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT `dec`, `dec` * 2, `dec` / 3 FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -296,11 +296,11 @@ NULL NULL NULL 123456789.0123456789 246913578.0246913578 41152263.004115226300000000 1234567890.1234560000 2469135780.2469120000 411522630.041152000000000000 1234567890.1234567890 2469135780.2469135780 411522630.041152263000000000 -PREHOOK: query: SELECT dec, dec / 9 FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT `dec`, `dec` / 9 FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec, dec / 9 FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT `dec`, `dec` / 9 FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -379,11 +379,11 @@ NULL NULL 123456789.0123456789 13717421.001371742100000000 1234567890.1234560000 137174210.013717333333333333 1234567890.1234567890 137174210.013717421000000000 -PREHOOK: query: SELECT dec, dec / 27 FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT `dec`, `dec` / 27 FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec, dec / 27 FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT `dec`, `dec` / 27 FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -462,11 +462,11 @@ NULL NULL 123456789.0123456789 4572473.667123914033333333 1234567890.1234560000 45724736.671239111111111111 1234567890.1234567890 45724736.671239140333333333 -PREHOOK: query: SELECT dec, dec * dec FROM DECIMAL_PRECISION ORDER BY dec +PREHOOK: query: SELECT `dec`, `dec` * `dec` FROM DECIMAL_PRECISION ORDER BY `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec, dec * dec FROM DECIMAL_PRECISION ORDER BY dec +POSTHOOK: query: SELECT `dec`, `dec` * `dec` FROM DECIMAL_PRECISION ORDER BY `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### @@ -545,9 +545,9 @@ NULL NULL 123456789.0123456789 15241578753238836.75019051998750190521 1234567890.1234560000 NULL 1234567890.1234567890 NULL -PREHOOK: query: EXPLAIN SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION +PREHOOK: query: EXPLAIN SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION +POSTHOOK: query: EXPLAIN SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -603,37 +603,37 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION +PREHOOK: query: SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT avg(dec), sum(dec) FROM DECIMAL_PRECISION +POSTHOOK: query: SELECT avg(`dec`), sum(`dec`) FROM DECIMAL_PRECISION POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### 88499534.57586576220645 2743485571.8518386284 -PREHOOK: query: SELECT dec * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1 +PREHOOK: query: SELECT `dec` * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1 PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1 +POSTHOOK: query: SELECT `dec` * cast('12345678901234567890.12345678' as decimal(38,18)) FROM DECIMAL_PRECISION LIMIT 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### NULL -PREHOOK: query: SELECT * from DECIMAL_PRECISION WHERE dec > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1 +PREHOOK: query: SELECT * from DECIMAL_PRECISION WHERE `dec` > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1 PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT * from DECIMAL_PRECISION WHERE dec > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1 +POSTHOOK: query: SELECT * from DECIMAL_PRECISION WHERE `dec` > cast('1234567890123456789012345678.12345678' as decimal(38,18)) LIMIT 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### -PREHOOK: query: SELECT dec * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1 +PREHOOK: query: SELECT `dec` * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1 PREHOOK: type: QUERY PREHOOK: Input: default@decimal_precision #### A masked pattern was here #### -POSTHOOK: query: SELECT dec * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1 +POSTHOOK: query: SELECT `dec` * 12345678901234567890.12345678 FROM DECIMAL_PRECISION LIMIT 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_precision #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_round.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_round.q.out index 4063199..c22f549 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_round.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_decimal_round.q.out @@ -1,11 +1,11 @@ -PREHOOK: query: create table decimal_tbl_txt (dec decimal(10,0)) +PREHOOK: query: create table decimal_tbl_txt (`dec` decimal(10,0)) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@decimal_tbl_txt -POSTHOOK: query: create table decimal_tbl_txt (dec decimal(10,0)) +POSTHOOK: query: create table decimal_tbl_txt (`dec` decimal(10,0)) ROW FORMAT DELIMITED FIELDS TERMINATED BY ' ' STORED AS TEXTFILE @@ -31,10 +31,10 @@ POSTHOOK: Input: default@decimal_tbl_txt #### A masked pattern was here #### 101 PREHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_txt order by dec +select `dec`, round(`dec`, -1) from decimal_tbl_txt order by `dec` PREHOOK: type: QUERY POSTHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_txt order by dec +select `dec`, round(`dec`, -1) from decimal_tbl_txt order by `dec` POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -85,20 +85,20 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select dec, round(dec, -1) from decimal_tbl_txt order by dec +PREHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_txt order by `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_tbl_txt #### A masked pattern was here #### -POSTHOOK: query: select dec, round(dec, -1) from decimal_tbl_txt order by dec +POSTHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_txt order by `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_tbl_txt #### A masked pattern was here #### 101 100 PREHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_txt order by round(dec, -1) +select `dec`, round(`dec`, -1) from decimal_tbl_txt order by round(`dec`, -1) PREHOOK: type: QUERY POSTHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_txt order by round(dec, -1) +select `dec`, round(`dec`, -1) from decimal_tbl_txt order by round(`dec`, -1) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -149,21 +149,21 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select dec, round(dec, -1) from decimal_tbl_txt order by round(dec, -1) +PREHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_txt order by round(`dec`, -1) PREHOOK: type: QUERY PREHOOK: Input: default@decimal_tbl_txt #### A masked pattern was here #### -POSTHOOK: query: select dec, round(dec, -1) from decimal_tbl_txt order by round(dec, -1) +POSTHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_txt order by round(`dec`, -1) POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_tbl_txt #### A masked pattern was here #### 101 100 -PREHOOK: query: create table decimal_tbl_rc (dec decimal(10,0)) +PREHOOK: query: create table decimal_tbl_rc (`dec` decimal(10,0)) row format serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe' stored as rcfile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@decimal_tbl_rc -POSTHOOK: query: create table decimal_tbl_rc (dec decimal(10,0)) +POSTHOOK: query: create table decimal_tbl_rc (`dec` decimal(10,0)) row format serde 'org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe' stored as rcfile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -187,10 +187,10 @@ POSTHOOK: Input: default@decimal_tbl_rc #### A masked pattern was here #### 101 PREHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_rc order by dec +select `dec`, round(`dec`, -1) from decimal_tbl_rc order by `dec` PREHOOK: type: QUERY POSTHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_rc order by dec +select `dec`, round(`dec`, -1) from decimal_tbl_rc order by `dec` POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -241,20 +241,20 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select dec, round(dec, -1) from decimal_tbl_rc order by dec +PREHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_rc order by `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_tbl_rc #### A masked pattern was here #### -POSTHOOK: query: select dec, round(dec, -1) from decimal_tbl_rc order by dec +POSTHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_rc order by `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_tbl_rc #### A masked pattern was here #### 101 100 PREHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_rc order by round(dec, -1) +select `dec`, round(`dec`, -1) from decimal_tbl_rc order by round(`dec`, -1) PREHOOK: type: QUERY POSTHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_rc order by round(dec, -1) +select `dec`, round(`dec`, -1) from decimal_tbl_rc order by round(`dec`, -1) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -305,21 +305,21 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select dec, round(dec, -1) from decimal_tbl_rc order by round(dec, -1) +PREHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_rc order by round(`dec`, -1) PREHOOK: type: QUERY PREHOOK: Input: default@decimal_tbl_rc #### A masked pattern was here #### -POSTHOOK: query: select dec, round(dec, -1) from decimal_tbl_rc order by round(dec, -1) +POSTHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_rc order by round(`dec`, -1) POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_tbl_rc #### A masked pattern was here #### 101 100 -PREHOOK: query: create table decimal_tbl_orc (dec decimal(10,0)) +PREHOOK: query: create table decimal_tbl_orc (`dec` decimal(10,0)) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@decimal_tbl_orc -POSTHOOK: query: create table decimal_tbl_orc (dec decimal(10,0)) +POSTHOOK: query: create table decimal_tbl_orc (`dec` decimal(10,0)) stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -343,10 +343,10 @@ POSTHOOK: Input: default@decimal_tbl_orc #### A masked pattern was here #### 101 PREHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_orc order by dec +select `dec`, round(`dec`, -1) from decimal_tbl_orc order by `dec` PREHOOK: type: QUERY POSTHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_orc order by dec +select `dec`, round(`dec`, -1) from decimal_tbl_orc order by `dec` POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -397,20 +397,20 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select dec, round(dec, -1) from decimal_tbl_orc order by dec +PREHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_orc order by `dec` PREHOOK: type: QUERY PREHOOK: Input: default@decimal_tbl_orc #### A masked pattern was here #### -POSTHOOK: query: select dec, round(dec, -1) from decimal_tbl_orc order by dec +POSTHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_orc order by `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_tbl_orc #### A masked pattern was here #### 101 100 PREHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_orc order by round(dec, -1) +select `dec`, round(`dec`, -1) from decimal_tbl_orc order by round(`dec`, -1) PREHOOK: type: QUERY POSTHOOK: query: explain -select dec, round(dec, -1) from decimal_tbl_orc order by round(dec, -1) +select `dec`, round(`dec`, -1) from decimal_tbl_orc order by round(`dec`, -1) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -461,11 +461,11 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select dec, round(dec, -1) from decimal_tbl_orc order by round(dec, -1) +PREHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_orc order by round(`dec`, -1) PREHOOK: type: QUERY PREHOOK: Input: default@decimal_tbl_orc #### A masked pattern was here #### -POSTHOOK: query: select dec, round(dec, -1) from decimal_tbl_orc order by round(dec, -1) +POSTHOOK: query: select `dec`, round(`dec`, -1) from decimal_tbl_orc order by round(`dec`, -1) POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_tbl_orc #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_round_2.q.out b/ql/src/test/results/clientpositive/llap/vector_decimal_round_2.q.out index 882e83d..bb4681e 100644 --- a/ql/src/test/results/clientpositive/llap/vector_decimal_round_2.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_decimal_round_2.q.out @@ -1,9 +1,9 @@ -PREHOOK: query: create table decimal_tbl_1_orc (dec decimal(38,18)) +PREHOOK: query: create table decimal_tbl_1_orc (`dec` decimal(38,18)) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@decimal_tbl_1_orc -POSTHOOK: query: create table decimal_tbl_1_orc (dec decimal(38,18)) +POSTHOOK: query: create table decimal_tbl_1_orc (`dec` decimal(38,18)) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -27,35 +27,35 @@ POSTHOOK: Input: default@decimal_tbl_1_orc #### A masked pattern was here #### 55555.000000000000000000 PREHOOK: query: -- EXPLAIN --- SELECT dec, round(null), round(null, 0), round(125, null), +-- SELECT `dec`, round(null), round(null, 0), round(125, null), -- round(1.0/0.0, 0), round(power(-1.0,0.5), 0) --- FROM decimal_tbl_1_orc ORDER BY dec; +-- FROM decimal_tbl_1_orc ORDER BY `dec`; --- SELECT dec, round(null), round(null, 0), round(125, null), +-- SELECT `dec`, round(null), round(null, 0), round(125, null), -- round(1.0/0.0, 0), round(power(-1.0,0.5), 0) --- FROM decimal_tbl_1_orc ORDER BY dec; +-- FROM decimal_tbl_1_orc ORDER BY `dec`; EXPLAIN SELECT - round(dec) as d, round(dec, 0), round(dec, 1), round(dec, 2), round(dec, 3), - round(dec, -1), round(dec, -2), round(dec, -3), round(dec, -4), - round(dec, -5), round(dec, -6), round(dec, -7), round(dec, -8) + round(`dec`) as d, round(`dec`, 0), round(`dec`, 1), round(`dec`, 2), round(`dec`, 3), + round(`dec`, -1), round(`dec`, -2), round(`dec`, -3), round(`dec`, -4), + round(`dec`, -5), round(`dec`, -6), round(`dec`, -7), round(`dec`, -8) FROM decimal_tbl_1_orc ORDER BY d PREHOOK: type: QUERY POSTHOOK: query: -- EXPLAIN --- SELECT dec, round(null), round(null, 0), round(125, null), +-- SELECT `dec`, round(null), round(null, 0), round(125, null), -- round(1.0/0.0, 0), round(power(-1.0,0.5), 0) --- FROM decimal_tbl_1_orc ORDER BY dec; +-- FROM decimal_tbl_1_orc ORDER BY `dec`; --- SELECT dec, round(null), round(null, 0), round(125, null), +-- SELECT `dec`, round(null), round(null, 0), round(125, null), -- round(1.0/0.0, 0), round(power(-1.0,0.5), 0) --- FROM decimal_tbl_1_orc ORDER BY dec; +-- FROM decimal_tbl_1_orc ORDER BY `dec`; EXPLAIN SELECT - round(dec) as d, round(dec, 0), round(dec, 1), round(dec, 2), round(dec, 3), - round(dec, -1), round(dec, -2), round(dec, -3), round(dec, -4), - round(dec, -5), round(dec, -6), round(dec, -7), round(dec, -8) + round(`dec`) as d, round(`dec`, 0), round(`dec`, 1), round(`dec`, 2), round(`dec`, 3), + round(`dec`, -1), round(`dec`, -2), round(`dec`, -3), round(`dec`, -4), + round(`dec`, -5), round(`dec`, -6), round(`dec`, -7), round(`dec`, -8) FROM decimal_tbl_1_orc ORDER BY d POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -108,17 +108,17 @@ STAGE PLANS: ListSink PREHOOK: query: SELECT - round(dec) as d, round(dec, 0), round(dec, 1), round(dec, 2), round(dec, 3), - round(dec, -1), round(dec, -2), round(dec, -3), round(dec, -4), - round(dec, -5), round(dec, -6), round(dec, -7), round(dec, -8) + round(`dec`) as d, round(`dec`, 0), round(`dec`, 1), round(`dec`, 2), round(`dec`, 3), + round(`dec`, -1), round(`dec`, -2), round(`dec`, -3), round(`dec`, -4), + round(`dec`, -5), round(`dec`, -6), round(`dec`, -7), round(`dec`, -8) FROM decimal_tbl_1_orc ORDER BY d PREHOOK: type: QUERY PREHOOK: Input: default@decimal_tbl_1_orc #### A masked pattern was here #### POSTHOOK: query: SELECT - round(dec) as d, round(dec, 0), round(dec, 1), round(dec, 2), round(dec, 3), - round(dec, -1), round(dec, -2), round(dec, -3), round(dec, -4), - round(dec, -5), round(dec, -6), round(dec, -7), round(dec, -8) + round(`dec`) as d, round(`dec`, 0), round(`dec`, 1), round(`dec`, 2), round(`dec`, 3), + round(`dec`, -1), round(`dec`, -2), round(`dec`, -3), round(`dec`, -4), + round(`dec`, -5), round(`dec`, -6), round(`dec`, -7), round(`dec`, -8) FROM decimal_tbl_1_orc ORDER BY d POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_tbl_1_orc @@ -245,12 +245,12 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_tbl_2_orc #### A masked pattern was here #### 125 125 125.3 125.32 125.315 125.3150 130 100 0 0 -125 -125 -125.3 -125.32 -125.315 -125.3150 -130 -100 0 0 -PREHOOK: query: create table decimal_tbl_3_orc (dec decimal(38,18)) +PREHOOK: query: create table decimal_tbl_3_orc (`dec` decimal(38,18)) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@decimal_tbl_3_orc -POSTHOOK: query: create table decimal_tbl_3_orc (dec decimal(38,18)) +POSTHOOK: query: create table decimal_tbl_3_orc (`dec` decimal(38,18)) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -275,44 +275,44 @@ POSTHOOK: Input: default@decimal_tbl_3_orc 3.141592653589793000 PREHOOK: query: EXPLAIN SELECT - round(dec, -15) as d, round(dec, -16), - round(dec, -13), round(dec, -14), - round(dec, -11), round(dec, -12), - round(dec, -9), round(dec, -10), - round(dec, -7), round(dec, -8), - round(dec, -5), round(dec, -6), - round(dec, -3), round(dec, -4), - round(dec, -1), round(dec, -2), - round(dec, 0), round(dec, 1), - round(dec, 2), round(dec, 3), - round(dec, 4), round(dec, 5), - round(dec, 6), round(dec, 7), - round(dec, 8), round(dec, 9), - round(dec, 10), round(dec, 11), - round(dec, 12), round(dec, 13), - round(dec, 13), round(dec, 14), - round(dec, 15), round(dec, 16) + round(`dec`, -15) as d, round(`dec`, -16), + round(`dec`, -13), round(`dec`, -14), + round(`dec`, -11), round(`dec`, -12), + round(`dec`, -9), round(`dec`, -10), + round(`dec`, -7), round(`dec`, -8), + round(`dec`, -5), round(`dec`, -6), + round(`dec`, -3), round(`dec`, -4), + round(`dec`, -1), round(`dec`, -2), + round(`dec`, 0), round(`dec`, 1), + round(`dec`, 2), round(`dec`, 3), + round(`dec`, 4), round(`dec`, 5), + round(`dec`, 6), round(`dec`, 7), + round(`dec`, 8), round(`dec`, 9), + round(`dec`, 10), round(`dec`, 11), + round(`dec`, 12), round(`dec`, 13), + round(`dec`, 13), round(`dec`, 14), + round(`dec`, 15), round(`dec`, 16) FROM decimal_tbl_3_orc ORDER BY d PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN SELECT - round(dec, -15) as d, round(dec, -16), - round(dec, -13), round(dec, -14), - round(dec, -11), round(dec, -12), - round(dec, -9), round(dec, -10), - round(dec, -7), round(dec, -8), - round(dec, -5), round(dec, -6), - round(dec, -3), round(dec, -4), - round(dec, -1), round(dec, -2), - round(dec, 0), round(dec, 1), - round(dec, 2), round(dec, 3), - round(dec, 4), round(dec, 5), - round(dec, 6), round(dec, 7), - round(dec, 8), round(dec, 9), - round(dec, 10), round(dec, 11), - round(dec, 12), round(dec, 13), - round(dec, 13), round(dec, 14), - round(dec, 15), round(dec, 16) + round(`dec`, -15) as d, round(`dec`, -16), + round(`dec`, -13), round(`dec`, -14), + round(`dec`, -11), round(`dec`, -12), + round(`dec`, -9), round(`dec`, -10), + round(`dec`, -7), round(`dec`, -8), + round(`dec`, -5), round(`dec`, -6), + round(`dec`, -3), round(`dec`, -4), + round(`dec`, -1), round(`dec`, -2), + round(`dec`, 0), round(`dec`, 1), + round(`dec`, 2), round(`dec`, 3), + round(`dec`, 4), round(`dec`, 5), + round(`dec`, 6), round(`dec`, 7), + round(`dec`, 8), round(`dec`, 9), + round(`dec`, 10), round(`dec`, 11), + round(`dec`, 12), round(`dec`, 13), + round(`dec`, 13), round(`dec`, 14), + round(`dec`, 15), round(`dec`, 16) FROM decimal_tbl_3_orc ORDER BY d POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -365,45 +365,45 @@ STAGE PLANS: ListSink PREHOOK: query: SELECT - round(dec, -15) as d, round(dec, -16), - round(dec, -13), round(dec, -14), - round(dec, -11), round(dec, -12), - round(dec, -9), round(dec, -10), - round(dec, -7), round(dec, -8), - round(dec, -5), round(dec, -6), - round(dec, -3), round(dec, -4), - round(dec, -1), round(dec, -2), - round(dec, 0), round(dec, 1), - round(dec, 2), round(dec, 3), - round(dec, 4), round(dec, 5), - round(dec, 6), round(dec, 7), - round(dec, 8), round(dec, 9), - round(dec, 10), round(dec, 11), - round(dec, 12), round(dec, 13), - round(dec, 13), round(dec, 14), - round(dec, 15), round(dec, 16) + round(`dec`, -15) as d, round(`dec`, -16), + round(`dec`, -13), round(`dec`, -14), + round(`dec`, -11), round(`dec`, -12), + round(`dec`, -9), round(`dec`, -10), + round(`dec`, -7), round(`dec`, -8), + round(`dec`, -5), round(`dec`, -6), + round(`dec`, -3), round(`dec`, -4), + round(`dec`, -1), round(`dec`, -2), + round(`dec`, 0), round(`dec`, 1), + round(`dec`, 2), round(`dec`, 3), + round(`dec`, 4), round(`dec`, 5), + round(`dec`, 6), round(`dec`, 7), + round(`dec`, 8), round(`dec`, 9), + round(`dec`, 10), round(`dec`, 11), + round(`dec`, 12), round(`dec`, 13), + round(`dec`, 13), round(`dec`, 14), + round(`dec`, 15), round(`dec`, 16) FROM decimal_tbl_3_orc ORDER BY d PREHOOK: type: QUERY PREHOOK: Input: default@decimal_tbl_3_orc #### A masked pattern was here #### POSTHOOK: query: SELECT - round(dec, -15) as d, round(dec, -16), - round(dec, -13), round(dec, -14), - round(dec, -11), round(dec, -12), - round(dec, -9), round(dec, -10), - round(dec, -7), round(dec, -8), - round(dec, -5), round(dec, -6), - round(dec, -3), round(dec, -4), - round(dec, -1), round(dec, -2), - round(dec, 0), round(dec, 1), - round(dec, 2), round(dec, 3), - round(dec, 4), round(dec, 5), - round(dec, 6), round(dec, 7), - round(dec, 8), round(dec, 9), - round(dec, 10), round(dec, 11), - round(dec, 12), round(dec, 13), - round(dec, 13), round(dec, 14), - round(dec, 15), round(dec, 16) + round(`dec`, -15) as d, round(`dec`, -16), + round(`dec`, -13), round(`dec`, -14), + round(`dec`, -11), round(`dec`, -12), + round(`dec`, -9), round(`dec`, -10), + round(`dec`, -7), round(`dec`, -8), + round(`dec`, -5), round(`dec`, -6), + round(`dec`, -3), round(`dec`, -4), + round(`dec`, -1), round(`dec`, -2), + round(`dec`, 0), round(`dec`, 1), + round(`dec`, 2), round(`dec`, 3), + round(`dec`, 4), round(`dec`, 5), + round(`dec`, 6), round(`dec`, 7), + round(`dec`, 8), round(`dec`, 9), + round(`dec`, 10), round(`dec`, 11), + round(`dec`, 12), round(`dec`, 13), + round(`dec`, 13), round(`dec`, 14), + round(`dec`, 15), round(`dec`, 16) FROM decimal_tbl_3_orc ORDER BY d POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_tbl_3_orc diff --git a/ql/src/test/results/clientpositive/llap/vector_string_concat.q.out b/ql/src/test/results/clientpositive/llap/vector_string_concat.q.out index ca3d2fa..e62ebff 100644 --- a/ql/src/test/results/clientpositive/llap/vector_string_concat.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_string_concat.q.out @@ -16,7 +16,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -33,7 +33,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -57,7 +57,7 @@ PREHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC PREHOOK: type: CREATETABLE @@ -72,7 +72,7 @@ POSTHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/llap/windowing_windowspec2.q.out b/ql/src/test/results/clientpositive/llap/windowing_windowspec2.q.out index a88eb6c..4c9cb8c 100644 --- a/ql/src/test/results/clientpositive/llap/windowing_windowspec2.q.out +++ b/ql/src/test/results/clientpositive/llap/windowing_windowspec2.q.out @@ -12,7 +12,7 @@ PREHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -29,7 +29,7 @@ POSTHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' diff --git a/ql/src/test/results/clientpositive/metadata_only_queries.q.out b/ql/src/test/results/clientpositive/metadata_only_queries.q.out index 2e3331e..5ceb36b 100644 --- a/ql/src/test/results/clientpositive/metadata_only_queries.q.out +++ b/ql/src/test/results/clientpositive/metadata_only_queries.q.out @@ -8,7 +8,7 @@ PREHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -25,7 +25,7 @@ POSTHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -50,7 +50,7 @@ PREHOOK: query: create table stats_tbl( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -65,7 +65,7 @@ POSTHOOK: query: create table stats_tbl( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -80,7 +80,7 @@ PREHOOK: query: create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -95,7 +95,7 @@ POSTHOOK: query: create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/orc_file_dump.q.out b/ql/src/test/results/clientpositive/orc_file_dump.q.out index 4cc8e3b..fdfb07b 100644 --- a/ql/src/test/results/clientpositive/orc_file_dump.q.out +++ b/ql/src/test/results/clientpositive/orc_file_dump.q.out @@ -7,7 +7,7 @@ PREHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -23,7 +23,7 @@ POSTHOOK: query: CREATE TABLE staging(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -47,7 +47,7 @@ PREHOOK: query: CREATE TABLE orc_ppd(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") PREHOOK: type: CREATETABLE @@ -62,7 +62,7 @@ POSTHOOK: query: CREATE TABLE orc_ppd(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") POSTHOOK: type: CREATETABLE @@ -482,7 +482,7 @@ PREHOOK: query: CREATE TABLE orc_ppd_part(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) PARTITIONED BY (ds string, hr int) STORED AS ORC tblproperties("orc.row.index.stride" = "1000", "orc.bloom.filter.columns"="*") PREHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/parquet_decimal.q.out b/ql/src/test/results/clientpositive/parquet_decimal.q.out index a19cd6d..88331df 100644 --- a/ql/src/test/results/clientpositive/parquet_decimal.q.out +++ b/ql/src/test/results/clientpositive/parquet_decimal.q.out @@ -1,20 +1,20 @@ -PREHOOK: query: DROP TABLE IF EXISTS dec +PREHOOK: query: DROP TABLE IF EXISTS `dec` PREHOOK: type: DROPTABLE -POSTHOOK: query: DROP TABLE IF EXISTS dec +POSTHOOK: query: DROP TABLE IF EXISTS `dec` POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE TABLE dec(name string, value decimal(8,4)) +PREHOOK: query: CREATE TABLE `dec`(name string, value decimal(8,4)) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dec -POSTHOOK: query: CREATE TABLE dec(name string, value decimal(8,4)) +POSTHOOK: query: CREATE TABLE `dec`(name string, value decimal(8,4)) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dec -PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' INTO TABLE dec +PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' INTO TABLE `dec` PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@dec -POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' INTO TABLE dec +POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' INTO TABLE `dec` POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@dec @@ -38,11 +38,11 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@parq_dec name string value decimal(5,2) -PREHOOK: query: INSERT OVERWRITE TABLE parq_dec SELECT name, value FROM dec +PREHOOK: query: INSERT OVERWRITE TABLE parq_dec SELECT name, value FROM `dec` PREHOOK: type: QUERY PREHOOK: Input: default@dec PREHOOK: Output: default@parq_dec -POSTHOOK: query: INSERT OVERWRITE TABLE parq_dec SELECT name, value FROM dec +POSTHOOK: query: INSERT OVERWRITE TABLE parq_dec SELECT name, value FROM `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@dec POSTHOOK: Output: default@parq_dec @@ -90,11 +90,11 @@ PREHOOK: Output: default@parq_dec POSTHOOK: query: TRUNCATE TABLE parq_dec POSTHOOK: type: TRUNCATETABLE POSTHOOK: Output: default@parq_dec -PREHOOK: query: INSERT OVERWRITE TABLE parq_dec SELECT name, NULL FROM dec +PREHOOK: query: INSERT OVERWRITE TABLE parq_dec SELECT name, NULL FROM `dec` PREHOOK: type: QUERY PREHOOK: Input: default@dec PREHOOK: Output: default@parq_dec -POSTHOOK: query: INSERT OVERWRITE TABLE parq_dec SELECT name, NULL FROM dec +POSTHOOK: query: INSERT OVERWRITE TABLE parq_dec SELECT name, NULL FROM `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@dec POSTHOOK: Output: default@parq_dec @@ -164,11 +164,11 @@ POSTHOOK: Input: default@parq_dec1 0.2 3.2 8.0 -PREHOOK: query: DROP TABLE dec +PREHOOK: query: DROP TABLE `dec` PREHOOK: type: DROPTABLE PREHOOK: Input: default@dec PREHOOK: Output: default@dec -POSTHOOK: query: DROP TABLE dec +POSTHOOK: query: DROP TABLE `dec` POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@dec POSTHOOK: Output: default@dec diff --git a/ql/src/test/results/clientpositive/primitive_types.q.out b/ql/src/test/results/clientpositive/primitive_types.q.out index e3cbbfb..3f717e1 100644 --- a/ql/src/test/results/clientpositive/primitive_types.q.out +++ b/ql/src/test/results/clientpositive/primitive_types.q.out @@ -5,7 +5,9 @@ PREHOOK: query: create table t ( i int, ii integer, si smallint, - bi bigint + bi bigint, + de dec, + dc dec(3,2) ) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -17,7 +19,9 @@ POSTHOOK: query: create table t ( i int, ii integer, si smallint, - bi bigint + bi bigint, + de dec, + dc dec(3,2) ) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -35,3 +39,5 @@ i int ii int si smallint bi bigint +de decimal(10,0) +dc decimal(3,2) diff --git a/ql/src/test/results/clientpositive/spark/avro_decimal_native.q.out b/ql/src/test/results/clientpositive/spark/avro_decimal_native.q.out index cebc342..3b5ca5d 100644 --- a/ql/src/test/results/clientpositive/spark/avro_decimal_native.q.out +++ b/ql/src/test/results/clientpositive/spark/avro_decimal_native.q.out @@ -1,39 +1,39 @@ -PREHOOK: query: DROP TABLE IF EXISTS dec +PREHOOK: query: DROP TABLE IF EXISTS `dec` PREHOOK: type: DROPTABLE -POSTHOOK: query: DROP TABLE IF EXISTS dec +POSTHOOK: query: DROP TABLE IF EXISTS `dec` POSTHOOK: type: DROPTABLE -PREHOOK: query: CREATE TABLE dec ( +PREHOOK: query: CREATE TABLE `dec` ( name string, value decimal(8,4)) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dec -POSTHOOK: query: CREATE TABLE dec ( +POSTHOOK: query: CREATE TABLE `dec` ( name string, value decimal(8,4)) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dec -PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE dec +PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE `dec` PREHOOK: type: LOAD #### A masked pattern was here #### PREHOOK: Output: default@dec -POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE dec +POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/dec.txt' into TABLE `dec` POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@dec -PREHOOK: query: ANALYZE TABLE dec COMPUTE STATISTICS FOR COLUMNS value +PREHOOK: query: ANALYZE TABLE `dec` COMPUTE STATISTICS FOR COLUMNS value PREHOOK: type: QUERY PREHOOK: Input: default@dec #### A masked pattern was here #### -POSTHOOK: query: ANALYZE TABLE dec COMPUTE STATISTICS FOR COLUMNS value +POSTHOOK: query: ANALYZE TABLE `dec` COMPUTE STATISTICS FOR COLUMNS value POSTHOOK: type: QUERY POSTHOOK: Input: default@dec #### A masked pattern was here #### -PREHOOK: query: DESC FORMATTED dec value +PREHOOK: query: DESC FORMATTED `dec` value PREHOOK: type: DESCTABLE PREHOOK: Input: default@dec -POSTHOOK: query: DESC FORMATTED dec value +POSTHOOK: query: DESC FORMATTED `dec` value POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@dec # col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment @@ -67,11 +67,11 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@avro_dec name string value decimal(5,2) -PREHOOK: query: INSERT OVERWRITE TABLE avro_dec SELECT name, value FROM dec +PREHOOK: query: INSERT OVERWRITE TABLE avro_dec SELECT name, value FROM `dec` PREHOOK: type: QUERY PREHOOK: Input: default@dec PREHOOK: Output: default@avro_dec -POSTHOOK: query: INSERT OVERWRITE TABLE avro_dec SELECT name, value FROM dec +POSTHOOK: query: INSERT OVERWRITE TABLE avro_dec SELECT name, value FROM `dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@dec POSTHOOK: Output: default@avro_dec @@ -149,11 +149,11 @@ POSTHOOK: Input: default@avro_dec1 19.0 3.2 79.9 -PREHOOK: query: DROP TABLE dec +PREHOOK: query: DROP TABLE `dec` PREHOOK: type: DROPTABLE PREHOOK: Input: default@dec PREHOOK: Output: default@dec -POSTHOOK: query: DROP TABLE dec +POSTHOOK: query: DROP TABLE `dec` POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@dec POSTHOOK: Output: default@dec diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_decimal.q.out b/ql/src/test/results/clientpositive/spark/mapjoin_decimal.q.out index 4d02c58..da3ab01 100644 --- a/ql/src/test/results/clientpositive/spark/mapjoin_decimal.q.out +++ b/ql/src/test/results/clientpositive/spark/mapjoin_decimal.q.out @@ -9,7 +9,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -27,7 +27,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -42,45 +42,45 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/over1k' OVERWRITE INTO POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@over1k -PREHOOK: query: CREATE TABLE t1(dec decimal(4,2)) STORED AS ORC +PREHOOK: query: CREATE TABLE t1(`dec` decimal(4,2)) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t1 -POSTHOOK: query: CREATE TABLE t1(dec decimal(4,2)) STORED AS ORC +POSTHOOK: query: CREATE TABLE t1(`dec` decimal(4,2)) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 -PREHOOK: query: INSERT INTO TABLE t1 select dec from over1k +PREHOOK: query: INSERT INTO TABLE t1 select `dec` from over1k PREHOOK: type: QUERY PREHOOK: Input: default@over1k PREHOOK: Output: default@t1 -POSTHOOK: query: INSERT INTO TABLE t1 select dec from over1k +POSTHOOK: query: INSERT INTO TABLE t1 select `dec` from over1k POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k POSTHOOK: Output: default@t1 POSTHOOK: Lineage: t1.dec SIMPLE [(over1k)over1k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ] -PREHOOK: query: CREATE TABLE t2(dec decimal(4,0)) STORED AS ORC +PREHOOK: query: CREATE TABLE t2(`dec` decimal(4,0)) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t2 -POSTHOOK: query: CREATE TABLE t2(dec decimal(4,0)) STORED AS ORC +POSTHOOK: query: CREATE TABLE t2(`dec` decimal(4,0)) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t2 -PREHOOK: query: INSERT INTO TABLE t2 select dec from over1k +PREHOOK: query: INSERT INTO TABLE t2 select `dec` from over1k PREHOOK: type: QUERY PREHOOK: Input: default@over1k PREHOOK: Output: default@t2 -POSTHOOK: query: INSERT INTO TABLE t2 select dec from over1k +POSTHOOK: query: INSERT INTO TABLE t2 select `dec` from over1k POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k POSTHOOK: Output: default@t2 POSTHOOK: Lineage: t2.dec EXPRESSION [(over1k)over1k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ] PREHOOK: query: explain -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` PREHOOK: type: QUERY POSTHOOK: query: explain -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-2 is a root stage @@ -166,12 +166,12 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +PREHOOK: query: select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### -POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +POSTHOOK: query: select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t2 @@ -282,12 +282,12 @@ POSTHOOK: Input: default@t2 9.00 9 9.00 9 9.00 9 -PREHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +PREHOOK: query: select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### -POSTHOOK: query: select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) order by t1.dec +POSTHOOK: query: select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) order by t1.`dec` POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t2 diff --git a/ql/src/test/results/clientpositive/spark/metadata_only_queries.q.out b/ql/src/test/results/clientpositive/spark/metadata_only_queries.q.out index dc96a0d..db21f7e 100644 --- a/ql/src/test/results/clientpositive/spark/metadata_only_queries.q.out +++ b/ql/src/test/results/clientpositive/spark/metadata_only_queries.q.out @@ -8,7 +8,7 @@ PREHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -25,7 +25,7 @@ POSTHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -50,7 +50,7 @@ PREHOOK: query: create table stats_tbl( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -65,7 +65,7 @@ POSTHOOK: query: create table stats_tbl( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default @@ -80,7 +80,7 @@ PREHOOK: query: create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -95,7 +95,7 @@ POSTHOOK: query: create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/spark/metadata_only_queries_with_filters.q.out b/ql/src/test/results/clientpositive/spark/metadata_only_queries_with_filters.q.out index 6dea3e0..6376aa7 100644 --- a/ql/src/test/results/clientpositive/spark/metadata_only_queries_with_filters.q.out +++ b/ql/src/test/results/clientpositive/spark/metadata_only_queries_with_filters.q.out @@ -8,7 +8,7 @@ PREHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -25,7 +25,7 @@ POSTHOOK: query: create table over10k( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -50,7 +50,7 @@ PREHOOK: query: create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt int) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -65,21 +65,21 @@ POSTHOOK: query: create table stats_tbl_part( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) partitioned by (dt int) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_tbl_part PREHOOK: query: from over10k -insert overwrite table stats_tbl_part partition (dt=2010) select t,si,i,b,f,d,bo,s,ts,dec,bin where t>0 and t<30 -insert overwrite table stats_tbl_part partition (dt=2014) select t,si,i,b,f,d,bo,s,ts,dec,bin where t > 30 and t<60 +insert overwrite table stats_tbl_part partition (dt=2010) select t,si,i,b,f,d,bo,s,ts,`dec`,bin where t>0 and t<30 +insert overwrite table stats_tbl_part partition (dt=2014) select t,si,i,b,f,d,bo,s,ts,`dec`,bin where t > 30 and t<60 PREHOOK: type: QUERY PREHOOK: Input: default@over10k PREHOOK: Output: default@stats_tbl_part@dt=2010 PREHOOK: Output: default@stats_tbl_part@dt=2014 POSTHOOK: query: from over10k -insert overwrite table stats_tbl_part partition (dt=2010) select t,si,i,b,f,d,bo,s,ts,dec,bin where t>0 and t<30 -insert overwrite table stats_tbl_part partition (dt=2014) select t,si,i,b,f,d,bo,s,ts,dec,bin where t > 30 and t<60 +insert overwrite table stats_tbl_part partition (dt=2010) select t,si,i,b,f,d,bo,s,ts,`dec`,bin where t>0 and t<30 +insert overwrite table stats_tbl_part partition (dt=2014) select t,si,i,b,f,d,bo,s,ts,`dec`,bin where t > 30 and t<60 POSTHOOK: type: QUERY POSTHOOK: Input: default@over10k POSTHOOK: Output: default@stats_tbl_part@dt=2010 diff --git a/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.out b/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.out index 424a2c9..e9f5e7a 100644 --- a/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.out @@ -16,7 +16,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -33,7 +33,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -57,7 +57,7 @@ PREHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC PREHOOK: type: CREATETABLE @@ -72,7 +72,7 @@ POSTHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/spark/vector_data_types.q.out b/ql/src/test/results/clientpositive/spark/vector_data_types.q.out index dbaf14d..a3b5994 100644 --- a/ql/src/test/results/clientpositive/spark/vector_data_types.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_data_types.q.out @@ -16,7 +16,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -33,7 +33,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -57,7 +57,7 @@ PREHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC PREHOOK: type: CREATETABLE @@ -72,7 +72,7 @@ POSTHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE @@ -97,9 +97,9 @@ POSTHOOK: Lineage: over1korc.s SIMPLE [(over1k)over1k.FieldSchema(name:s, type:s POSTHOOK: Lineage: over1korc.si SIMPLE [(over1k)over1k.FieldSchema(name:si, type:smallint, comment:null), ] POSTHOOK: Lineage: over1korc.t SIMPLE [(over1k)over1k.FieldSchema(name:t, type:tinyint, comment:null), ] POSTHOOK: Lineage: over1korc.ts SIMPLE [(over1k)over1k.FieldSchema(name:ts, type:timestamp, comment:null), ] -PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -150,11 +150,11 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### @@ -179,19 +179,19 @@ NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703 -1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided -1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -17045922556 -PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -244,11 +244,11 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### @@ -273,12 +273,12 @@ NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703 -1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided -1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/vector_decimal_mapjoin.q.out b/ql/src/test/results/clientpositive/spark/vector_decimal_mapjoin.q.out index 0493994..db084cb 100644 --- a/ql/src/test/results/clientpositive/spark/vector_decimal_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_decimal_mapjoin.q.out @@ -7,7 +7,7 @@ PREHOOK: query: CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -23,7 +23,7 @@ POSTHOOK: query: CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -38,45 +38,45 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/over1k' OVERWRITE INTO POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@over1k -PREHOOK: query: CREATE TABLE t1(dec decimal(4,2)) STORED AS ORC +PREHOOK: query: CREATE TABLE t1(`dec` decimal(4,2)) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t1 -POSTHOOK: query: CREATE TABLE t1(dec decimal(4,2)) STORED AS ORC +POSTHOOK: query: CREATE TABLE t1(`dec` decimal(4,2)) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t1 -PREHOOK: query: INSERT INTO TABLE t1 select dec from over1k +PREHOOK: query: INSERT INTO TABLE t1 select `dec` from over1k PREHOOK: type: QUERY PREHOOK: Input: default@over1k PREHOOK: Output: default@t1 -POSTHOOK: query: INSERT INTO TABLE t1 select dec from over1k +POSTHOOK: query: INSERT INTO TABLE t1 select `dec` from over1k POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k POSTHOOK: Output: default@t1 POSTHOOK: Lineage: t1.dec SIMPLE [(over1k)over1k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ] -PREHOOK: query: CREATE TABLE t2(dec decimal(4,0)) STORED AS ORC +PREHOOK: query: CREATE TABLE t2(`dec` decimal(4,0)) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@t2 -POSTHOOK: query: CREATE TABLE t2(dec decimal(4,0)) STORED AS ORC +POSTHOOK: query: CREATE TABLE t2(`dec` decimal(4,0)) STORED AS ORC POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@t2 -PREHOOK: query: INSERT INTO TABLE t2 select dec from over1k +PREHOOK: query: INSERT INTO TABLE t2 select `dec` from over1k PREHOOK: type: QUERY PREHOOK: Input: default@over1k PREHOOK: Output: default@t2 -POSTHOOK: query: INSERT INTO TABLE t2 select dec from over1k +POSTHOOK: query: INSERT INTO TABLE t2 select `dec` from over1k POSTHOOK: type: QUERY POSTHOOK: Input: default@over1k POSTHOOK: Output: default@t2 POSTHOOK: Lineage: t2.dec EXPRESSION [(over1k)over1k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ] PREHOOK: query: explain -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) PREHOOK: type: QUERY POSTHOOK: query: explain -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-2 is a root stage @@ -153,14 +153,14 @@ STAGE PLANS: PREHOOK: query: -- SORT_QUERY_RESULTS -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) PREHOOK: type: QUERY PREHOOK: Input: default@t1 PREHOOK: Input: default@t2 #### A masked pattern was here #### POSTHOOK: query: -- SORT_QUERY_RESULTS -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec) +select t1.`dec`, t2.`dec` from t1 join t2 on (t1.`dec`=t2.`dec`) POSTHOOK: type: QUERY POSTHOOK: Input: default@t1 POSTHOOK: Input: default@t2 diff --git a/ql/src/test/results/clientpositive/spark/vector_string_concat.q.out b/ql/src/test/results/clientpositive/spark/vector_string_concat.q.out index 5497426..3ddc283 100644 --- a/ql/src/test/results/clientpositive/spark/vector_string_concat.q.out +++ b/ql/src/test/results/clientpositive/spark/vector_string_concat.q.out @@ -16,7 +16,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -33,7 +33,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -57,7 +57,7 @@ PREHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC PREHOOK: type: CREATETABLE @@ -72,7 +72,7 @@ POSTHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/temp_table_windowing_expressions.q.out b/ql/src/test/results/clientpositive/temp_table_windowing_expressions.q.out index 61a74f0..220a93a 100644 --- a/ql/src/test/results/clientpositive/temp_table_windowing_expressions.q.out +++ b/ql/src/test/results/clientpositive/temp_table_windowing_expressions.q.out @@ -12,7 +12,7 @@ PREHOOK: query: create temporary table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' @@ -29,7 +29,7 @@ POSTHOOK: query: create temporary table over10k( bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) row format delimited fields terminated by '|' diff --git a/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out b/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out index 2110d43..96234b7 100644 --- a/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out +++ b/ql/src/test/results/clientpositive/vector_binary_join_groupby.q.out @@ -16,7 +16,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -33,7 +33,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -57,7 +57,7 @@ PREHOOK: query: CREATE TABLE hundredorc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC PREHOOK: type: CREATETABLE @@ -72,7 +72,7 @@ POSTHOOK: query: CREATE TABLE hundredorc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/vector_cast_constant.q.out b/ql/src/test/results/clientpositive/vector_cast_constant.q.out index 5cd8085..05f818f 100644 --- a/ql/src/test/results/clientpositive/vector_cast_constant.q.out +++ b/ql/src/test/results/clientpositive/vector_cast_constant.q.out @@ -16,7 +16,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -33,7 +33,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -57,7 +57,7 @@ PREHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC PREHOOK: type: CREATETABLE @@ -72,7 +72,7 @@ POSTHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/vector_data_types.q.out b/ql/src/test/results/clientpositive/vector_data_types.q.out index 804d9e6..90609f0 100644 --- a/ql/src/test/results/clientpositive/vector_data_types.q.out +++ b/ql/src/test/results/clientpositive/vector_data_types.q.out @@ -16,7 +16,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -33,7 +33,7 @@ CREATE TABLE over1k(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' STORED AS TEXTFILE @@ -57,7 +57,7 @@ PREHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC PREHOOK: type: CREATETABLE @@ -72,7 +72,7 @@ POSTHOOK: query: CREATE TABLE over1korc(t tinyint, bo boolean, s string, ts timestamp, - dec decimal(4,2), + `dec` decimal(4,2), bin binary) STORED AS ORC POSTHOOK: type: CREATETABLE @@ -97,9 +97,9 @@ POSTHOOK: Lineage: over1korc.s SIMPLE [(over1k)over1k.FieldSchema(name:s, type:s POSTHOOK: Lineage: over1korc.si SIMPLE [(over1k)over1k.FieldSchema(name:si, type:smallint, comment:null), ] POSTHOOK: Lineage: over1korc.t SIMPLE [(over1k)over1k.FieldSchema(name:t, type:tinyint, comment:null), ] POSTHOOK: Lineage: over1korc.ts SIMPLE [(over1k)over1k.FieldSchema(name:ts, type:timestamp, comment:null), ] -PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: EXPLAIN SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -144,11 +144,11 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### @@ -173,19 +173,19 @@ NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703 -1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided -1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### -17045922556 -PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: EXPLAIN select t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY STAGE DEPENDENCIES: Stage-1 is a root stage @@ -231,11 +231,11 @@ STAGE PLANS: Processor Tree: ListSink -PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +PREHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### -POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i LIMIT 20 +POSTHOOK: query: SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i LIMIT 20 POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### @@ -260,12 +260,12 @@ NULL 473 65720 4294967324 80.74 40.6 false holly falkner 2013-03-01 09:11:58.703 -1 281 65643 4294967323 15.1 45.0 false irene nixon 2013-03-01 09:11:58.703223 80.96 undecided -1 300 65663 4294967343 71.26 34.62 true calvin ovid 2013-03-01 09:11:58.703262 78.56 study skills PREHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q PREHOOK: type: QUERY PREHOOK: Input: default@over1korc #### A masked pattern was here #### POSTHOOK: query: SELECT SUM(HASH(*)) -FROM (SELECT t, si, i, b, f, d, bo, s, ts, dec, bin FROM over1korc ORDER BY t, si, i) as q +FROM (SELECT t, si, i, b, f, d, bo, s, ts, `dec`, bin FROM over1korc ORDER BY t, si, i) as q POSTHOOK: type: QUERY POSTHOOK: Input: default@over1korc #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/windowing_distinct.q.out b/ql/src/test/results/clientpositive/windowing_distinct.q.out index 86d1cdd..23b427c 100644 --- a/ql/src/test/results/clientpositive/windowing_distinct.q.out +++ b/ql/src/test/results/clientpositive/windowing_distinct.q.out @@ -13,7 +13,7 @@ PREHOOK: query: create table windowing_distinct( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -31,7 +31,7 @@ POSTHOOK: query: create table windowing_distinct( bo boolean, s string, ts timestamp, - dec decimal, + `dec` decimal, bin binary) row format delimited fields terminated by '|' @@ -52,7 +52,7 @@ PREHOOK: query: SELECT COUNT(DISTINCT t) OVER (PARTITION BY index), COUNT(DISTINCT s) OVER (PARTITION BY index), COUNT(DISTINCT concat('Mr.', s)) OVER (PARTITION BY index), COUNT(DISTINCT ts) OVER (PARTITION BY index), - COUNT(DISTINCT dec) OVER (PARTITION BY index), + COUNT(DISTINCT `dec`) OVER (PARTITION BY index), COUNT(DISTINCT bin) OVER (PARTITION BY index) FROM windowing_distinct PREHOOK: type: QUERY @@ -64,7 +64,7 @@ POSTHOOK: query: SELECT COUNT(DISTINCT t) OVER (PARTITION BY index), COUNT(DISTINCT s) OVER (PARTITION BY index), COUNT(DISTINCT concat('Mr.', s)) OVER (PARTITION BY index), COUNT(DISTINCT ts) OVER (PARTITION BY index), - COUNT(DISTINCT dec) OVER (PARTITION BY index), + COUNT(DISTINCT `dec`) OVER (PARTITION BY index), COUNT(DISTINCT bin) OVER (PARTITION BY index) FROM windowing_distinct POSTHOOK: type: QUERY @@ -81,7 +81,7 @@ PREHOOK: query: SELECT SUM(DISTINCT t) OVER (PARTITION BY index), SUM(DISTINCT s) OVER (PARTITION BY index), SUM(DISTINCT concat('Mr.', s)) OVER (PARTITION BY index), SUM(DISTINCT ts) OVER (PARTITION BY index), - SUM(DISTINCT dec) OVER (PARTITION BY index) + SUM(DISTINCT `dec`) OVER (PARTITION BY index) FROM windowing_distinct PREHOOK: type: QUERY PREHOOK: Input: default@windowing_distinct @@ -91,7 +91,7 @@ POSTHOOK: query: SELECT SUM(DISTINCT t) OVER (PARTITION BY index), SUM(DISTINCT s) OVER (PARTITION BY index), SUM(DISTINCT concat('Mr.', s)) OVER (PARTITION BY index), SUM(DISTINCT ts) OVER (PARTITION BY index), - SUM(DISTINCT dec) OVER (PARTITION BY index) + SUM(DISTINCT `dec`) OVER (PARTITION BY index) FROM windowing_distinct POSTHOOK: type: QUERY POSTHOOK: Input: default@windowing_distinct @@ -107,7 +107,7 @@ PREHOOK: query: SELECT AVG(DISTINCT t) OVER (PARTITION BY index), AVG(DISTINCT s) OVER (PARTITION BY index), AVG(DISTINCT concat('Mr.', s)) OVER (PARTITION BY index), AVG(DISTINCT ts) OVER (PARTITION BY index), - AVG(DISTINCT dec) OVER (PARTITION BY index) + AVG(DISTINCT `dec`) OVER (PARTITION BY index) FROM windowing_distinct PREHOOK: type: QUERY PREHOOK: Input: default@windowing_distinct @@ -117,7 +117,7 @@ POSTHOOK: query: SELECT AVG(DISTINCT t) OVER (PARTITION BY index), AVG(DISTINCT s) OVER (PARTITION BY index), AVG(DISTINCT concat('Mr.', s)) OVER (PARTITION BY index), AVG(DISTINCT ts) OVER (PARTITION BY index), - AVG(DISTINCT dec) OVER (PARTITION BY index) + AVG(DISTINCT `dec`) OVER (PARTITION BY index) FROM windowing_distinct POSTHOOK: type: QUERY POSTHOOK: Input: default@windowing_distinct -- 1.7.12.4 (Apple Git-37)