HIVE-11090: ordering issues with windows unit test runs (Matt McCline via Gunther Hagleitner)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/63deec40 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/63deec40 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/63deec40 Branch: refs/heads/beeline-cli Commit: 63deec40731c709f84b23525dc68a7cec3307052 Parents: 6d19df3 Author: Gunther Hagleitner <[email protected]> Authored: Wed Jun 24 21:00:54 2015 -0700 Committer: Gunther Hagleitner <[email protected]> Committed: Wed Jun 24 21:00:54 2015 -0700 ---------------------------------------------------------------------- .../test/resources/testconfiguration.properties | 2 + .../queries/clientpositive/update_all_types.q | 2 + .../queries/clientpositive/update_orig_table.q | 2 + .../queries/clientpositive/vector_coalesce.q | 51 +- .../clientpositive/vector_decimal_expressions.q | 11 +- .../queries/clientpositive/vectorization_0.q | 2 + .../queries/clientpositive/vectorization_1.q | 3 + .../queries/clientpositive/vectorization_10.q | 3 + .../queries/clientpositive/vectorization_11.q | 3 + .../queries/clientpositive/vectorization_12.q | 3 + .../queries/clientpositive/vectorization_13.q | 141 +- .../queries/clientpositive/vectorization_14.q | 2 + .../queries/clientpositive/vectorization_15.q | 2 + .../queries/clientpositive/vectorization_17.q | 51 + .../queries/clientpositive/vectorization_2.q | 3 + .../queries/clientpositive/vectorization_3.q | 3 + .../queries/clientpositive/vectorization_4.q | 3 + .../queries/clientpositive/vectorization_5.q | 3 + .../queries/clientpositive/vectorization_6.q | 3 + .../queries/clientpositive/vectorization_7.q | 79 +- .../queries/clientpositive/vectorization_8.q | 80 +- .../queries/clientpositive/vectorization_9.q | 38 +- .../vectorization_short_regress.q | 419 +-- .../queries/clientpositive/vectorized_casts.q | 2 + .../clientpositive/vectorized_date_funcs.q | 2 + .../clientpositive/spark/vectorization_0.q.out | 8 +- .../clientpositive/spark/vectorization_1.q.out | 8 +- .../clientpositive/spark/vectorization_10.q.out | 428 +-- .../clientpositive/spark/vectorization_11.q.out | 74 +- .../clientpositive/spark/vectorization_12.q.out | 994 +++--- .../clientpositive/spark/vectorization_13.q.out | 414 +-- .../clientpositive/spark/vectorization_14.q.out | 1170 +++---- .../clientpositive/spark/vectorization_15.q.out | 58 +- .../clientpositive/spark/vectorization_17.q.out | 507 +++ .../clientpositive/spark/vectorization_2.q.out | 8 +- .../clientpositive/spark/vectorization_3.q.out | 8 +- .../clientpositive/spark/vectorization_4.q.out | 8 +- .../clientpositive/spark/vectorization_5.q.out | 8 +- .../clientpositive/spark/vectorization_6.q.out | 3042 +++++++++--------- .../clientpositive/spark/vectorization_7.q.out | 328 +- .../clientpositive/spark/vectorization_8.q.out | 314 +- .../clientpositive/spark/vectorization_9.q.out | 957 +++--- .../spark/vectorization_short_regress.q.out | 1224 +++---- .../clientpositive/tez/update_all_types.q.out | 48 +- .../clientpositive/tez/update_orig_table.q.out | 17 +- .../clientpositive/tez/vector_coalesce.q.out | 380 ++- .../tez/vector_decimal_expressions.q.out | 99 +- .../clientpositive/tez/vectorization_0.q.out | 8 +- .../clientpositive/tez/vectorization_1.q.out | 8 +- .../clientpositive/tez/vectorization_10.q.out | 428 +-- .../clientpositive/tez/vectorization_11.q.out | 74 +- .../clientpositive/tez/vectorization_12.q.out | 994 +++--- .../clientpositive/tez/vectorization_13.q.out | 414 +-- .../clientpositive/tez/vectorization_14.q.out | 1170 +++---- .../clientpositive/tez/vectorization_15.q.out | 58 +- .../clientpositive/tez/vectorization_17.q.out | 507 +++ .../clientpositive/tez/vectorization_2.q.out | 8 +- .../clientpositive/tez/vectorization_3.q.out | 8 +- .../clientpositive/tez/vectorization_4.q.out | 8 +- .../clientpositive/tez/vectorization_5.q.out | 8 +- .../clientpositive/tez/vectorization_6.q.out | 3042 +++++++++--------- .../clientpositive/tez/vectorization_7.q.out | 320 +- .../clientpositive/tez/vectorization_8.q.out | 306 +- .../clientpositive/tez/vectorization_9.q.out | 957 +++--- .../tez/vectorization_short_regress.q.out | 1224 +++---- .../clientpositive/tez/vectorized_casts.q.out | 42 +- .../tez/vectorized_date_funcs.q.out | 272 +- .../clientpositive/update_all_types.q.out | 48 +- .../clientpositive/update_orig_table.q.out | 17 +- .../clientpositive/vector_coalesce.q.out | 288 +- .../vector_decimal_expressions.q.out | 73 +- .../clientpositive/vectorization_0.q.out | 8 +- .../clientpositive/vectorization_1.q.out | 8 +- .../clientpositive/vectorization_10.q.out | 428 +-- .../clientpositive/vectorization_11.q.out | 74 +- .../clientpositive/vectorization_12.q.out | 994 +++--- .../clientpositive/vectorization_13.q.out | 414 +-- .../clientpositive/vectorization_14.q.out | 1170 +++---- .../clientpositive/vectorization_15.q.out | 58 +- .../clientpositive/vectorization_17.q.out | 500 +++ .../clientpositive/vectorization_2.q.out | 8 +- .../clientpositive/vectorization_3.q.out | 8 +- .../clientpositive/vectorization_4.q.out | 8 +- .../clientpositive/vectorization_5.q.out | 8 +- .../clientpositive/vectorization_6.q.out | 3042 +++++++++--------- .../clientpositive/vectorization_7.q.out | 312 +- .../clientpositive/vectorization_8.q.out | 298 +- .../clientpositive/vectorization_9.q.out | 957 +++--- .../vectorization_short_regress.q.out | 1224 +++---- .../clientpositive/vectorized_casts.q.out | 42 +- .../clientpositive/vectorized_date_funcs.q.out | 272 +- 91 files changed, 16984 insertions(+), 14146 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties index 14ef33b..0580fee 100644 --- a/itests/src/test/resources/testconfiguration.properties +++ b/itests/src/test/resources/testconfiguration.properties @@ -262,6 +262,7 @@ minitez.query.files.shared=alter_merge_2_orc.q,\ vectorization_14.q,\ vectorization_15.q,\ vectorization_16.q,\ + vectorization_17.q,\ vectorization_2.q,\ vectorization_3.q,\ vectorization_4.q,\ @@ -1064,6 +1065,7 @@ spark.query.files=add_part_multiple.q, \ vectorization_14.q, \ vectorization_15.q, \ vectorization_16.q, \ + vectorization_17.q, \ vectorization_2.q, \ vectorization_3.q, \ vectorization_4.q, \ http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/update_all_types.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/update_all_types.q b/ql/src/test/queries/clientpositive/update_all_types.q index 7da3a9a..262a304 100644 --- a/ql/src/test/queries/clientpositive/update_all_types.q +++ b/ql/src/test/queries/clientpositive/update_all_types.q @@ -2,6 +2,8 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; +-- SORT_QUERY_RESULTS + create table acid_uat(ti tinyint, si smallint, i int, http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/update_orig_table.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/update_orig_table.q b/ql/src/test/queries/clientpositive/update_orig_table.q index 27b4a95..416c841 100644 --- a/ql/src/test/queries/clientpositive/update_orig_table.q +++ b/ql/src/test/queries/clientpositive/update_orig_table.q @@ -5,6 +5,8 @@ set hive.enforce.bucketing=true; dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/update_orig_table; dfs -copyFromLocal ../../data/files/alltypesorc ${system:test.tmp.dir}/update_orig_table/00000_0; +-- SORT_QUERY_RESULTS + create table acid_uot( ctinyint TINYINT, csmallint SMALLINT, http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vector_coalesce.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vector_coalesce.q b/ql/src/test/queries/clientpositive/vector_coalesce.q index eea0f48..c9b8e5a 100644 --- a/ql/src/test/queries/clientpositive/vector_coalesce.q +++ b/ql/src/test/queries/clientpositive/vector_coalesce.q @@ -1,33 +1,52 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; -EXPLAIN SELECT cdouble, cstring1, cint, cfloat, csmallint, coalesce(cdouble, cstring1, cint, cfloat, csmallint) + +-- SORT_QUERY_RESULTS + +EXPLAIN SELECT cdouble, cstring1, cint, cfloat, csmallint, coalesce(cdouble, cstring1, cint, cfloat, csmallint) as c FROM alltypesorc -WHERE (cdouble IS NULL) LIMIT 10; +WHERE (cdouble IS NULL) +ORDER BY cdouble, cstring1, cint, cfloat, csmallint, c +LIMIT 10; -SELECT cdouble, cstring1, cint, cfloat, csmallint, coalesce(cdouble, cstring1, cint, cfloat, csmallint) +SELECT cdouble, cstring1, cint, cfloat, csmallint, coalesce(cdouble, cstring1, cint, cfloat, csmallint) as c FROM alltypesorc -WHERE (cdouble IS NULL) LIMIT 10; +WHERE (cdouble IS NULL) +ORDER BY cdouble, cstring1, cint, cfloat, csmallint, c +LIMIT 10; -EXPLAIN SELECT ctinyint, cdouble, cint, coalesce(ctinyint+10, (cdouble+log2(cint)), 0) +EXPLAIN SELECT ctinyint, cdouble, cint, coalesce(ctinyint+10, (cdouble+log2(cint)), 0) as c FROM alltypesorc -WHERE (ctinyint IS NULL) LIMIT 10; +WHERE (ctinyint IS NULL) +ORDER BY ctinyint, cdouble, cint, c +LIMIT 10; -SELECT ctinyint, cdouble, cint, coalesce(ctinyint+10, (cdouble+log2(cint)), 0) +SELECT ctinyint, cdouble, cint, coalesce(ctinyint+10, (cdouble+log2(cint)), 0) as c FROM alltypesorc -WHERE (ctinyint IS NULL) LIMIT 10; +WHERE (ctinyint IS NULL) +ORDER BY ctinyint, cdouble, cint, c +LIMIT 10; -EXPLAIN SELECT cfloat, cbigint, coalesce(cfloat, cbigint, 0) +EXPLAIN SELECT cfloat, cbigint, coalesce(cfloat, cbigint, 0) as c FROM alltypesorc -WHERE (cfloat IS NULL AND cbigint IS NULL) LIMIT 10; +WHERE (cfloat IS NULL AND cbigint IS NULL) +ORDER BY cfloat, cbigint, c +LIMIT 10; -SELECT cfloat, cbigint, coalesce(cfloat, cbigint, 0) +SELECT cfloat, cbigint, coalesce(cfloat, cbigint, 0) as c FROM alltypesorc -WHERE (cfloat IS NULL AND cbigint IS NULL) LIMIT 10; +WHERE (cfloat IS NULL AND cbigint IS NULL) +ORDER BY cfloat, cbigint, c +LIMIT 10; -EXPLAIN SELECT ctimestamp1, ctimestamp2, coalesce(ctimestamp1, ctimestamp2) +EXPLAIN SELECT ctimestamp1, ctimestamp2, coalesce(ctimestamp1, ctimestamp2) as c FROM alltypesorc -WHERE ctimestamp1 IS NOT NULL OR ctimestamp2 IS NOT NULL LIMIT 10; +WHERE ctimestamp1 IS NOT NULL OR ctimestamp2 IS NOT NULL +ORDER BY ctimestamp1, ctimestamp2, c +LIMIT 10; -SELECT ctimestamp1, ctimestamp2, coalesce(ctimestamp1, ctimestamp2) +SELECT ctimestamp1, ctimestamp2, coalesce(ctimestamp1, ctimestamp2) as c FROM alltypesorc -WHERE ctimestamp1 IS NOT NULL OR ctimestamp2 IS NOT NULL LIMIT 10; +WHERE ctimestamp1 IS NOT NULL OR ctimestamp2 IS NOT NULL +ORDER BY ctimestamp1, ctimestamp2, c +LIMIT 10; http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vector_decimal_expressions.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vector_decimal_expressions.q b/ql/src/test/queries/clientpositive/vector_decimal_expressions.q index 5c232c8..233a732 100644 --- a/ql/src/test/queries/clientpositive/vector_decimal_expressions.q +++ b/ql/src/test/queries/clientpositive/vector_decimal_expressions.q @@ -1,6 +1,13 @@ set hive.explain.user=false; + +-- SORT_QUERY_RESULTS + CREATE TABLE decimal_test STORED AS ORC AS SELECT cdouble, CAST (((cdouble*22.1)/37) AS DECIMAL(20,10)) AS cdecimal1, CAST (((cdouble*9.3)/13) AS DECIMAL(23,14)) AS cdecimal2 FROM alltypesorc; SET hive.vectorized.execution.enabled=true; -EXPLAIN SELECT cdecimal1 + cdecimal2, cdecimal1 - (2*cdecimal2), ((cdecimal1+2.34)/cdecimal2), (cdecimal1 * (cdecimal2/3.4)), cdecimal1 % 10, CAST(cdecimal1 AS INT), CAST(cdecimal2 AS SMALLINT), CAST(cdecimal2 AS TINYINT), CAST(cdecimal1 AS BIGINT), CAST (cdecimal1 AS BOOLEAN), CAST(cdecimal2 AS DOUBLE), CAST(cdecimal1 AS FLOAT), CAST(cdecimal2 AS STRING), CAST(cdecimal1 AS TIMESTAMP) FROM decimal_test WHERE cdecimal1 > 0 AND cdecimal1 < 12345.5678 AND cdecimal2 != 0 AND cdecimal2 > 1000 AND cdouble IS NOT NULL LIMIT 10; +EXPLAIN SELECT cdecimal1 + cdecimal2 as c1, cdecimal1 - (2*cdecimal2) as c2, ((cdecimal1+2.34)/cdecimal2) as c3, (cdecimal1 * (cdecimal2/3.4)) as c4, cdecimal1 % 10 as c5, CAST(cdecimal1 AS INT) as c6, CAST(cdecimal2 AS SMALLINT) as c7, CAST(cdecimal2 AS TINYINT) as c8, CAST(cdecimal1 AS BIGINT) as c9, CAST (cdecimal1 AS BOOLEAN) as c10, CAST(cdecimal2 AS DOUBLE) as c11, CAST(cdecimal1 AS FLOAT) as c12, CAST(cdecimal2 AS STRING) as c13, CAST(cdecimal1 AS TIMESTAMP) as c14 FROM decimal_test WHERE cdecimal1 > 0 AND cdecimal1 < 12345.5678 AND cdecimal2 != 0 AND cdecimal2 > 1000 AND cdouble IS NOT NULL +ORDER BY c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14 +LIMIT 10; -SELECT cdecimal1 + cdecimal2, cdecimal1 - (2*cdecimal2), ((cdecimal1+2.34)/cdecimal2), (cdecimal1 * (cdecimal2/3.4)), cdecimal1 % 10, CAST(cdecimal1 AS INT), CAST(cdecimal2 AS SMALLINT), CAST(cdecimal2 AS TINYINT), CAST(cdecimal1 AS BIGINT), CAST (cdecimal1 AS BOOLEAN), CAST(cdecimal2 AS DOUBLE), CAST(cdecimal1 AS FLOAT), CAST(cdecimal2 AS STRING), CAST(cdecimal1 AS TIMESTAMP) FROM decimal_test WHERE cdecimal1 > 0 AND cdecimal1 < 12345.5678 AND cdecimal2 != 0 AND cdecimal2 > 1000 AND cdouble IS NOT NULL LIMIT 10; +SELECT cdecimal1 + cdecimal2 as c1, cdecimal1 - (2*cdecimal2) as c2, ((cdecimal1+2.34)/cdecimal2) as c3, (cdecimal1 * (cdecimal2/3.4)) as c4, cdecimal1 % 10 as c5, CAST(cdecimal1 AS INT) as c6, CAST(cdecimal2 AS SMALLINT) as c7, CAST(cdecimal2 AS TINYINT) as c8, CAST(cdecimal1 AS BIGINT) as c9, CAST (cdecimal1 AS BOOLEAN) as c10, CAST(cdecimal2 AS DOUBLE) as c11, CAST(cdecimal1 AS FLOAT) as c12, CAST(cdecimal2 AS STRING) as c13, CAST(cdecimal1 AS TIMESTAMP) as c14 FROM decimal_test WHERE cdecimal1 > 0 AND cdecimal1 < 12345.5678 AND cdecimal2 != 0 AND cdecimal2 > 1000 AND cdouble IS NOT NULL +ORDER BY c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14 +LIMIT 10; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_0.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_0.q b/ql/src/test/queries/clientpositive/vectorization_0.q index 08aeff9..d786f74 100644 --- a/ql/src/test/queries/clientpositive/vectorization_0.q +++ b/ql/src/test/queries/clientpositive/vectorization_0.q @@ -1,6 +1,8 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; +-- SORT_QUERY_RESULTS + -- Use ORDER BY clauses to generate 2 stages. EXPLAIN SELECT MIN(ctinyint) as c1, http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_1.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_1.q b/ql/src/test/queries/clientpositive/vectorization_1.q index 745aa06..8fdcb27 100644 --- a/ql/src/test/queries/clientpositive/vectorization_1.q +++ b/ql/src/test/queries/clientpositive/vectorization_1.q @@ -1,4 +1,7 @@ SET hive.vectorized.execution.enabled=true; + +-- SORT_QUERY_RESULTS + SELECT VAR_POP(ctinyint), (VAR_POP(ctinyint) / -26.28), SUM(cfloat), http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_10.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_10.q b/ql/src/test/queries/clientpositive/vectorization_10.q index 720f38d..778250a 100644 --- a/ql/src/test/queries/clientpositive/vectorization_10.q +++ b/ql/src/test/queries/clientpositive/vectorization_10.q @@ -1,4 +1,7 @@ SET hive.vectorized.execution.enabled=true; + +-- SORT_QUERY_RESULTS + SELECT cdouble, ctimestamp1, ctinyint, http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_11.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_11.q b/ql/src/test/queries/clientpositive/vectorization_11.q index 329ed28..4ac42ac 100644 --- a/ql/src/test/queries/clientpositive/vectorization_11.q +++ b/ql/src/test/queries/clientpositive/vectorization_11.q @@ -1,4 +1,7 @@ SET hive.vectorized.execution.enabled=true; + +-- SORT_QUERY_RESULTS + SELECT cstring1, cboolean1, cdouble, http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_12.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_12.q b/ql/src/test/queries/clientpositive/vectorization_12.q index fef62fc..a2737be 100644 --- a/ql/src/test/queries/clientpositive/vectorization_12.q +++ b/ql/src/test/queries/clientpositive/vectorization_12.q @@ -1,4 +1,7 @@ SET hive.vectorized.execution.enabled=true; + +-- SORT_QUERY_RESULTS + SELECT cbigint, cboolean1, cstring1, http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_13.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_13.q b/ql/src/test/queries/clientpositive/vectorization_13.q index 51dc058..831530e 100644 --- a/ql/src/test/queries/clientpositive/vectorization_13.q +++ b/ql/src/test/queries/clientpositive/vectorization_13.q @@ -2,28 +2,30 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=minimal; +-- SORT_QUERY_RESULTS + EXPLAIN SELECT cboolean1, ctinyint, ctimestamp1, cfloat, cstring1, - (-(ctinyint)), - MAX(ctinyint), - ((-(ctinyint)) + MAX(ctinyint)), - SUM(cfloat), - (SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))), - (-(SUM(cfloat))), - (79.553 * cfloat), - STDDEV_POP(cfloat), - (-(SUM(cfloat))), - STDDEV_POP(ctinyint), - (((-(ctinyint)) + MAX(ctinyint)) - 10.175), - (-((-(SUM(cfloat))))), - (-26.28 / (-((-(SUM(cfloat)))))), - MAX(cfloat), - ((SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) / ctinyint), - MIN(ctinyint) + (-(ctinyint)) as c1, + MAX(ctinyint) as c2, + ((-(ctinyint)) + MAX(ctinyint)) as c3, + SUM(cfloat) as c4, + (SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) as c5, + (-(SUM(cfloat))) as c6, + (79.553 * cfloat) as c7, + STDDEV_POP(cfloat) as c8, + (-(SUM(cfloat))) as c9, + STDDEV_POP(ctinyint) as c10, + (((-(ctinyint)) + MAX(ctinyint)) - 10.175) as c11, + (-((-(SUM(cfloat))))) as c12, + (-26.28 / (-((-(SUM(cfloat)))))) as c13, + MAX(cfloat) as c14, + ((SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) / ctinyint) as c15, + MIN(ctinyint) as c16 FROM alltypesorc WHERE (((cfloat < 3569) AND ((10.175 >= cdouble) @@ -32,7 +34,7 @@ WHERE (((cfloat < 3569) AND ((ctimestamp2 != 12) AND (ctinyint < 9763215.5639)))) GROUP BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1 -ORDER BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1 +ORDER BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15, c16 LIMIT 40; SELECT cboolean1, @@ -40,22 +42,22 @@ SELECT cboolean1, ctimestamp1, cfloat, cstring1, - (-(ctinyint)), - MAX(ctinyint), - ((-(ctinyint)) + MAX(ctinyint)), - SUM(cfloat), - (SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))), - (-(SUM(cfloat))), - (79.553 * cfloat), - STDDEV_POP(cfloat), - (-(SUM(cfloat))), - STDDEV_POP(ctinyint), - (((-(ctinyint)) + MAX(ctinyint)) - 10.175), - (-((-(SUM(cfloat))))), - (-26.28 / (-((-(SUM(cfloat)))))), - MAX(cfloat), - ((SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) / ctinyint), - MIN(ctinyint) + (-(ctinyint)) as c1, + MAX(ctinyint) as c2, + ((-(ctinyint)) + MAX(ctinyint)) as c3, + SUM(cfloat) as c4, + (SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) as c5, + (-(SUM(cfloat))) as c6, + (79.553 * cfloat) as c7, + STDDEV_POP(cfloat) as c8, + (-(SUM(cfloat))) as c9, + STDDEV_POP(ctinyint) as c10, + (((-(ctinyint)) + MAX(ctinyint)) - 10.175) as c11, + (-((-(SUM(cfloat))))) as c12, + (-26.28 / (-((-(SUM(cfloat)))))) as c13, + MAX(cfloat) as c14, + ((SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) / ctinyint) as c15, + MIN(ctinyint) as c16 FROM alltypesorc WHERE (((cfloat < 3569) AND ((10.175 >= cdouble) @@ -64,7 +66,7 @@ WHERE (((cfloat < 3569) AND ((ctimestamp2 != 12) AND (ctinyint < 9763215.5639)))) GROUP BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1 -ORDER BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1 +ORDER BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15, c16 LIMIT 40; -- double compare timestamp @@ -74,22 +76,22 @@ SELECT cboolean1, ctimestamp1, cfloat, cstring1, - (-(ctinyint)), - MAX(ctinyint), - ((-(ctinyint)) + MAX(ctinyint)), - SUM(cfloat), - (SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))), - (-(SUM(cfloat))), - (79.553 * cfloat), - STDDEV_POP(cfloat), - (-(SUM(cfloat))), - STDDEV_POP(ctinyint), - (((-(ctinyint)) + MAX(ctinyint)) - 10.175), - (-((-(SUM(cfloat))))), - (-26.28 / (-((-(SUM(cfloat)))))), - MAX(cfloat), - ((SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) / ctinyint), - MIN(ctinyint) + (-(ctinyint)) as c1, + MAX(ctinyint) as c2, + ((-(ctinyint)) + MAX(ctinyint)) as c3, + SUM(cfloat) as c4, + (SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) as c5, + (-(SUM(cfloat))) as c6, + (79.553 * cfloat) as c7, + STDDEV_POP(cfloat) as c8, + (-(SUM(cfloat))) as c9, + STDDEV_POP(ctinyint) as c10, + (((-(ctinyint)) + MAX(ctinyint)) - 10.175) as c11, + (-((-(SUM(cfloat))))) as c12, + (-26.28 / (-((-(SUM(cfloat)))))) as c13, + MAX(cfloat) as c14, + ((SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) / ctinyint) as c15, + MIN(ctinyint) as c16 FROM alltypesorc WHERE (((cfloat < 3569) AND ((10.175 >= cdouble) @@ -98,7 +100,7 @@ WHERE (((cfloat < 3569) AND ((ctimestamp2 != -1.3359999999999999) AND (ctinyint < 9763215.5639)))) GROUP BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1 -ORDER BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1 +ORDER BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15, c16 LIMIT 40; SELECT cboolean1, @@ -106,22 +108,22 @@ SELECT cboolean1, ctimestamp1, cfloat, cstring1, - (-(ctinyint)), - MAX(ctinyint), - ((-(ctinyint)) + MAX(ctinyint)), - SUM(cfloat), - (SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))), - (-(SUM(cfloat))), - (79.553 * cfloat), - STDDEV_POP(cfloat), - (-(SUM(cfloat))), - STDDEV_POP(ctinyint), - (((-(ctinyint)) + MAX(ctinyint)) - 10.175), - (-((-(SUM(cfloat))))), - (-26.28 / (-((-(SUM(cfloat)))))), - MAX(cfloat), - ((SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) / ctinyint), - MIN(ctinyint) + (-(ctinyint)) as c1, + MAX(ctinyint) as c2, + ((-(ctinyint)) + MAX(ctinyint)) as c3, + SUM(cfloat) as c4, + (SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) as c5, + (-(SUM(cfloat))) as c6, + (79.553 * cfloat) as c7, + STDDEV_POP(cfloat) as c8, + (-(SUM(cfloat))) as c9, + STDDEV_POP(ctinyint) as c10, + (((-(ctinyint)) + MAX(ctinyint)) - 10.175) as c11, + (-((-(SUM(cfloat))))) as c12, + (-26.28 / (-((-(SUM(cfloat)))))) as c13, + MAX(cfloat) as c14, + ((SUM(cfloat) * ((-(ctinyint)) + MAX(ctinyint))) / ctinyint) as c15, + MIN(ctinyint) as c16 FROM alltypesorc WHERE (((cfloat < 3569) AND ((10.175 >= cdouble) @@ -130,6 +132,5 @@ WHERE (((cfloat < 3569) AND ((ctimestamp2 != -1.3359999999999999) AND (ctinyint < 9763215.5639)))) GROUP BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1 -ORDER BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1 -LIMIT 40; - +ORDER BY cboolean1, ctinyint, ctimestamp1, cfloat, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15, c16 +LIMIT 40; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_14.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_14.q b/ql/src/test/queries/clientpositive/vectorization_14.q index 3354605..2502fa8 100644 --- a/ql/src/test/queries/clientpositive/vectorization_14.q +++ b/ql/src/test/queries/clientpositive/vectorization_14.q @@ -1,6 +1,8 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; +-- SORT_QUERY_RESULTS + EXPLAIN SELECT ctimestamp1, cfloat, http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_15.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_15.q b/ql/src/test/queries/clientpositive/vectorization_15.q index 4502ec0..1c82475 100644 --- a/ql/src/test/queries/clientpositive/vectorization_15.q +++ b/ql/src/test/queries/clientpositive/vectorization_15.q @@ -1,6 +1,8 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; +-- SORT_QUERY_RESULTS + EXPLAIN SELECT cfloat, cboolean1, http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_17.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_17.q b/ql/src/test/queries/clientpositive/vectorization_17.q new file mode 100644 index 0000000..cb992aa --- /dev/null +++ b/ql/src/test/queries/clientpositive/vectorization_17.q @@ -0,0 +1,51 @@ +set hive.explain.user=false; +SET hive.vectorized.execution.enabled=true; + +-- SORT_QUERY_RESULTS + +EXPLAIN +SELECT cfloat, + cstring1, + cint, + ctimestamp1, + cdouble, + cbigint, + (cfloat / ctinyint), + (cint % cbigint), + (-(cdouble)), + (cdouble + (cfloat / ctinyint)), + (cdouble / cint), + (-((-(cdouble)))), + (9763215.5639 % cbigint), + (2563.58 + (-((-(cdouble))))) +FROM alltypesorc +WHERE (((cbigint > -23) + AND ((cdouble != 988888) + OR (cint > -863.257))) + AND ((ctinyint >= 33) + OR ((csmallint >= cbigint) + OR (cfloat = cdouble)))) +ORDER BY cbigint, cfloat; + +SELECT cfloat, + cstring1, + cint, + ctimestamp1, + cdouble, + cbigint, + (cfloat / ctinyint), + (cint % cbigint), + (-(cdouble)), + (cdouble + (cfloat / ctinyint)), + (cdouble / cint), + (-((-(cdouble)))), + (9763215.5639 % cbigint), + (2563.58 + (-((-(cdouble))))) +FROM alltypesorc +WHERE (((cbigint > -23) + AND ((cdouble != 988888) + OR (cint > -863.257))) + AND ((ctinyint >= 33) + OR ((csmallint >= cbigint) + OR (cfloat = cdouble)))) +ORDER BY cbigint, cfloat; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_2.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_2.q b/ql/src/test/queries/clientpositive/vectorization_2.q index b8647a4..f232815 100644 --- a/ql/src/test/queries/clientpositive/vectorization_2.q +++ b/ql/src/test/queries/clientpositive/vectorization_2.q @@ -1,4 +1,7 @@ SET hive.vectorized.execution.enabled=true; + +-- SORT_QUERY_RESULTS + SELECT AVG(csmallint), (AVG(csmallint) % -563), (AVG(csmallint) + 762), http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_3.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_3.q b/ql/src/test/queries/clientpositive/vectorization_3.q index 1d53994..5423b0b 100644 --- a/ql/src/test/queries/clientpositive/vectorization_3.q +++ b/ql/src/test/queries/clientpositive/vectorization_3.q @@ -1,4 +1,7 @@ SET hive.vectorized.execution.enabled=true; + +-- SORT_QUERY_RESULTS + SELECT STDDEV_SAMP(csmallint), (STDDEV_SAMP(csmallint) - 10.175), STDDEV_POP(ctinyint), http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_4.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_4.q b/ql/src/test/queries/clientpositive/vectorization_4.q index 1eb324d..3151cf0 100644 --- a/ql/src/test/queries/clientpositive/vectorization_4.q +++ b/ql/src/test/queries/clientpositive/vectorization_4.q @@ -1,4 +1,7 @@ SET hive.vectorized.execution.enabled=true; + +-- SORT_QUERY_RESULTS + SELECT SUM(cint), (SUM(cint) * -563), (-3728 + SUM(cint)), http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_5.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_5.q b/ql/src/test/queries/clientpositive/vectorization_5.q index 826b20f..773f4b3 100644 --- a/ql/src/test/queries/clientpositive/vectorization_5.q +++ b/ql/src/test/queries/clientpositive/vectorization_5.q @@ -1,4 +1,7 @@ SET hive.vectorized.execution.enabled=true; + +-- SORT_QUERY_RESULTS + SELECT MAX(csmallint), (MAX(csmallint) * -75), COUNT(*), http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_6.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_6.q b/ql/src/test/queries/clientpositive/vectorization_6.q index 2b59f10..803f592 100644 --- a/ql/src/test/queries/clientpositive/vectorization_6.q +++ b/ql/src/test/queries/clientpositive/vectorization_6.q @@ -1,4 +1,7 @@ SET hive.vectorized.execution.enabled=true; + +-- SORT_QUERY_RESULTS + SELECT cboolean1, cfloat, cstring1, http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_7.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_7.q b/ql/src/test/queries/clientpositive/vectorization_7.q index 7ef3e2e..15ddcfb 100644 --- a/ql/src/test/queries/clientpositive/vectorization_7.q +++ b/ql/src/test/queries/clientpositive/vectorization_7.q @@ -2,6 +2,8 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=minimal; +-- SORT_QUERY_RESULTS + EXPLAIN SELECT cboolean1, cbigint, @@ -9,15 +11,15 @@ SELECT cboolean1, ctinyint, ctimestamp1, cstring1, - (cbigint + cbigint), - (csmallint % -257), - (-(csmallint)), - (-(ctinyint)), - ((-(ctinyint)) + 17), - (cbigint * (-(csmallint))), - (cint % csmallint), - (-(ctinyint)), - ((-(ctinyint)) % ctinyint) + (cbigint + cbigint) as c1, + (csmallint % -257) as c2, + (-(csmallint)) as c3, + (-(ctinyint)) as c4, + ((-(ctinyint)) + 17) as c5, + (cbigint * (-(csmallint))) as c6, + (cint % csmallint) as c7, + (-(ctinyint)) as c8, + ((-(ctinyint)) % ctinyint) as c9 FROM alltypesorc WHERE ((ctinyint != 0) AND (((ctimestamp1 <= 0) @@ -26,6 +28,7 @@ WHERE ((ctinyint != 0) AND ((988888 < cdouble) OR ((ctimestamp2 > -15) AND (3569 >= cdouble))))) +ORDER BY cboolean1, cbigint, csmallint, ctinyint, ctimestamp1, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 25; SELECT cboolean1, @@ -34,15 +37,15 @@ SELECT cboolean1, ctinyint, ctimestamp1, cstring1, - (cbigint + cbigint), - (csmallint % -257), - (-(csmallint)), - (-(ctinyint)), - ((-(ctinyint)) + 17), - (cbigint * (-(csmallint))), - (cint % csmallint), - (-(ctinyint)), - ((-(ctinyint)) % ctinyint) + (cbigint + cbigint) as c1, + (csmallint % -257) as c2, + (-(csmallint)) as c3, + (-(ctinyint)) as c4, + ((-(ctinyint)) + 17) as c5, + (cbigint * (-(csmallint))) as c6, + (cint % csmallint) as c7, + (-(ctinyint)) as c8, + ((-(ctinyint)) % ctinyint) as c9 FROM alltypesorc WHERE ((ctinyint != 0) AND (((ctimestamp1 <= 0) @@ -51,8 +54,10 @@ WHERE ((ctinyint != 0) AND ((988888 < cdouble) OR ((ctimestamp2 > -15) AND (3569 >= cdouble))))) +ORDER BY cboolean1, cbigint, csmallint, ctinyint, ctimestamp1, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 25; + -- double compare timestamp EXPLAIN SELECT cboolean1, @@ -61,15 +66,15 @@ SELECT cboolean1, ctinyint, ctimestamp1, cstring1, - (cbigint + cbigint), - (csmallint % -257), - (-(csmallint)), - (-(ctinyint)), - ((-(ctinyint)) + 17), - (cbigint * (-(csmallint))), - (cint % csmallint), - (-(ctinyint)), - ((-(ctinyint)) % ctinyint) + (cbigint + cbigint) as c1, + (csmallint % -257) as c2, + (-(csmallint)) as c3, + (-(ctinyint)) as c4, + ((-(ctinyint)) + 17) as c5, + (cbigint * (-(csmallint))) as c6, + (cint % csmallint) as c7, + (-(ctinyint)) as c8, + ((-(ctinyint)) % ctinyint) as c9 FROM alltypesorc WHERE ((ctinyint != 0) AND (((ctimestamp1 <= 0.0) @@ -78,6 +83,7 @@ WHERE ((ctinyint != 0) AND ((988888 < cdouble) OR ((ctimestamp2 > 7.6850000000000005) AND (3569 >= cdouble))))) +ORDER BY cboolean1, cbigint, csmallint, ctinyint, ctimestamp1, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 25; SELECT cboolean1, @@ -86,15 +92,15 @@ SELECT cboolean1, ctinyint, ctimestamp1, cstring1, - (cbigint + cbigint), - (csmallint % -257), - (-(csmallint)), - (-(ctinyint)), - ((-(ctinyint)) + 17), - (cbigint * (-(csmallint))), - (cint % csmallint), - (-(ctinyint)), - ((-(ctinyint)) % ctinyint) + (cbigint + cbigint) as c1, + (csmallint % -257) as c2, + (-(csmallint)) as c3, + (-(ctinyint)) as c4, + ((-(ctinyint)) + 17) as c5, + (cbigint * (-(csmallint))) as c6, + (cint % csmallint) as c7, + (-(ctinyint)) as c8, + ((-(ctinyint)) % ctinyint) as c9 FROM alltypesorc WHERE ((ctinyint != 0) AND (((ctimestamp1 <= 0.0) @@ -103,5 +109,6 @@ WHERE ((ctinyint != 0) AND ((988888 < cdouble) OR ((ctimestamp2 > 7.6850000000000005) AND (3569 >= cdouble))))) +ORDER BY cboolean1, cbigint, csmallint, ctinyint, ctimestamp1, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 25; http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_8.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_8.q b/ql/src/test/queries/clientpositive/vectorization_8.q index f50b874..46715ae 100644 --- a/ql/src/test/queries/clientpositive/vectorization_8.q +++ b/ql/src/test/queries/clientpositive/vectorization_8.q @@ -2,21 +2,23 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=minimal; +-- SORT_QUERY_RESULTS + EXPLAIN SELECT ctimestamp1, cdouble, cboolean1, cstring1, cfloat, - (-(cdouble)), - (-5638.15 - cdouble), - (cdouble * -257), - (cint + cfloat), - ((-(cdouble)) + cbigint), - (-(cdouble)), - (-1.389 - cfloat), - (-(cfloat)), - ((-5638.15 - cdouble) + (cint + cfloat)) + (-(cdouble)) as c1, + (-5638.15 - cdouble) as c2, + (cdouble * -257) as c3, + (cint + cfloat) as c4, + ((-(cdouble)) + cbigint) as c5, + (-(cdouble)) as c6, + (-1.389 - cfloat) as c7, + (-(cfloat)) as c8, + ((-5638.15 - cdouble) + (cint + cfloat)) as c9 FROM alltypesorc WHERE (((cstring2 IS NOT NULL) AND ((ctimestamp1 <= 10) @@ -24,6 +26,7 @@ WHERE (((cstring2 IS NOT NULL) OR ((cfloat < -6432) OR ((cboolean1 IS NOT NULL) AND (cdouble = 988888)))) +ORDER BY ctimestamp1, cdouble, cboolean1, cstring1, cfloat, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 20; SELECT ctimestamp1, @@ -31,15 +34,15 @@ SELECT ctimestamp1, cboolean1, cstring1, cfloat, - (-(cdouble)), - (-5638.15 - cdouble), - (cdouble * -257), - (cint + cfloat), - ((-(cdouble)) + cbigint), - (-(cdouble)), - (-1.389 - cfloat), - (-(cfloat)), - ((-5638.15 - cdouble) + (cint + cfloat)) + (-(cdouble)) as c1, + (-5638.15 - cdouble) as c2, + (cdouble * -257) as c3, + (cint + cfloat) as c4, + ((-(cdouble)) + cbigint) as c5, + (-(cdouble)) as c6, + (-1.389 - cfloat) as c7, + (-(cfloat)) as c8, + ((-5638.15 - cdouble) + (cint + cfloat)) as c9 FROM alltypesorc WHERE (((cstring2 IS NOT NULL) AND ((ctimestamp1 <= 10) @@ -47,8 +50,10 @@ WHERE (((cstring2 IS NOT NULL) OR ((cfloat < -6432) OR ((cboolean1 IS NOT NULL) AND (cdouble = 988888)))) +ORDER BY ctimestamp1, cdouble, cboolean1, cstring1, cfloat, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 20; + -- double compare timestamp EXPLAIN SELECT ctimestamp1, @@ -56,15 +61,15 @@ SELECT ctimestamp1, cboolean1, cstring1, cfloat, - (-(cdouble)), - (-5638.15 - cdouble), - (cdouble * -257), - (cint + cfloat), - ((-(cdouble)) + cbigint), - (-(cdouble)), - (-1.389 - cfloat), - (-(cfloat)), - ((-5638.15 - cdouble) + (cint + cfloat)) + (-(cdouble)) as c1, + (-5638.15 - cdouble) as c2, + (cdouble * -257) as c3, + (cint + cfloat) as c4, + ((-(cdouble)) + cbigint) as c5, + (-(cdouble)) as c6, + (-1.389 - cfloat) as c7, + (-(cfloat)) as c8, + ((-5638.15 - cdouble) + (cint + cfloat)) as c9 FROM alltypesorc WHERE (((cstring2 IS NOT NULL) AND ((ctimestamp1 <= 12.503) @@ -72,6 +77,7 @@ WHERE (((cstring2 IS NOT NULL) OR ((cfloat < -6432) OR ((cboolean1 IS NOT NULL) AND (cdouble = 988888)))) +ORDER BY ctimestamp1, cdouble, cboolean1, cstring1, cfloat, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 20; SELECT ctimestamp1, @@ -79,15 +85,15 @@ SELECT ctimestamp1, cboolean1, cstring1, cfloat, - (-(cdouble)), - (-5638.15 - cdouble), - (cdouble * -257), - (cint + cfloat), - ((-(cdouble)) + cbigint), - (-(cdouble)), - (-1.389 - cfloat), - (-(cfloat)), - ((-5638.15 - cdouble) + (cint + cfloat)) + (-(cdouble)) as c1, + (-5638.15 - cdouble) as c2, + (cdouble * -257) as c3, + (cint + cfloat) as c4, + ((-(cdouble)) + cbigint) as c5, + (-(cdouble)) as c6, + (-1.389 - cfloat) as c7, + (-(cfloat)) as c8, + ((-5638.15 - cdouble) + (cint + cfloat)) as c9 FROM alltypesorc WHERE (((cstring2 IS NOT NULL) AND ((ctimestamp1 <= 12.503) @@ -95,4 +101,6 @@ WHERE (((cstring2 IS NOT NULL) OR ((cfloat < -6432) OR ((cboolean1 IS NOT NULL) AND (cdouble = 988888)))) +ORDER BY ctimestamp1, cdouble, cboolean1, cstring1, cfloat, c1, c2, c3, c4, c5, c6, c7, c8, c9 LIMIT 20; + http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_9.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_9.q b/ql/src/test/queries/clientpositive/vectorization_9.q index 5a05e63..84f1faa 100644 --- a/ql/src/test/queries/clientpositive/vectorization_9.q +++ b/ql/src/test/queries/clientpositive/vectorization_9.q @@ -1,6 +1,8 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; +-- SORT_QUERY_RESULTS + EXPLAIN SELECT cstring1, cdouble, @@ -21,26 +23,22 @@ WHERE ((cstring2 LIKE '%b%') OR (cstring1 < 'a'))) GROUP BY cstring1, cdouble, ctimestamp1; -SELECT cfloat, - cstring1, - cint, - ctimestamp1, +SELECT cstring1, cdouble, - cbigint, - (cfloat / ctinyint), - (cint % cbigint), - (-(cdouble)), - (cdouble + (cfloat / ctinyint)), - (cdouble / cint), - (-((-(cdouble)))), - (9763215.5639 % cbigint), - (2563.58 + (-((-(cdouble))))) + ctimestamp1, + (cdouble - 9763215.5639), + (-((cdouble - 9763215.5639))), + COUNT(cdouble), + STDDEV_SAMP(cdouble), + (-(STDDEV_SAMP(cdouble))), + (STDDEV_SAMP(cdouble) * COUNT(cdouble)), + MIN(cdouble), + (9763215.5639 / cdouble), + (COUNT(cdouble) / -1.389), + STDDEV_SAMP(cdouble) FROM alltypesorc -WHERE (((cbigint > -23) - AND ((cdouble != 988888) - OR (cint > -863.257))) - AND ((ctinyint >= 33) - OR ((csmallint >= cbigint) - OR (cfloat = cdouble)))) -ORDER BY cbigint, cfloat; +WHERE ((cstring2 LIKE '%b%') + AND ((cdouble >= -1.389) + OR (cstring1 < 'a'))) +GROUP BY cstring1, cdouble, ctimestamp1; http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorization_short_regress.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorization_short_regress.q b/ql/src/test/queries/clientpositive/vectorization_short_regress.q index ba6e89d..29cdf19 100644 --- a/ql/src/test/queries/clientpositive/vectorization_short_regress.q +++ b/ql/src/test/queries/clientpositive/vectorization_short_regress.q @@ -2,6 +2,8 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=minimal; +-- SORT_QUERY_RESULTS + -- If you look at ql/src/test/org/apache/hadoop/hive/ql/exec/vector/util/OrcFileGenerator.java -- which is the data generation class you'll see that those values are specified in the -- initializeFixedPointValues for each data type. When I created the queries I usedthose values @@ -304,19 +306,19 @@ EXPLAIN SELECT cint, ctimestamp1, csmallint, cbigint, - (-3728 * cbigint), - (-(cint)), - (-863.257 - cint), - (-(csmallint)), - (csmallint - (-(csmallint))), - ((csmallint - (-(csmallint))) + (-(csmallint))), - (cint / cint), - ((-863.257 - cint) - -26.28), - (-(cfloat)), - (cdouble * -89010), - (ctinyint / 988888), - (-(ctinyint)), - (79.553 / ctinyint) + (-3728 * cbigint) as c1, + (-(cint)) as c2, + (-863.257 - cint) as c3, + (-(csmallint)) as c4, + (csmallint - (-(csmallint))) as c5, + ((csmallint - (-(csmallint))) + (-(csmallint))) as c6, + (cint / cint) as c7, + ((-863.257 - cint) - -26.28) as c8, + (-(cfloat)) as c9, + (cdouble * -89010) as c10, + (ctinyint / 988888) as c11, + (-(ctinyint)) as c12, + (79.553 / ctinyint) as c13 FROM alltypesorc WHERE (((cstring1 RLIKE 'a.*') AND (cstring2 LIKE '%ss%')) @@ -327,7 +329,7 @@ WHERE (((cstring1 RLIKE 'a.*') AND (cfloat >= cint)) OR ((cint < cbigint) AND (ctinyint > cbigint))) -ORDER BY cint, cdouble, ctimestamp2, cstring1, cboolean2, ctinyint, cfloat, ctimestamp1, csmallint, cbigint +ORDER BY cint, cdouble, ctimestamp2, cstring1, cboolean2, ctinyint, cfloat, ctimestamp1, csmallint, cbigint, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13 LIMIT 50; SELECT cint, @@ -340,19 +342,19 @@ SELECT cint, ctimestamp1, csmallint, cbigint, - (-3728 * cbigint), - (-(cint)), - (-863.257 - cint), - (-(csmallint)), - (csmallint - (-(csmallint))), - ((csmallint - (-(csmallint))) + (-(csmallint))), - (cint / cint), - ((-863.257 - cint) - -26.28), - (-(cfloat)), - (cdouble * -89010), - (ctinyint / 988888), - (-(ctinyint)), - (79.553 / ctinyint) + (-3728 * cbigint) as c1, + (-(cint)) as c2, + (-863.257 - cint) as c3, + (-(csmallint)) as c4, + (csmallint - (-(csmallint))) as c5, + ((csmallint - (-(csmallint))) + (-(csmallint))) as c6, + (cint / cint) as c7, + ((-863.257 - cint) - -26.28) as c8, + (-(cfloat)) as c9, + (cdouble * -89010) as c10, + (ctinyint / 988888) as c11, + (-(ctinyint)) as c12, + (79.553 / ctinyint) as c13 FROM alltypesorc WHERE (((cstring1 RLIKE 'a.*') AND (cstring2 LIKE '%ss%')) @@ -363,9 +365,10 @@ WHERE (((cstring1 RLIKE 'a.*') AND (cfloat >= cint)) OR ((cint < cbigint) AND (ctinyint > cbigint))) -ORDER BY cint, cdouble, ctimestamp2, cstring1, cboolean2, ctinyint, cfloat, ctimestamp1, csmallint, cbigint +ORDER BY cint, cdouble, ctimestamp2, cstring1, cboolean2, ctinyint, cfloat, ctimestamp1, csmallint, cbigint, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13 LIMIT 50; + -- TargetTypeClasses: Long, String, Double, Bool, Timestamp -- Functions: VarP, Var, StDev, StDevP, Max, Sum -- ArithmeticOps: Divide, Remainder, Subtract, Multiply @@ -381,21 +384,21 @@ EXPLAIN SELECT cint, csmallint, cstring2, cboolean2, - (cint / cbigint), - (cbigint % 79.553), - (-((cint / cbigint))), - (10.175 % cfloat), - (-(cfloat)), - (cfloat - (-(cfloat))), - ((cfloat - (-(cfloat))) % -6432), - (cdouble * csmallint), - (-(cdouble)), - (-(cbigint)), - (cfloat - (cint / cbigint)), - (-(csmallint)), - (3569 % cbigint), - (359 - cdouble), - (-(csmallint)) + (cint / cbigint) as c1, + (cbigint % 79.553) as c2, + (-((cint / cbigint))) as c3, + (10.175 % cfloat) as c4, + (-(cfloat)) as c5, + (cfloat - (-(cfloat))) as c6, + ((cfloat - (-(cfloat))) % -6432) as c7, + (cdouble * csmallint) as c8, + (-(cdouble)) as c9, + (-(cbigint)) as c10, + (cfloat - (cint / cbigint)) as c11, + (-(csmallint)) as c12, + (3569 % cbigint) as c13, + (359 - cdouble) as c14, + (-(csmallint)) as c15 FROM alltypesorc WHERE (((197 > ctinyint) AND (cint = cbigint)) @@ -403,7 +406,7 @@ WHERE (((197 > ctinyint) OR (cboolean1 < 0) OR ((cstring1 LIKE '%ss') AND (cfloat <= ctinyint))) -ORDER BY cint, cbigint, cstring1, cboolean1, cfloat, cdouble, ctimestamp2, csmallint, cstring2, cboolean2 +ORDER BY cint, cbigint, cstring1, cboolean1, cfloat, cdouble, ctimestamp2, csmallint, cstring2, cboolean2, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15 LIMIT 25; SELECT cint, @@ -416,21 +419,21 @@ SELECT cint, csmallint, cstring2, cboolean2, - (cint / cbigint), - (cbigint % 79.553), - (-((cint / cbigint))), - (10.175 % cfloat), - (-(cfloat)), - (cfloat - (-(cfloat))), - ((cfloat - (-(cfloat))) % -6432), - (cdouble * csmallint), - (-(cdouble)), - (-(cbigint)), - (cfloat - (cint / cbigint)), - (-(csmallint)), - (3569 % cbigint), - (359 - cdouble), - (-(csmallint)) + (cint / cbigint) as c1, + (cbigint % 79.553) as c2, + (-((cint / cbigint))) as c3, + (10.175 % cfloat) as c4, + (-(cfloat)) as c5, + (cfloat - (-(cfloat))) as c6, + ((cfloat - (-(cfloat))) % -6432) as c7, + (cdouble * csmallint) as c8, + (-(cdouble)) as c9, + (-(cbigint)) as c10, + (cfloat - (cint / cbigint)) as c11, + (-(csmallint)) as c12, + (3569 % cbigint) as c13, + (359 - cdouble) as c14, + (-(csmallint)) as c15 FROM alltypesorc WHERE (((197 > ctinyint) AND (cint = cbigint)) @@ -438,7 +441,7 @@ WHERE (((197 > ctinyint) OR (cboolean1 < 0) OR ((cstring1 LIKE '%ss') AND (cfloat <= ctinyint))) -ORDER BY cint, cbigint, cstring1, cboolean1, cfloat, cdouble, ctimestamp2, csmallint, cstring2, cboolean2 +ORDER BY cint, cbigint, cstring1, cboolean1, cfloat, cdouble, ctimestamp2, csmallint, cstring2, cboolean2, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15 LIMIT 25; -- TargetTypeClasses: String, Bool, Double, Long, Timestamp @@ -455,19 +458,19 @@ EXPLAIN SELECT cint, cbigint, csmallint, cboolean1, - (cint + csmallint), - (cbigint - ctinyint), - (-(cbigint)), - (-(cfloat)), - ((cbigint - ctinyint) + cbigint), - (cdouble / cdouble), - (-(cdouble)), - ((cint + csmallint) * (-(cbigint))), - ((-(cdouble)) + cbigint), - (-1.389 / ctinyint), - (cbigint % cdouble), - (-(csmallint)), - (csmallint + (cint + csmallint)) + (cint + csmallint) as c1, + (cbigint - ctinyint) as c2, + (-(cbigint)) as c3, + (-(cfloat)) as c4, + ((cbigint - ctinyint) + cbigint) as c5, + (cdouble / cdouble) as c6, + (-(cdouble)) as c7, + ((cint + csmallint) * (-(cbigint))) as c8, + ((-(cdouble)) + cbigint) as c9, + (-1.389 / ctinyint) as c10, + (cbigint % cdouble) as c11, + (-(csmallint)) as c12, + (csmallint + (cint + csmallint)) as c13 FROM alltypesorc WHERE (((csmallint > -26.28) AND (cstring2 LIKE 'ss')) @@ -477,7 +480,7 @@ WHERE (((csmallint > -26.28) OR (ctinyint = -89010) OR ((cbigint <= cfloat) AND (-26.28 <= csmallint))) -ORDER BY cboolean1, cstring1, ctimestamp2, cfloat, cbigint, cstring1, cdouble, cint, csmallint, cdouble +ORDER BY cboolean1, cstring1, ctimestamp2, cfloat, cbigint, cstring1, cdouble, cint, csmallint, cdouble, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13 LIMIT 75; SELECT cint, @@ -489,19 +492,19 @@ SELECT cint, cbigint, csmallint, cboolean1, - (cint + csmallint), - (cbigint - ctinyint), - (-(cbigint)), - (-(cfloat)), - ((cbigint - ctinyint) + cbigint), - (cdouble / cdouble), - (-(cdouble)), - ((cint + csmallint) * (-(cbigint))), - ((-(cdouble)) + cbigint), - (-1.389 / ctinyint), - (cbigint % cdouble), - (-(csmallint)), - (csmallint + (cint + csmallint)) + (cint + csmallint) as c1, + (cbigint - ctinyint) as c2, + (-(cbigint)) as c3, + (-(cfloat)) as c4, + ((cbigint - ctinyint) + cbigint) as c5, + (cdouble / cdouble) as c6, + (-(cdouble)) as c7, + ((cint + csmallint) * (-(cbigint))) as c8, + ((-(cdouble)) + cbigint) as c9, + (-1.389 / ctinyint) as c10, + (cbigint % cdouble) as c11, + (-(csmallint)) as c12, + (csmallint + (cint + csmallint)) as c13 FROM alltypesorc WHERE (((csmallint > -26.28) AND (cstring2 LIKE 'ss')) @@ -511,7 +514,7 @@ WHERE (((csmallint > -26.28) OR (ctinyint = -89010) OR ((cbigint <= cfloat) AND (-26.28 <= csmallint))) -ORDER BY cboolean1, cstring1, ctimestamp2, cfloat, cbigint, cstring1, cdouble, cint, csmallint, cdouble +ORDER BY cboolean1, cstring1, ctimestamp2, cfloat, cbigint, cstring1, cdouble, cint, csmallint, cdouble, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13 LIMIT 75; -- TargetTypeClasses: Long, String, Double, Timestamp @@ -525,16 +528,16 @@ EXPLAIN SELECT ctimestamp1, cfloat, cbigint, csmallint, - (cbigint / 3569), - (-257 - csmallint), - (-6432 * cfloat), - (-(cdouble)), - (cdouble * 10.175), - ((-6432 * cfloat) / cfloat), - (-(cfloat)), - (cint % csmallint), - (-(cdouble)), - (cdouble * (-(cdouble))) + (cbigint / 3569) as c1, + (-257 - csmallint) as c2, + (-6432 * cfloat) as c3, + (-(cdouble)) as c4, + (cdouble * 10.175) as c5, + ((-6432 * cfloat) / cfloat) as c6, + (-(cfloat)) as c7, + (cint % csmallint) as c8, + (-(cdouble)) as c9, + (cdouble * (-(cdouble))) as c10 FROM alltypesorc WHERE (((-1.389 >= cint) AND ((csmallint < ctinyint) @@ -543,7 +546,7 @@ WHERE (((-1.389 >= cint) AND (cstring2 <= 'a')) OR ((cstring1 LIKE 'ss%') AND (10.175 > cbigint))) -ORDER BY csmallint, cstring2, cdouble +ORDER BY csmallint, cstring2, cdouble, cfloat, cbigint, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10 LIMIT 45; SELECT ctimestamp1, @@ -552,16 +555,16 @@ SELECT ctimestamp1, cfloat, cbigint, csmallint, - (cbigint / 3569), - (-257 - csmallint), - (-6432 * cfloat), - (-(cdouble)), - (cdouble * 10.175), - ((-6432 * cfloat) / cfloat), - (-(cfloat)), - (cint % csmallint), - (-(cdouble)), - (cdouble * (-(cdouble))) + (cbigint / 3569) as c1, + (-257 - csmallint) as c2, + (-6432 * cfloat) as c3, + (-(cdouble)) as c4, + (cdouble * 10.175) as c5, + ((-6432 * cfloat) / cfloat) as c6, + (-(cfloat)) as c7, + (cint % csmallint) as c8, + (-(cdouble)) as c9, + (cdouble * (-(cdouble))) as c10 FROM alltypesorc WHERE (((-1.389 >= cint) AND ((csmallint < ctinyint) @@ -570,7 +573,7 @@ WHERE (((-1.389 >= cint) AND (cstring2 <= 'a')) OR ((cstring1 LIKE 'ss%') AND (10.175 > cbigint))) -ORDER BY csmallint, cstring2, cdouble +ORDER BY csmallint, cstring2, cdouble, cfloat, cbigint, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10 LIMIT 45; -- TargetTypeClasses: Double, String, Long @@ -579,43 +582,43 @@ LIMIT 45; -- FilterOps: GreaterThanOrEqual, Equal, LessThanOrEqual -- GroupBy: GroupBy EXPLAIN SELECT csmallint, - (csmallint % -75), - STDDEV_SAMP(csmallint), - (-1.389 / csmallint), - SUM(cbigint), - ((csmallint % -75) / SUM(cbigint)), - (-((csmallint % -75))), - VAR_POP(ctinyint), - (-((-((csmallint % -75))))), - COUNT(*), - (COUNT(*) - -89010) + (csmallint % -75) as c1, + STDDEV_SAMP(csmallint) as c2, + (-1.389 / csmallint) as c3, + SUM(cbigint) as c4, + ((csmallint % -75) / SUM(cbigint)) as c5, + (-((csmallint % -75))) as c6, + VAR_POP(ctinyint) as c7, + (-((-((csmallint % -75))))) as c8, + COUNT(*) as c9, + (COUNT(*) - -89010) as c10 FROM alltypesorc WHERE (((csmallint >= -257)) AND ((-6432 = csmallint) OR ((cint >= cdouble) AND (ctinyint <= cint)))) GROUP BY csmallint -ORDER BY csmallint +ORDER BY csmallint, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10 LIMIT 20; SELECT csmallint, - (csmallint % -75), - STDDEV_SAMP(csmallint), - (-1.389 / csmallint), - SUM(cbigint), - ((csmallint % -75) / SUM(cbigint)), - (-((csmallint % -75))), - VAR_POP(ctinyint), - (-((-((csmallint % -75))))), - COUNT(*), - (COUNT(*) - -89010) + (csmallint % -75) as c1, + STDDEV_SAMP(csmallint) as c2, + (-1.389 / csmallint) as c3, + SUM(cbigint) as c4, + ((csmallint % -75) / SUM(cbigint)) as c5, + (-((csmallint % -75))) as c6, + VAR_POP(ctinyint) as c7, + (-((-((csmallint % -75))))) as c8, + COUNT(*) as c9, + (COUNT(*) - -89010) as c10 FROM alltypesorc WHERE (((csmallint >= -257)) AND ((-6432 = csmallint) OR ((cint >= cdouble) AND (ctinyint <= cint)))) GROUP BY csmallint -ORDER BY csmallint +ORDER BY csmallint, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10 LIMIT 20; -- TargetTypeClasses: Long, Double, Timestamp @@ -683,43 +686,43 @@ ORDER BY cdouble; -- GroupBy: GroupBy EXPLAIN SELECT ctimestamp1, cstring1, - STDDEV_POP(cint), - (STDDEV_POP(cint) * 10.175), - (-(STDDEV_POP(cint))), - AVG(csmallint), - (-(STDDEV_POP(cint))), - (-26.28 - STDDEV_POP(cint)), - COUNT(*), - (-(COUNT(*))), - ((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))), - MIN(ctinyint), - (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*)))), - (-((STDDEV_POP(cint) * 10.175))), - VAR_SAMP(csmallint), - (VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))), - (-((-(STDDEV_POP(cint))))), - ((-(COUNT(*))) / STDDEV_POP(cint)), - VAR_POP(cfloat), - (10.175 / AVG(csmallint)), - AVG(cint), - VAR_SAMP(cfloat), - ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) - (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))), - (-((-((STDDEV_POP(cint) * 10.175))))), - AVG(cfloat), - (((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) - (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) * 10.175), - (10.175 % (10.175 / AVG(csmallint))), - (-(MIN(ctinyint))), - MIN(cdouble), - VAR_POP(csmallint), - (-(((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))))), - ((-(STDDEV_POP(cint))) % AVG(cfloat)), - (-26.28 / (-(MIN(ctinyint)))), - STDDEV_POP(ctinyint), - SUM(cint), - ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) / VAR_POP(cfloat)), - (-((-(COUNT(*))))), - COUNT(*), - ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) % -26.28) + STDDEV_POP(cint) as c1, + (STDDEV_POP(cint) * 10.175) as c2, + (-(STDDEV_POP(cint))) as c3, + AVG(csmallint) as c4, + (-(STDDEV_POP(cint))) as c5, + (-26.28 - STDDEV_POP(cint)) as c6, + COUNT(*) as c7, + (-(COUNT(*))) as c8, + ((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) as c9, + MIN(ctinyint) as c10, + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*)))) as c11, + (-((STDDEV_POP(cint) * 10.175))) as c12, + VAR_SAMP(csmallint) as c13, + (VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) as c14, + (-((-(STDDEV_POP(cint))))) as c15, + ((-(COUNT(*))) / STDDEV_POP(cint)) as c16, + VAR_POP(cfloat) as c17, + (10.175 / AVG(csmallint)) as c18, + AVG(cint) as c19, + VAR_SAMP(cfloat) as c20, + ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) - (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) as c21, + (-((-((STDDEV_POP(cint) * 10.175))))) as c22, + AVG(cfloat) as c23, + (((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) - (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) * 10.175) as c24, + (10.175 % (10.175 / AVG(csmallint))) as c25, + (-(MIN(ctinyint))) as c26, + MIN(cdouble) as c27, + VAR_POP(csmallint) as c28, + (-(((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))))) as c29, + ((-(STDDEV_POP(cint))) % AVG(cfloat)) as c30, + (-26.28 / (-(MIN(ctinyint)))) as c31, + STDDEV_POP(ctinyint) as c32, + SUM(cint) as c33, + ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) / VAR_POP(cfloat)) as c34, + (-((-(COUNT(*))))) as c35, + COUNT(*) as c36, + ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) % -26.28) as c37 FROM alltypesorc WHERE (((ctimestamp1 != 0)) AND ((((-257 != ctinyint) @@ -733,48 +736,48 @@ WHERE (((ctimestamp1 != 0)) OR ((cboolean1 IS NULL) AND (cfloat < cint)))) GROUP BY ctimestamp1, cstring1 -ORDER BY ctimestamp1, cstring1 +ORDER BY ctimestamp1, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15, c16, c17, c18, c19, c20, c21, c22, c23, c24, c25, c26, c27, c28, c29, c30, c31, c32, c33, c34, c35, c36, c37 LIMIT 50; SELECT ctimestamp1, cstring1, - STDDEV_POP(cint), - (STDDEV_POP(cint) * 10.175), - (-(STDDEV_POP(cint))), - AVG(csmallint), - (-(STDDEV_POP(cint))), - (-26.28 - STDDEV_POP(cint)), - COUNT(*), - (-(COUNT(*))), - ((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))), - MIN(ctinyint), - (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*)))), - (-((STDDEV_POP(cint) * 10.175))), - VAR_SAMP(csmallint), - (VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))), - (-((-(STDDEV_POP(cint))))), - ((-(COUNT(*))) / STDDEV_POP(cint)), - VAR_POP(cfloat), - (10.175 / AVG(csmallint)), - AVG(cint), - VAR_SAMP(cfloat), - ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) - (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))), - (-((-((STDDEV_POP(cint) * 10.175))))), - AVG(cfloat), - (((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) - (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) * 10.175), - (10.175 % (10.175 / AVG(csmallint))), - (-(MIN(ctinyint))), - MIN(cdouble), - VAR_POP(csmallint), - (-(((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))))), - ((-(STDDEV_POP(cint))) % AVG(cfloat)), - (-26.28 / (-(MIN(ctinyint)))), - STDDEV_POP(ctinyint), - SUM(cint), - ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) / VAR_POP(cfloat)), - (-((-(COUNT(*))))), - COUNT(*), - ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) % -26.28) + STDDEV_POP(cint) as c1, + (STDDEV_POP(cint) * 10.175) as c2, + (-(STDDEV_POP(cint))) as c3, + AVG(csmallint) as c4, + (-(STDDEV_POP(cint))) as c5, + (-26.28 - STDDEV_POP(cint)) as c6, + COUNT(*) as c7, + (-(COUNT(*))) as c8, + ((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) as c9, + MIN(ctinyint) as c10, + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*)))) as c11, + (-((STDDEV_POP(cint) * 10.175))) as c12, + VAR_SAMP(csmallint) as c13, + (VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) as c14, + (-((-(STDDEV_POP(cint))))) as c15, + ((-(COUNT(*))) / STDDEV_POP(cint)) as c16, + VAR_POP(cfloat) as c17, + (10.175 / AVG(csmallint)) as c18, + AVG(cint) as c19, + VAR_SAMP(cfloat) as c20, + ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) - (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) as c21, + (-((-((STDDEV_POP(cint) * 10.175))))) as c22, + AVG(cfloat) as c23, + (((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) - (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) * 10.175) as c24, + (10.175 % (10.175 / AVG(csmallint))) as c25, + (-(MIN(ctinyint))) as c26, + MIN(cdouble) as c27, + VAR_POP(csmallint) as c28, + (-(((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))))) as c29, + ((-(STDDEV_POP(cint))) % AVG(cfloat)) as c30, + (-26.28 / (-(MIN(ctinyint)))) as c31, + STDDEV_POP(ctinyint) as c32, + SUM(cint) as c33, + ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) / VAR_POP(cfloat)) as c34, + (-((-(COUNT(*))))) as c35, + COUNT(*) as c36, + ((VAR_SAMP(csmallint) + (((-26.28 - STDDEV_POP(cint)) * (-(STDDEV_POP(cint)))) * (-(COUNT(*))))) % -26.28) as c37 FROM alltypesorc WHERE (((ctimestamp1 != 0)) AND ((((-257 != ctinyint) @@ -788,7 +791,7 @@ WHERE (((ctimestamp1 != 0)) OR ((cboolean1 IS NULL) AND (cfloat < cint)))) GROUP BY ctimestamp1, cstring1 -ORDER BY ctimestamp1, cstring1 +ORDER BY ctimestamp1, cstring1, c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15, c16, c17, c18, c19, c20, c21, c22, c23, c24, c25, c26, c27, c28, c29, c30, c31, c32, c33, c34, c35, c36, c37 LIMIT 50; -- TargetTypeClasses: Double, Long, String, Timestamp, Bool http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorized_casts.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorized_casts.q b/ql/src/test/queries/clientpositive/vectorized_casts.q index e0083eb..ade3645 100644 --- a/ql/src/test/queries/clientpositive/vectorized_casts.q +++ b/ql/src/test/queries/clientpositive/vectorized_casts.q @@ -1,6 +1,8 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled = true; +-- SORT_QUERY_RESULTS + -- Test type casting in vectorized mode to verify end-to-end functionality. explain http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/queries/clientpositive/vectorized_date_funcs.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/vectorized_date_funcs.q b/ql/src/test/queries/clientpositive/vectorized_date_funcs.q index f3c07a2..f55ad03 100644 --- a/ql/src/test/queries/clientpositive/vectorized_date_funcs.q +++ b/ql/src/test/queries/clientpositive/vectorized_date_funcs.q @@ -1,6 +1,8 @@ set hive.explain.user=false; SET hive.vectorized.execution.enabled = true; +-- SORT_QUERY_RESULTS + -- Test timestamp functions in vectorized mode to verify they run correctly end-to-end. CREATE TABLE date_udf_flight ( http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/results/clientpositive/spark/vectorization_0.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/vectorization_0.q.out b/ql/src/test/results/clientpositive/spark/vectorization_0.q.out index b2dd09d..d1dc486 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_0.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_0.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: -- Use ORDER BY clauses to generate 2 stages. +PREHOOK: query: -- SORT_QUERY_RESULTS + +-- Use ORDER BY clauses to generate 2 stages. EXPLAIN SELECT MIN(ctinyint) as c1, MAX(ctinyint), @@ -7,7 +9,9 @@ SELECT MIN(ctinyint) as c1, FROM alltypesorc ORDER BY c1 PREHOOK: type: QUERY -POSTHOOK: query: -- Use ORDER BY clauses to generate 2 stages. +POSTHOOK: query: -- SORT_QUERY_RESULTS + +-- Use ORDER BY clauses to generate 2 stages. EXPLAIN SELECT MIN(ctinyint) as c1, MAX(ctinyint), http://git-wip-us.apache.org/repos/asf/hive/blob/63deec40/ql/src/test/results/clientpositive/spark/vectorization_1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/spark/vectorization_1.q.out b/ql/src/test/results/clientpositive/spark/vectorization_1.q.out index 6f428e1..1b2d0e2 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_1.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_1.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: SELECT VAR_POP(ctinyint), +PREHOOK: query: -- SORT_QUERY_RESULTS + +SELECT VAR_POP(ctinyint), (VAR_POP(ctinyint) / -26.28), SUM(cfloat), (-1.389 + SUM(cfloat)), @@ -20,7 +22,9 @@ WHERE (((cdouble > ctinyint) PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### -POSTHOOK: query: SELECT VAR_POP(ctinyint), +POSTHOOK: query: -- SORT_QUERY_RESULTS + +SELECT VAR_POP(ctinyint), (VAR_POP(ctinyint) / -26.28), SUM(cfloat), (-1.389 + SUM(cfloat)),
