This is an automated email from the ASF dual-hosted git repository.
rameshkumar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 5a9e289c864 HIVE-27831: Set hive.cbo.fallback.strategy to NEVER by
default (Ramesh Kumar, Soumyakanti Das reviewed by Stamatis Zampetakis)
5a9e289c864 is described below
commit 5a9e289c8646649136b253841847e578326e41be
Author: Ramesh Kumar <[email protected]>
AuthorDate: Sat Jan 25 04:52:42 2025 -0800
HIVE-27831: Set hive.cbo.fallback.strategy to NEVER by default (Ramesh
Kumar, Soumyakanti Das reviewed by Stamatis Zampetakis)
* HIVE-27831: Set hive.cbo.fallback.strategy to NEVER by default
* Update .q.out files in TestNegativeLlapLocalCliDriver
* Remove redundant tests
* Update .q.out files in TestNegativeLlapLocalCliDriver
---------
Co-authored-by: Stamatis Zampetakis <[email protected]>
---
.../java/org/apache/hadoop/hive/conf/HiveConf.java | 7 +++--
data/conf/hive-site.xml | 7 +----
data/conf/iceberg/llap/hive-site.xml | 5 ----
data/conf/iceberg/tez/hive-site.xml | 5 ----
data/conf/llap/hive-site.xml | 5 ----
data/conf/mr/hive-site.xml | 5 ----
data/conf/tez/hive-site.xml | 5 ----
.../test/queries/positive/delete_iceberg_mixed.q | 1 -
.../src/test/queries/clientpositive/having.q | 1 -
.../hadoop/hive/ql/parse/CBOFallbackStrategy.java | 18 -------------
.../queries/clientnegative/bad_sample_clause.q | 2 --
.../cbo_fallback_never_subquery_exception.q | 5 ----
.../cbo_fallback_test_subquery_exception.q | 6 -----
ql/src/test/queries/clientnegative/sample.q | 1 -
ql/src/test/queries/clientnegative/uniquejoin2.q | 1 -
ql/src/test/queries/clientpositive/ambiguous_col.q | 1 -
.../queries/clientpositive/annotate_stats_filter.q | 1 -
.../annotate_stats_lateral_view_join.q | 1 -
.../queries/clientpositive/annotate_stats_udtf.q | 1 -
.../clientpositive/archive_excludeHadoop20.q | 1 -
ql/src/test/queries/clientpositive/bucket2.q | 1 -
ql/src/test/queries/clientpositive/bucket3.q | 1 -
ql/src/test/queries/clientpositive/bucket4.q | 1 -
ql/src/test/queries/clientpositive/bucket5.q | 1 -
ql/src/test/queries/clientpositive/bucket_many.q | 1 -
.../clientpositive/bucketsortoptimize_insert_1.q | 1 -
.../clientpositive/bucketsortoptimize_insert_2.q | 1 -
.../clientpositive/bucketsortoptimize_insert_3.q | 1 -
.../clientpositive/bucketsortoptimize_insert_4.q | 1 -
.../clientpositive/bucketsortoptimize_insert_5.q | 1 -
.../clientpositive/bucketsortoptimize_insert_6.q | 1 -
.../clientpositive/bucketsortoptimize_insert_7.q | 1 -
.../clientpositive/bucketsortoptimize_insert_8.q | 1 -
.../cbo_fallback_test_semantic_exception.q | 6 -----
ql/src/test/queries/clientpositive/combine3.q | 1 -
ql/src/test/queries/clientpositive/create_view.q | 1 -
ql/src/test/queries/clientpositive/database.q | 1 -
.../clientpositive/disable_merge_for_bucketing.q | 1 -
.../test/queries/clientpositive/explainanalyze_2.q | 1 -
ql/src/test/queries/clientpositive/explainuser_2.q | 1 -
.../test/queries/clientpositive/filter_literals.q | 2 --
.../clientpositive/groupby_grouping_window.q | 1 -
ql/src/test/queries/clientpositive/having.q | 1 -
.../infer_bucket_sort_bucketed_table.q | 1 -
ql/src/test/queries/clientpositive/lateral_view.q | 2 --
.../test/queries/clientpositive/lateral_view_cp.q | 1 -
.../queries/clientpositive/lateral_view_explode2.q | 1 -
.../queries/clientpositive/lateral_view_multi.q | 1 -
.../queries/clientpositive/lateral_view_noalias.q | 1 -
.../queries/clientpositive/lateral_view_onview.q | 1 -
.../queries/clientpositive/lateral_view_onview2.q | 1 -
.../test/queries/clientpositive/lateral_view_ppd.q | 1 -
.../queries/clientpositive/lateral_view_unionall.q | 1 -
.../clientpositive/limit_pushdown_negative.q | 1 -
ql/src/test/queries/clientpositive/lvj_mapjoin.q | 1 -
ql/src/test/queries/clientpositive/masking_5.q | 1 -
ql/src/test/queries/clientpositive/mm_buckets.q | 1 -
.../clientpositive/multi_insert_lateral_view.q | 1 -
.../queries/clientpositive/nested_column_pruning.q | 1 -
ql/src/test/queries/clientpositive/nonmr_fetch.q | 1 -
ql/src/test/queries/clientpositive/prepare_plan.q | 1 -
.../clientpositive/reduce_deduplicate_null_keys.q | 1 -
ql/src/test/queries/clientpositive/sample1.q | 2 --
ql/src/test/queries/clientpositive/sample10.q | 1 -
ql/src/test/queries/clientpositive/sample10_mm.q | 1 -
ql/src/test/queries/clientpositive/sample3.q | 2 --
ql/src/test/queries/clientpositive/sample5.q | 2 --
ql/src/test/queries/clientpositive/sample6.q | 1 -
ql/src/test/queries/clientpositive/sample7.q | 1 -
ql/src/test/queries/clientpositive/sample8.q | 1 -
ql/src/test/queries/clientpositive/sample9.q | 2 --
.../queries/clientpositive/select_column_pruning.q | 1 -
.../queries/clientpositive/skewjoin_mapjoin6.q | 1 -
ql/src/test/queries/clientpositive/skewjoinopt10.q | 1 -
.../test/queries/clientpositive/smb_mapjoin_18.q | 1 -
.../test/queries/clientpositive/smb_mapjoin_19.q | 1 -
.../test/queries/clientpositive/smb_mapjoin_20.q | 1 -
.../test/queries/clientpositive/smb_mapjoin_22.q | 1 -
ql/src/test/queries/clientpositive/stats10.q | 1 -
ql/src/test/queries/clientpositive/tablevalues.q | 1 -
.../test/queries/clientpositive/tez_union_udtf.q | 1 -
ql/src/test/queries/clientpositive/udtf_explode.q | 1 -
.../queries/clientpositive/udtf_parse_url_tuple.q | 1 -
ql/src/test/queries/clientpositive/udtf_stack.q | 1 -
ql/src/test/queries/clientpositive/union26.q | 1 -
.../queries/clientpositive/union_lateralview.q | 2 --
ql/src/test/queries/clientpositive/uniquejoin.q | 2 --
.../vector_groupby_grouping_window.q | 1 -
.../cbo_fallback_never_subquery_exception.q.out | 1 -
.../cbo_fallback_strategy_illegal_00.q.out | 2 +-
.../cbo_fallback_strategy_illegal_01.q.out | 2 +-
.../cbo_fallback_test_subquery_exception.q.out | 1 -
ql/src/test/results/clientnegative/having1.q.out | 2 +-
.../results/clientnegative/invalid_distinct2.q.out | 2 +-
...f_negative_HavingLeadWithNoGBYNoWindowing.q.out | 2 +-
.../clientnegative/selectDistinctWithoutAggr.q.out | 2 +-
.../cbo_fallback_test_semantic_exception.q.out | 31 ----------------------
97 files changed, 10 insertions(+), 195 deletions(-)
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index 21fff90edf4..dd340b1bd59 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -1867,13 +1867,12 @@ public static enum ConfVars {
+ "execution engine doesn't take advantage of statistics stored in
the cache."),
// CBO related
HIVE_CBO_ENABLED("hive.cbo.enable", true, "Flag to control enabling Cost
Based Optimizations using Calcite framework."),
- HIVE_CBO_FALLBACK_STRATEGY("hive.cbo.fallback.strategy", "CONSERVATIVE",
- new StringSet(true, "NEVER", "CONSERVATIVE", "ALWAYS", "TEST"),
+ HIVE_CBO_FALLBACK_STRATEGY("hive.cbo.fallback.strategy", "NEVER",
+ new StringSet(true, "NEVER", "CONSERVATIVE", "ALWAYS"),
"The strategy defines when Hive fallbacks to legacy optimizer when CBO
fails:"
+ "NEVER, never use the legacy optimizer (all CBO errors are
fatal);"
+ "ALWAYS, always use the legacy optimizer (CBO errors are not
fatal);"
- + "CONSERVATIVE, use the legacy optimizer only when the CBO error
is not related to subqueries and views;"
- + "TEST, specific behavior only for tests, do not use in
production"),
+ + "CONSERVATIVE, use the legacy optimizer only when the CBO error
is not related to subqueries and views."),
HIVE_CBO_CNF_NODES_LIMIT("hive.cbo.cnf.maxnodes", -1, "When converting to
conjunctive normal form (CNF), fail if" +
"the expression exceeds this threshold; the threshold is expressed in
terms of number of nodes (leaves and" +
"interior nodes). -1 to not set up a threshold."),
diff --git a/data/conf/hive-site.xml b/data/conf/hive-site.xml
index cd716824bb9..5d858c6840f 100644
--- a/data/conf/hive-site.xml
+++ b/data/conf/hive-site.xml
@@ -325,12 +325,7 @@
<name>hive.scheduled.queries.executor.enabled</name>
<value>false</value>
</property>
-
-<property>
- <name>hive.cbo.fallback.strategy</name>
- <value>TEST</value>
-</property>
-
+
<property>
<name>iceberg.hive.keep.stats</name>
<value>true</value>
diff --git a/data/conf/iceberg/llap/hive-site.xml
b/data/conf/iceberg/llap/hive-site.xml
index e6dedf966e7..4b0ca9a6402 100644
--- a/data/conf/iceberg/llap/hive-site.xml
+++ b/data/conf/iceberg/llap/hive-site.xml
@@ -374,11 +374,6 @@
<value>query</value>
</property>
- <property>
- <name>hive.cbo.fallback.strategy</name>
- <value>TEST</value>
- </property>
-
<property>
<name>iceberg.hive.keep.stats</name>
<value>true</value>
diff --git a/data/conf/iceberg/tez/hive-site.xml
b/data/conf/iceberg/tez/hive-site.xml
index 2fda519cad9..370d36af29a 100644
--- a/data/conf/iceberg/tez/hive-site.xml
+++ b/data/conf/iceberg/tez/hive-site.xml
@@ -298,11 +298,6 @@
<value>query</value>
</property>
-<property>
- <name>hive.cbo.fallback.strategy</name>
- <value>TEST</value>
-</property>
-
<property>
<name>iceberg.hive.keep.stats</name>
<value>true</value>
diff --git a/data/conf/llap/hive-site.xml b/data/conf/llap/hive-site.xml
index 2cf2882b6ef..d89206c7436 100644
--- a/data/conf/llap/hive-site.xml
+++ b/data/conf/llap/hive-site.xml
@@ -388,11 +388,6 @@
<value>false</value>
</property>
-<property>
- <name>hive.cbo.fallback.strategy</name>
- <value>TEST</value>
-</property>
-
<property>
<name>hive.txn.xlock.ctas</name>
<value>false</value>
diff --git a/data/conf/mr/hive-site.xml b/data/conf/mr/hive-site.xml
index 003a661d9b6..3367ef01cab 100644
--- a/data/conf/mr/hive-site.xml
+++ b/data/conf/mr/hive-site.xml
@@ -322,11 +322,6 @@
<value>false</value>
</property>
-<property>
- <name>hive.cbo.fallback.strategy</name>
- <value>TEST</value>
-</property>
-
<property>
<name>iceberg.hive.keep.stats</name>
<value>true</value>
diff --git a/data/conf/tez/hive-site.xml b/data/conf/tez/hive-site.xml
index 7ee04166708..aa1f9147a32 100644
--- a/data/conf/tez/hive-site.xml
+++ b/data/conf/tez/hive-site.xml
@@ -304,11 +304,6 @@
<value>query</value>
</property>
-<property>
- <name>hive.cbo.fallback.strategy</name>
- <value>TEST</value>
-</property>
-
<property>
<name>hive.txn.xlock.ctas</name>
<value>false</value>
diff --git
a/iceberg/iceberg-handler/src/test/queries/positive/delete_iceberg_mixed.q
b/iceberg/iceberg-handler/src/test/queries/positive/delete_iceberg_mixed.q
index 4a4b8fb5726..ee1a5b196a9 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/delete_iceberg_mixed.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/delete_iceberg_mixed.q
@@ -8,7 +8,6 @@
--!
qt:replace:/("iceberg-version":")(\w+\s\w+\s\d+\.\d+\.\d+\s\(\w+\s\w+\))/$1#Masked#/
-- create an unpartitioned table with skip delete data set to false
-set hive.cbo.fallback.strategy=NEVER;
create table ice01 (id int, name string) Stored by Iceberg stored as ORC
TBLPROPERTIES('format-version'='2');
diff --git a/itests/hive-blobstore/src/test/queries/clientpositive/having.q
b/itests/hive-blobstore/src/test/queries/clientpositive/having.q
index fb40c95ff5c..68ccff73720 100644
--- a/itests/hive-blobstore/src/test/queries/clientpositive/having.q
+++ b/itests/hive-blobstore/src/test/queries/clientpositive/having.q
@@ -1,5 +1,4 @@
-- Test HAVING clause
-set hive.cbo.fallback.strategy=NEVER;
DROP TABLE having_blobstore_test;
CREATE TABLE having_blobstore_test(a int, b int, c string)
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/parse/CBOFallbackStrategy.java
b/ql/src/java/org/apache/hadoop/hive/ql/parse/CBOFallbackStrategy.java
index a5f9d9bfff1..6b30bd9142b 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/CBOFallbackStrategy.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/CBOFallbackStrategy.java
@@ -65,24 +65,6 @@ boolean isFatal(Exception e) {
return false;
}
- @Override
- public boolean allowsRetry() {
- return true;
- }
- },
- /**
- * Specific strategy only for tests.
- */
- TEST {
- @Override
- boolean isFatal(Exception e) {
- if (e instanceof CalciteSubquerySemanticException || e instanceof
CalciteViewSemanticException
- || e instanceof CalciteSubqueryRuntimeException) {
- return true;
- }
- return !(e instanceof CalciteSemanticException);
- }
-
@Override
public boolean allowsRetry() {
return true;
diff --git a/ql/src/test/queries/clientnegative/bad_sample_clause.q
b/ql/src/test/queries/clientnegative/bad_sample_clause.q
index ba4d794d31e..c06bb84af95 100644
--- a/ql/src/test/queries/clientnegative/bad_sample_clause.q
+++ b/ql/src/test/queries/clientnegative/bad_sample_clause.q
@@ -1,6 +1,4 @@
--! qt:dataset:srcpart
-set hive.cbo.fallback.strategy=NEVER;
-
CREATE TABLE dest1(key INT, value STRING, dt STRING, hr STRING) STORED AS
TEXTFILE;
INSERT OVERWRITE TABLE dest1 SELECT s.*
diff --git
a/ql/src/test/queries/clientnegative/cbo_fallback_never_subquery_exception.q
b/ql/src/test/queries/clientnegative/cbo_fallback_never_subquery_exception.q
deleted file mode 100644
index fb2c43d6369..00000000000
--- a/ql/src/test/queries/clientnegative/cbo_fallback_never_subquery_exception.q
+++ /dev/null
@@ -1,5 +0,0 @@
---! qt:dataset:part
--- =ALL is not allowed and initially triggers a
CalciteSubquerySemanticException
-set hive.cbo.fallback.strategy=NEVER;
--- In NEVER mode we don't retry on CBO failure so
CalciteSubquerySemanticException should appear in the error
-explain select * from part where p_type = ALL(select max(p_type) from part);
\ No newline at end of file
diff --git
a/ql/src/test/queries/clientnegative/cbo_fallback_test_subquery_exception.q
b/ql/src/test/queries/clientnegative/cbo_fallback_test_subquery_exception.q
deleted file mode 100644
index 37e66da8c6e..00000000000
--- a/ql/src/test/queries/clientnegative/cbo_fallback_test_subquery_exception.q
+++ /dev/null
@@ -1,6 +0,0 @@
---! qt:dataset:part
--- =ALL is not allowed and initially triggers a
CalciteSubquerySemanticException
-set hive.cbo.fallback.strategy=TEST;
--- In TEST mode CalciteSubquerySemanticException is fatal
--- and should be present in the error message
-explain select * from part where p_type = ALL(select max(p_type) from part);
\ No newline at end of file
diff --git a/ql/src/test/queries/clientnegative/sample.q
b/ql/src/test/queries/clientnegative/sample.q
index f561797cb90..7f51f0bcdd5 100644
--- a/ql/src/test/queries/clientnegative/sample.q
+++ b/ql/src/test/queries/clientnegative/sample.q
@@ -1,3 +1,2 @@
--! qt:dataset:srcbucket
-set hive.cbo.fallback.strategy=NEVER;
explain extended SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 5 OUT OF 4 on
key) s
\ No newline at end of file
diff --git a/ql/src/test/queries/clientnegative/uniquejoin2.q
b/ql/src/test/queries/clientnegative/uniquejoin2.q
index 29687d143cc..60f4cc6bc8c 100644
--- a/ql/src/test/queries/clientnegative/uniquejoin2.q
+++ b/ql/src/test/queries/clientnegative/uniquejoin2.q
@@ -1,5 +1,4 @@
--! qt:dataset:src
-set hive.cbo.fallback.strategy=NEVER;
FROM UNIQUEJOIN src a (a.key), PRESERVE src b (b.key, b.val)
SELECT a.key, b.key;
diff --git a/ql/src/test/queries/clientpositive/ambiguous_col.q
b/ql/src/test/queries/clientpositive/ambiguous_col.q
index 4f8bc853c46..f31aca146b5 100644
--- a/ql/src/test/queries/clientpositive/ambiguous_col.q
+++ b/ql/src/test/queries/clientpositive/ambiguous_col.q
@@ -1,7 +1,6 @@
--! qt:dataset:src1
--! qt:dataset:src
set hive.support.quoted.identifiers=none;
-set hive.cbo.fallback.strategy=NEVER;
-- TOK_ALLCOLREF
explain cbo select * from (select a.key, a.* from (select * from src) a join
(select * from src1) b on (a.key = b.key)) t;
explain select * from (select a.key, a.* from (select * from src) a join
(select * from src1) b on (a.key = b.key)) t;
diff --git a/ql/src/test/queries/clientpositive/annotate_stats_filter.q
b/ql/src/test/queries/clientpositive/annotate_stats_filter.q
index a110ea6def8..fdc981804a9 100644
--- a/ql/src/test/queries/clientpositive/annotate_stats_filter.q
+++ b/ql/src/test/queries/clientpositive/annotate_stats_filter.q
@@ -1,6 +1,5 @@
set hive.mapred.mode=nonstrict;
set hive.stats.fetch.column.stats=true;
-set hive.cbo.fallback.strategy=NEVER;
create table if not exists loc_staging (
state string,
diff --git
a/ql/src/test/queries/clientpositive/annotate_stats_lateral_view_join.q
b/ql/src/test/queries/clientpositive/annotate_stats_lateral_view_join.q
index 03f0251c06c..45aca435ee6 100644
--- a/ql/src/test/queries/clientpositive/annotate_stats_lateral_view_join.q
+++ b/ql/src/test/queries/clientpositive/annotate_stats_lateral_view_join.q
@@ -1,5 +1,4 @@
set hive.fetch.task.conversion=none;
-set hive.cbo.fallback.strategy=NEVER;
-- setting up a table with multiple rows
drop table if exists annotate_stats_lateral_view_join_test;
diff --git a/ql/src/test/queries/clientpositive/annotate_stats_udtf.q
b/ql/src/test/queries/clientpositive/annotate_stats_udtf.q
index 90468a0e3a8..0afa5fe090f 100644
--- a/ql/src/test/queries/clientpositive/annotate_stats_udtf.q
+++ b/ql/src/test/queries/clientpositive/annotate_stats_udtf.q
@@ -1,4 +1,3 @@
-set hive.cbo.fallback.strategy=NEVER;
-- setting up a table with multiple rows
drop table if exists HIVE_20262;
create table HIVE_20262 (a array<int>);
diff --git a/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
b/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
index fe13555b673..6f77fa8a005 100644
--- a/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
+++ b/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q
@@ -4,7 +4,6 @@ set hive.mapred.mode=nonstrict;
set hive.archive.enabled = true;
set hive.exec.submitviachild=false;
set hive.exec.submit.local.task.via.child=false;
-set hive.cbo.fallback.strategy=NEVER;
drop table tstsrc_n2;
drop table tstsrcpart_n2;
diff --git a/ql/src/test/queries/clientpositive/bucket2.q
b/ql/src/test/queries/clientpositive/bucket2.q
index 45490f4cf66..c7ecb6e678d 100644
--- a/ql/src/test/queries/clientpositive/bucket2.q
+++ b/ql/src/test/queries/clientpositive/bucket2.q
@@ -2,7 +2,6 @@
set hive.explain.user=false;
;
set hive.exec.reducers.max = 1;
-set hive.cbo.fallback.strategy=NEVER;
-- SORT_QUERY_RESULTS
diff --git a/ql/src/test/queries/clientpositive/bucket3.q
b/ql/src/test/queries/clientpositive/bucket3.q
index c4628e285e1..fd8b2e374a9 100644
--- a/ql/src/test/queries/clientpositive/bucket3.q
+++ b/ql/src/test/queries/clientpositive/bucket3.q
@@ -2,7 +2,6 @@
set hive.explain.user=false;
;
set hive.exec.reducers.max = 1;
-set hive.cbo.fallback.strategy=NEVER;
-- SORT_QUERY_RESULTS
diff --git a/ql/src/test/queries/clientpositive/bucket4.q
b/ql/src/test/queries/clientpositive/bucket4.q
index fa28083323c..e3fe6605577 100644
--- a/ql/src/test/queries/clientpositive/bucket4.q
+++ b/ql/src/test/queries/clientpositive/bucket4.q
@@ -4,7 +4,6 @@ set
hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
;
set hive.exec.reducers.max = 1;
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE bucket4_1(key int, value string) CLUSTERED BY (key) SORTED BY
(key) INTO 2 BUCKETS;
diff --git a/ql/src/test/queries/clientpositive/bucket5.q
b/ql/src/test/queries/clientpositive/bucket5.q
index bf95edfd824..7c3da98ea10 100644
--- a/ql/src/test/queries/clientpositive/bucket5.q
+++ b/ql/src/test/queries/clientpositive/bucket5.q
@@ -7,7 +7,6 @@ set hive.merge.mapfiles = true;
set hive.merge.mapredfiles = true;
set hive.merge.tezfiles = true;
set mapred.reduce.tasks = 2;
-set hive.cbo.fallback.strategy=NEVER;
-- Tests that when a multi insert inserts into a bucketed table and a table
which is not bucketed
-- the bucketed table is not merged and the table which is not bucketed is
diff --git a/ql/src/test/queries/clientpositive/bucket_many.q
b/ql/src/test/queries/clientpositive/bucket_many.q
index 6a2ed55ffd5..8abcdc746b7 100644
--- a/ql/src/test/queries/clientpositive/bucket_many.q
+++ b/ql/src/test/queries/clientpositive/bucket_many.q
@@ -1,7 +1,6 @@
--! qt:dataset:src
;
set mapred.reduce.tasks = 16;
-set hive.cbo.fallback.strategy=NEVER;
create table bucket_many(key int, value string) clustered by (key) into 256
buckets;
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
index 2832ffd9f23..5bfdf48fad8 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_1.q
@@ -9,7 +9,6 @@ set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set hive.auto.convert.sortmerge.join.to.mapjoin=true;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1_n5 (key INT, value STRING) PARTITIONED BY (ds STRING)
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
index 6a134837087..0b913caa8e0 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_2.q
@@ -15,7 +15,6 @@ set
hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop
set hive.auto.convert.sortmerge.join.to.mapjoin=true;
-- disable hash joins
set hive.auto.convert.join.noconditionaltask.size=10;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1_n0 (key INT, value STRING) PARTITIONED BY (ds STRING)
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
index 7dd15a8967a..289d10ec1c7 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_3.q
@@ -9,7 +9,6 @@ set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set hive.auto.convert.sortmerge.join.to.mapjoin=true;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1_n19 (key INT, value STRING) PARTITIONED BY (ds STRING)
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
index 01eb6eb1d37..25bb8727c46 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_4.q
@@ -13,7 +13,6 @@ set hive.merge.mapredfiles=false;
set
hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
set hive.auto.convert.sortmerge.join.to.mapjoin=true;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1_n16 (key INT, value STRING) PARTITIONED BY (ds STRING)
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
index 8cb3b68723d..038c03c0662 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_5.q
@@ -13,7 +13,6 @@ set hive.merge.mapredfiles=false;
set
hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
set hive.auto.convert.sortmerge.join.to.mapjoin=true;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1_n8 (key INT, value STRING) PARTITIONED BY (ds STRING)
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
index 2f82a38fce3..2d4907c5cf1 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_6.q
@@ -13,7 +13,6 @@ set hive.merge.mapredfiles=false;
set
hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
set hive.auto.convert.sortmerge.join.to.mapjoin=true;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1_n3 (key INT, key2 INT, value STRING) PARTITIONED BY
(ds STRING)
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
index ba300deabe7..bef48b2d0a4 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_7.q
@@ -15,7 +15,6 @@ set
hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop
set hive.auto.convert.sortmerge.join.to.mapjoin=true;
-- disable hash joins
set hive.auto.convert.join.noconditionaltask.size=10;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1_n20 (key INT, value STRING) PARTITIONED BY (ds STRING)
diff --git a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
index 2570b796d25..1f66e2035f8 100644
--- a/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
+++ b/ql/src/test/queries/clientpositive/bucketsortoptimize_insert_8.q
@@ -13,7 +13,6 @@ set hive.merge.mapredfiles=false;
set
hive.auto.convert.sortmerge.join.bigtable.selection.policy=org.apache.hadoop.hive.ql.optimizer.LeftmostBigTableSelectorForAutoSMJ;
set hive.auto.convert.sortmerge.join.to.mapjoin=true;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1_n2 (key INT, value STRING) PARTITIONED BY (ds STRING)
diff --git
a/ql/src/test/queries/clientpositive/cbo_fallback_test_semantic_exception.q
b/ql/src/test/queries/clientpositive/cbo_fallback_test_semantic_exception.q
deleted file mode 100644
index 46bb39d27bb..00000000000
--- a/ql/src/test/queries/clientpositive/cbo_fallback_test_semantic_exception.q
+++ /dev/null
@@ -1,6 +0,0 @@
---! qt:dataset:src
-set hive.explain.user=true;
-set hive.cbo.fallback.strategy=TEST;
--- The query generates initially a CalciteSemanticException on CBO but can be
handled by the legacy optimizer
--- The fact that CBO fails should be reflected in the plan
-explain select count(*) from src where key <=> 100;
\ No newline at end of file
diff --git a/ql/src/test/queries/clientpositive/combine3.q
b/ql/src/test/queries/clientpositive/combine3.q
index 47d833137b6..479108f7da3 100644
--- a/ql/src/test/queries/clientpositive/combine3.q
+++ b/ql/src/test/queries/clientpositive/combine3.q
@@ -5,7 +5,6 @@ set mapred.min.split.size=256;
set mapred.min.split.size.per.node=256;
set mapred.min.split.size.per.rack=256;
set mapred.max.split.size=256;
-set hive.cbo.fallback.strategy=NEVER;
drop table combine_3_srcpart_seq_rc;
diff --git a/ql/src/test/queries/clientpositive/create_view.q
b/ql/src/test/queries/clientpositive/create_view.q
index 36a350479b1..b712c2e8994 100644
--- a/ql/src/test/queries/clientpositive/create_view.q
+++ b/ql/src/test/queries/clientpositive/create_view.q
@@ -2,7 +2,6 @@
--! qt:dataset:src1
--! qt:dataset:src
set hive.mapred.mode=nonstrict;
-set hive.cbo.fallback.strategy=NEVER;
DROP VIEW view1;
DROP VIEW view2;
DROP VIEW view3;
diff --git a/ql/src/test/queries/clientpositive/database.q
b/ql/src/test/queries/clientpositive/database.q
index ce1be8501d5..bfa9d1aad32 100644
--- a/ql/src/test/queries/clientpositive/database.q
+++ b/ql/src/test/queries/clientpositive/database.q
@@ -3,7 +3,6 @@
--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.support.concurrency = true;
-set hive.cbo.fallback.strategy=NEVER;
-- SORT_QUERY_RESULTS
diff --git a/ql/src/test/queries/clientpositive/disable_merge_for_bucketing.q
b/ql/src/test/queries/clientpositive/disable_merge_for_bucketing.q
index 40f6e6eb268..eedbf71e046 100644
--- a/ql/src/test/queries/clientpositive/disable_merge_for_bucketing.q
+++ b/ql/src/test/queries/clientpositive/disable_merge_for_bucketing.q
@@ -5,7 +5,6 @@ set
hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
;
set hive.exec.reducers.max = 1;
set hive.merge.mapredfiles=true;
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE bucket2_1_n0(key int, value string) CLUSTERED BY (key) INTO 2
BUCKETS;
diff --git a/ql/src/test/queries/clientpositive/explainanalyze_2.q
b/ql/src/test/queries/clientpositive/explainanalyze_2.q
index ad0f5751d72..7e48a8a2b81 100644
--- a/ql/src/test/queries/clientpositive/explainanalyze_2.q
+++ b/ql/src/test/queries/clientpositive/explainanalyze_2.q
@@ -6,7 +6,6 @@ set hive.map.aggr=false;
set hive.strict.checks.bucketing=false;
set hive.explain.user=true;
-set hive.cbo.fallback.strategy=NEVER;
explain analyze
SELECT x.key, z.value, y.value
diff --git a/ql/src/test/queries/clientpositive/explainuser_2.q
b/ql/src/test/queries/clientpositive/explainuser_2.q
index 6d1e2b3d244..8cc2a41e627 100644
--- a/ql/src/test/queries/clientpositive/explainuser_2.q
+++ b/ql/src/test/queries/clientpositive/explainuser_2.q
@@ -5,7 +5,6 @@ set hive.strict.checks.bucketing=false;
set hive.explain.user=true;
set hive.metastore.aggregate.stats.cache.enabled=false;
-set hive.cbo.fallback.strategy=NEVER;
set hive.optimize.merge.adjacent.union.distinct=false;
-- SORT_QUERY_RESULTS
diff --git a/ql/src/test/queries/clientpositive/filter_literals.q
b/ql/src/test/queries/clientpositive/filter_literals.q
index 9bc38333e81..fc19574e84e 100644
--- a/ql/src/test/queries/clientpositive/filter_literals.q
+++ b/ql/src/test/queries/clientpositive/filter_literals.q
@@ -1,6 +1,4 @@
--! qt:dataset:alltypesorc
-set hive.cbo.fallback.strategy=NEVER;
-
-- test CBO explain plans
explain cbo
select * from alltypesorc where 'foo';
diff --git a/ql/src/test/queries/clientpositive/groupby_grouping_window.q
b/ql/src/test/queries/clientpositive/groupby_grouping_window.q
index 1141b3e3163..7ec8752fbdc 100644
--- a/ql/src/test/queries/clientpositive/groupby_grouping_window.q
+++ b/ql/src/test/queries/clientpositive/groupby_grouping_window.q
@@ -1,5 +1,4 @@
--! qt:dataset:src
-set hive.cbo.fallback.strategy=NEVER;
create table t_n33(category int, live int, comments int);
insert into table t_n33 select key, 0, 2 from src tablesample(3 rows);
diff --git a/ql/src/test/queries/clientpositive/having.q
b/ql/src/test/queries/clientpositive/having.q
index a55f7df19ec..f43f50dbbe8 100644
--- a/ql/src/test/queries/clientpositive/having.q
+++ b/ql/src/test/queries/clientpositive/having.q
@@ -1,7 +1,6 @@
--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.explain.user=false;
-set hive.cbo.fallback.strategy=NEVER;
-- SORT_QUERY_RESULTS
EXPLAIN SELECT count(value) AS c FROM src GROUP BY key HAVING c > 3;
SELECT count(value) AS c FROM src GROUP BY key HAVING c > 3;
diff --git
a/ql/src/test/queries/clientpositive/infer_bucket_sort_bucketed_table.q
b/ql/src/test/queries/clientpositive/infer_bucket_sort_bucketed_table.q
index 5cbb6338a08..0d4fcedc972 100644
--- a/ql/src/test/queries/clientpositive/infer_bucket_sort_bucketed_table.q
+++ b/ql/src/test/queries/clientpositive/infer_bucket_sort_bucketed_table.q
@@ -3,7 +3,6 @@
set hive.exec.infer.bucket.sort=true;
-set hive.cbo.fallback.strategy=NEVER;
-- Test writing to a bucketed table, the output should be bucketed by the
bucketing key into the
-- a number of files equal to the number of buckets
diff --git a/ql/src/test/queries/clientpositive/lateral_view.q
b/ql/src/test/queries/clientpositive/lateral_view.q
index ab05b5c031c..8d7d77f2645 100644
--- a/ql/src/test/queries/clientpositive/lateral_view.q
+++ b/ql/src/test/queries/clientpositive/lateral_view.q
@@ -1,6 +1,4 @@
--! qt:dataset:src
-set hive.cbo.fallback.strategy=NEVER;
-
CREATE TABLE tmp_pyang_lv (inputs string) STORED AS RCFILE;
INSERT OVERWRITE TABLE tmp_pyang_lv SELECT key FROM src;
diff --git a/ql/src/test/queries/clientpositive/lateral_view_cp.q
b/ql/src/test/queries/clientpositive/lateral_view_cp.q
index b4b4739f944..f50bb84f446 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_cp.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_cp.q
@@ -1,5 +1,4 @@
--! qt:dataset:src
-set hive.cbo.fallback.strategy=NEVER;
--HIVE 3226
drop table array_valued_src;
create table array_valued_src (key string, value array<string>);
diff --git a/ql/src/test/queries/clientpositive/lateral_view_explode2.q
b/ql/src/test/queries/clientpositive/lateral_view_explode2.q
index 7fadf893035..edcfd9fbfd3 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_explode2.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_explode2.q
@@ -1,5 +1,4 @@
--! qt:dataset:src
-set hive.cbo.fallback.strategy=NEVER;
add jar
${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
CREATE TEMPORARY FUNCTION explode2 AS
'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2';
diff --git a/ql/src/test/queries/clientpositive/lateral_view_multi.q
b/ql/src/test/queries/clientpositive/lateral_view_multi.q
index 560b1bd5d91..c5edcfd9d68 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_multi.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_multi.q
@@ -1,4 +1,3 @@
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE customer(orders array<string>);
INSERT INTO customer VALUES (ARRAY('0', '1'));
diff --git a/ql/src/test/queries/clientpositive/lateral_view_noalias.q
b/ql/src/test/queries/clientpositive/lateral_view_noalias.q
index 555dba3135d..4690e236cf4 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_noalias.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_noalias.q
@@ -1,7 +1,6 @@
--! qt:dataset:src
--! qt:dataset:part
set hive.fetch.task.conversion=more;
-set hive.cbo.fallback.strategy=NEVER;
--HIVE-2608 Do not require AS a,b,c part in LATERAL VIEW
EXPLAIN SELECT myTab.* from src LATERAL VIEW explode(map('key1', 100, 'key2',
200)) myTab limit 2;
diff --git a/ql/src/test/queries/clientpositive/lateral_view_onview.q
b/ql/src/test/queries/clientpositive/lateral_view_onview.q
index 76f31b99fcd..b97a58ba2d9 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_onview.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_onview.q
@@ -1,5 +1,4 @@
--! qt:dataset:src
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE lv_table_n0( c1 STRING, c2 ARRAY<INT>, c3 INT, c4 CHAR(1));
INSERT OVERWRITE TABLE lv_table_n0 SELECT 'abc ', array(1,2,3), 100, 't' FROM
src;
diff --git a/ql/src/test/queries/clientpositive/lateral_view_onview2.q
b/ql/src/test/queries/clientpositive/lateral_view_onview2.q
index 27a18408329..46e2330308f 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_onview2.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_onview2.q
@@ -1,5 +1,4 @@
--! qt:dataset:src
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE lv_table_n1( c1 STRING, c2 ARRAY<INT>, c3 INT, c4 CHAR(1));
INSERT OVERWRITE TABLE lv_table_n1 SELECT 'abc ', array(1,2,3), 100, 't' FROM
src;
diff --git a/ql/src/test/queries/clientpositive/lateral_view_ppd.q
b/ql/src/test/queries/clientpositive/lateral_view_ppd.q
index e4ce0937c74..8b41e48e0c1 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_ppd.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_ppd.q
@@ -1,7 +1,6 @@
--! qt:dataset:srcpart
--! qt:dataset:src
set hive.optimize.ppd=true;
-set hive.cbo.fallback.strategy=NEVER;
EXPLAIN SELECT value, myCol FROM (SELECT * FROM src LATERAL VIEW
explode(array(1,2,3)) myTable AS myCol) a WHERE key='0';
SELECT value, myCol FROM (SELECT * FROM src LATERAL VIEW explode(array(1,2,3))
myTable AS myCol) a WHERE key='0';
diff --git a/ql/src/test/queries/clientpositive/lateral_view_unionall.q
b/ql/src/test/queries/clientpositive/lateral_view_unionall.q
index 7c089ae2051..d4591e8fdcd 100644
--- a/ql/src/test/queries/clientpositive/lateral_view_unionall.q
+++ b/ql/src/test/queries/clientpositive/lateral_view_unionall.q
@@ -1,4 +1,3 @@
-set hive.cbo.fallback.strategy=NEVER;
create table tez_test_t1(md_exper string);
insert into tez_test_t1 values('tez_test_t1-md_expr');
diff --git a/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
b/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
index c41be2860ad..48f0c2af52b 100644
--- a/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
+++ b/ql/src/test/queries/clientpositive/limit_pushdown_negative.q
@@ -1,7 +1,6 @@
--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.limit.pushdown.memory.usage=0.3f;
-set hive.cbo.fallback.strategy=NEVER;
-- negative, RS + join
explain select * from src a join src b on a.key=b.key limit 20;
diff --git a/ql/src/test/queries/clientpositive/lvj_mapjoin.q
b/ql/src/test/queries/clientpositive/lvj_mapjoin.q
index 5f9dbb8c359..21494d4074e 100644
--- a/ql/src/test/queries/clientpositive/lvj_mapjoin.q
+++ b/ql/src/test/queries/clientpositive/lvj_mapjoin.q
@@ -1,6 +1,5 @@
--! qt:dataset:alltypesorc
set hive.explain.user=false;
-set hive.cbo.fallback.strategy=NEVER;
-- SORT_QUERY_RESULTS
drop table sour1;
diff --git a/ql/src/test/queries/clientpositive/masking_5.q
b/ql/src/test/queries/clientpositive/masking_5.q
index cf5a22d80fd..903afdbb4d9 100644
--- a/ql/src/test/queries/clientpositive/masking_5.q
+++ b/ql/src/test/queries/clientpositive/masking_5.q
@@ -2,7 +2,6 @@
set hive.mapred.mode=nonstrict;
set hive.security.authorization.enabled=true;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
-set hive.cbo.fallback.strategy=NEVER;
create table masking_test_n6 as select cast(key as int) as key, value from src;
diff --git a/ql/src/test/queries/clientpositive/mm_buckets.q
b/ql/src/test/queries/clientpositive/mm_buckets.q
index c0cd8d103c0..5686c8e11e2 100644
--- a/ql/src/test/queries/clientpositive/mm_buckets.q
+++ b/ql/src/test/queries/clientpositive/mm_buckets.q
@@ -8,7 +8,6 @@ set tez.grouping.min-size=1;
set tez.grouping.max-size=2;
set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
-set hive.cbo.fallback.strategy=NEVER;
-- Bucketing tests are slow and some tablesample ones don't work w/o MM
diff --git a/ql/src/test/queries/clientpositive/multi_insert_lateral_view.q
b/ql/src/test/queries/clientpositive/multi_insert_lateral_view.q
index ed27634c861..3442e8246b2 100644
--- a/ql/src/test/queries/clientpositive/multi_insert_lateral_view.q
+++ b/ql/src/test/queries/clientpositive/multi_insert_lateral_view.q
@@ -1,6 +1,5 @@
--! qt:dataset:src
set hive.stats.dbclass=fs;
-set hive.cbo.fallback.strategy=NEVER;
-- SORT_QUERY_RESULTS
create table src_10_n0 as select * from src limit 10;
diff --git a/ql/src/test/queries/clientpositive/nested_column_pruning.q
b/ql/src/test/queries/clientpositive/nested_column_pruning.q
index 00aef84cb0d..e3c3e2a8291 100644
--- a/ql/src/test/queries/clientpositive/nested_column_pruning.q
+++ b/ql/src/test/queries/clientpositive/nested_column_pruning.q
@@ -4,7 +4,6 @@ set hive.test.vectorized.execution.enabled.override=none;
set hive.fetch.task.conversion = none;
set hive.strict.checks.cartesian.product=false;
-set hive.cbo.fallback.strategy=NEVER;
-- First, create source tables
DROP TABLE IF EXISTS dummy_n5;
diff --git a/ql/src/test/queries/clientpositive/nonmr_fetch.q
b/ql/src/test/queries/clientpositive/nonmr_fetch.q
index 10419a8a37d..5b7e61ec005 100644
--- a/ql/src/test/queries/clientpositive/nonmr_fetch.q
+++ b/ql/src/test/queries/clientpositive/nonmr_fetch.q
@@ -4,7 +4,6 @@ set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=minimal;
set hive.exec.submitviachild=false;
set hive.exec.submit.local.task.via.child=false;
-set hive.cbo.fallback.strategy=NEVER;
-- backward compatible (minimal)
explain select * from src limit 10;
diff --git a/ql/src/test/queries/clientpositive/prepare_plan.q
b/ql/src/test/queries/clientpositive/prepare_plan.q
index c39ec866cfd..5b727d415d9 100644
--- a/ql/src/test/queries/clientpositive/prepare_plan.q
+++ b/ql/src/test/queries/clientpositive/prepare_plan.q
@@ -3,7 +3,6 @@
--SORT_QUERY_RESULTS
set hive.explain.user=false;
-set hive.cbo.fallback.strategy=NEVER;
-- single param
explain extended prepare pcount from select count(*) from src where key > ?;
diff --git a/ql/src/test/queries/clientpositive/reduce_deduplicate_null_keys.q
b/ql/src/test/queries/clientpositive/reduce_deduplicate_null_keys.q
index 8ebf9741b28..f86e883e233 100644
--- a/ql/src/test/queries/clientpositive/reduce_deduplicate_null_keys.q
+++ b/ql/src/test/queries/clientpositive/reduce_deduplicate_null_keys.q
@@ -1,7 +1,6 @@
-- HIVE-24104: NPE due to null key columns in ReduceSink after deduplication
-- The query in this test case is not very meaningful but corresponds to a
reduced and anonymized version of a query
-- used in production.
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE TA(id int);
INSERT INTO TA VALUES(10);
diff --git a/ql/src/test/queries/clientpositive/sample1.q
b/ql/src/test/queries/clientpositive/sample1.q
index dc52a7af811..c7dcbbaa656 100644
--- a/ql/src/test/queries/clientpositive/sample1.q
+++ b/ql/src/test/queries/clientpositive/sample1.q
@@ -1,7 +1,5 @@
--! qt:dataset:srcpart
--! qt:dataset:srcbucket
-set hive.cbo.fallback.strategy=NEVER;
-
CREATE TABLE dest1_n89(key INT, value STRING, dt STRING, hr STRING) STORED AS
TEXTFILE;
-- no input pruning, no sample filter
diff --git a/ql/src/test/queries/clientpositive/sample10.q
b/ql/src/test/queries/clientpositive/sample10.q
index c9b36281f06..25e1d3ba52c 100644
--- a/ql/src/test/queries/clientpositive/sample10.q
+++ b/ql/src/test/queries/clientpositive/sample10.q
@@ -8,7 +8,6 @@ set hive.exec.reducers.max=4;
set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
set hive.default.fileformat=RCFILE;
set hive.exec.pre.hooks =
org.apache.hadoop.hive.ql.hooks.PreExecutePrinter,org.apache.hadoop.hive.ql.hooks.EnforceReadOnlyTables,org.apache.hadoop.hive.ql.hooks.UpdateInputAccessTimeHook$PreExec;
-set hive.cbo.fallback.strategy=NEVER;
create table srcpartbucket (key string, value string) partitioned by (ds
string, hr string) clustered by (key) into 4 buckets;
diff --git a/ql/src/test/queries/clientpositive/sample10_mm.q
b/ql/src/test/queries/clientpositive/sample10_mm.q
index e54a3dc42ff..04e3d4b1fad 100644
--- a/ql/src/test/queries/clientpositive/sample10_mm.q
+++ b/ql/src/test/queries/clientpositive/sample10_mm.q
@@ -11,7 +11,6 @@ set hive.exec.pre.hooks =
org.apache.hadoop.hive.ql.hooks.PreExecutePrinter,org.
set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
-set hive.cbo.fallback.strategy=NEVER;
create table srcpartbucket (key string, value string) partitioned by (ds
string, hr string) clustered by (key) into 4 buckets stored as orc
tblproperties ("transactional"="true",
"transactional_properties"="insert_only");
diff --git a/ql/src/test/queries/clientpositive/sample3.q
b/ql/src/test/queries/clientpositive/sample3.q
index f1eba902064..0318e64c225 100644
--- a/ql/src/test/queries/clientpositive/sample3.q
+++ b/ql/src/test/queries/clientpositive/sample3.q
@@ -2,8 +2,6 @@
-- SORT_QUERY_RESULTS
-- no input pruning, sample filter
-set hive.cbo.fallback.strategy=NEVER;
-
EXPLAIN
SELECT s.key
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s;
diff --git a/ql/src/test/queries/clientpositive/sample5.q
b/ql/src/test/queries/clientpositive/sample5.q
index ebba7061cc9..a659f2b5d55 100644
--- a/ql/src/test/queries/clientpositive/sample5.q
+++ b/ql/src/test/queries/clientpositive/sample5.q
@@ -1,6 +1,4 @@
--! qt:dataset:srcbucket
-set hive.cbo.fallback.strategy=NEVER;
-
CREATE TABLE dest1_n69(key INT, value STRING) STORED AS TEXTFILE;
-- SORT_QUERY_RESULTS
diff --git a/ql/src/test/queries/clientpositive/sample6.q
b/ql/src/test/queries/clientpositive/sample6.q
index d1e8eba1dba..292338cb0ba 100644
--- a/ql/src/test/queries/clientpositive/sample6.q
+++ b/ql/src/test/queries/clientpositive/sample6.q
@@ -1,7 +1,6 @@
--! qt:dataset:srcbucket2
--! qt:dataset:srcbucket
set hive.mapred.mode=nonstrict;
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE dest1_n27(key INT, value STRING) STORED AS TEXTFILE;
-- both input pruning and sample filter
diff --git a/ql/src/test/queries/clientpositive/sample7.q
b/ql/src/test/queries/clientpositive/sample7.q
index 307b610f202..dbbd26292ce 100644
--- a/ql/src/test/queries/clientpositive/sample7.q
+++ b/ql/src/test/queries/clientpositive/sample7.q
@@ -1,5 +1,4 @@
--! qt:dataset:srcbucket
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE dest1_n160(key INT, value STRING) STORED AS TEXTFILE;
-- both input pruning and sample filter
diff --git a/ql/src/test/queries/clientpositive/sample8.q
b/ql/src/test/queries/clientpositive/sample8.q
index 67b0e2b844c..33304f4c737 100644
--- a/ql/src/test/queries/clientpositive/sample8.q
+++ b/ql/src/test/queries/clientpositive/sample8.q
@@ -4,7 +4,6 @@
set hive.mapred.mode=nonstrict;
-- sampling with join and alias
-- SORT_QUERY_RESULTS
-set hive.cbo.fallback.strategy=NEVER;
EXPLAIN EXTENDED
SELECT s.*
diff --git a/ql/src/test/queries/clientpositive/sample9.q
b/ql/src/test/queries/clientpositive/sample9.q
index d5837432a69..46949cd282f 100644
--- a/ql/src/test/queries/clientpositive/sample9.q
+++ b/ql/src/test/queries/clientpositive/sample9.q
@@ -1,6 +1,4 @@
--! qt:dataset:srcbucket
-set hive.cbo.fallback.strategy=NEVER;
-
EXPLAIN EXTENDED
SELECT s.*
FROM (SELECT a.* FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2 on key) a) s;
diff --git a/ql/src/test/queries/clientpositive/select_column_pruning.q
b/ql/src/test/queries/clientpositive/select_column_pruning.q
index 940a54f9809..f3f7c377c2e 100644
--- a/ql/src/test/queries/clientpositive/select_column_pruning.q
+++ b/ql/src/test/queries/clientpositive/select_column_pruning.q
@@ -1,5 +1,4 @@
--! qt:dataset:src
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE lv_table1( c1 STRING, c2 ARRAY<INT>, c3 INT, c4 CHAR(1), c5
STRING, c6 STRING, c7 STRING, c8 STRING, c9 STRING, c10 STRING, c11 STRING);
INSERT OVERWRITE TABLE lv_table1 SELECT 'abc ', array(1,2,3), 100, 't',
'test', 'test', 'test', 'test', 'test', 'test', 'test' FROM src;
EXPLAIN SELECT * FROM lv_table1 LATERAL VIEW explode(array(1,2,3)) myTable AS
myCol WHERE c3 = 100 SORT BY c1 ASC, myCol ASC LIMIT 1;
diff --git a/ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q
b/ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q
index f3e3436c497..9923c801bc2 100644
--- a/ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q
+++ b/ql/src/test/queries/clientpositive/skewjoin_mapjoin6.q
@@ -1,7 +1,6 @@
set hive.mapred.mode=nonstrict;
set hive.optimize.skewjoin.compiletime = true;
set hive.auto.convert.join=true;
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE T1_n39(key STRING, value STRING) STORED AS TEXTFILE;
diff --git a/ql/src/test/queries/clientpositive/skewjoinopt10.q
b/ql/src/test/queries/clientpositive/skewjoinopt10.q
index 8459bafd457..3695d17ec41 100644
--- a/ql/src/test/queries/clientpositive/skewjoinopt10.q
+++ b/ql/src/test/queries/clientpositive/skewjoinopt10.q
@@ -1,6 +1,5 @@
set hive.mapred.mode=nonstrict;
set hive.optimize.skewjoin.compiletime = true;
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE T1_n88(key STRING, value STRING) STORED AS TEXTFILE;
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_18.q
b/ql/src/test/queries/clientpositive/smb_mapjoin_18.q
index 19ef5462ce5..64e4b29755c 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_18.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_18.q
@@ -6,7 +6,6 @@ set hive.optimize.bucketmapjoin.sortedmerge = true;
set hive.exec.reducers.max = 1;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1_n7 (key INT, value STRING) PARTITIONED BY (ds STRING)
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_19.q
b/ql/src/test/queries/clientpositive/smb_mapjoin_19.q
index f0caab8f816..8b9c3982e26 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_19.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_19.q
@@ -8,7 +8,6 @@ set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
set hive.metastore.aggregate.stats.cache.enabled=false;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1_n11 (key INT, value STRING) PARTITIONED BY (ds STRING)
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_20.q
b/ql/src/test/queries/clientpositive/smb_mapjoin_20.q
index 6b012b90dd7..94842ba7177 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_20.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_20.q
@@ -8,7 +8,6 @@ set hive.optimize.bucketmapjoin.sortedmerge = true;
set hive.exec.reducers.max = 1;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1 (key int, value STRING) PARTITIONED BY (ds STRING)
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_22.q
b/ql/src/test/queries/clientpositive/smb_mapjoin_22.q
index dac70cc8089..c7fc2d3743f 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_22.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_22.q
@@ -6,7 +6,6 @@ set hive.optimize.bucketmapjoin.sortedmerge = true;
set hive.exec.reducers.max = 1;
set hive.merge.mapfiles=false;
set hive.merge.mapredfiles=false;
-set hive.cbo.fallback.strategy=NEVER;
-- Create two bucketed and sorted tables
CREATE TABLE test_table1_n10 (key INT, value STRING)
diff --git a/ql/src/test/queries/clientpositive/stats10.q
b/ql/src/test/queries/clientpositive/stats10.q
index 9276bc5433e..0fd7054e4b7 100644
--- a/ql/src/test/queries/clientpositive/stats10.q
+++ b/ql/src/test/queries/clientpositive/stats10.q
@@ -4,7 +4,6 @@ set datanucleus.cache.collections=false;
set hive.stats.autogather=true;
;
set hive.exec.reducers.max = 1;
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE bucket3_1_n0(key int, value string) partitioned by (ds string)
CLUSTERED BY (key) INTO 2 BUCKETS;
diff --git a/ql/src/test/queries/clientpositive/tablevalues.q
b/ql/src/test/queries/clientpositive/tablevalues.q
index 910f6454a81..f54f5e05ed8 100644
--- a/ql/src/test/queries/clientpositive/tablevalues.q
+++ b/ql/src/test/queries/clientpositive/tablevalues.q
@@ -2,7 +2,6 @@
-- VALUES -> array(struct(),struct())
-- TABLE -> LATERAL VIEW INLINE
-- SORT_QUERY_RESULTS
-set hive.cbo.fallback.strategy=NEVER;
CREATE TABLE mytbl_n1 AS
diff --git a/ql/src/test/queries/clientpositive/tez_union_udtf.q
b/ql/src/test/queries/clientpositive/tez_union_udtf.q
index bd7f020da66..ed58cfd5508 100644
--- a/ql/src/test/queries/clientpositive/tez_union_udtf.q
+++ b/ql/src/test/queries/clientpositive/tez_union_udtf.q
@@ -1,7 +1,6 @@
--! qt:dataset:src1
--! qt:dataset:src
set hive.merge.tezfiles=true;
-set hive.cbo.fallback.strategy=NEVER;
-- SORT_BEFORE_DIFF
EXPLAIN
diff --git a/ql/src/test/queries/clientpositive/udtf_explode.q
b/ql/src/test/queries/clientpositive/udtf_explode.q
index 358fb9cc0bb..39d429d5911 100644
--- a/ql/src/test/queries/clientpositive/udtf_explode.q
+++ b/ql/src/test/queries/clientpositive/udtf_explode.q
@@ -1,7 +1,6 @@
--! qt:dataset:src
set hive.mapred.mode=nonstrict;
set hive.fetch.task.conversion=more;
-set hive.cbo.fallback.strategy=NEVER;
DESCRIBE FUNCTION explode;
DESCRIBE FUNCTION EXTENDED explode;
diff --git a/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
b/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
index 9aa51220b34..66aab527789 100644
--- a/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
+++ b/ql/src/test/queries/clientpositive/udtf_parse_url_tuple.q
@@ -2,7 +2,6 @@
-- SORT_QUERY_RESULTS
set hive.mapred.mode=nonstrict;
-set hive.cbo.fallback.strategy=NEVER;
create table url_t (key string, fullurl string);
insert overwrite table url_t
diff --git a/ql/src/test/queries/clientpositive/udtf_stack.q
b/ql/src/test/queries/clientpositive/udtf_stack.q
index def0c38f5d5..a7f57daa370 100644
--- a/ql/src/test/queries/clientpositive/udtf_stack.q
+++ b/ql/src/test/queries/clientpositive/udtf_stack.q
@@ -1,5 +1,4 @@
--! qt:dataset:src
-set hive.cbo.fallback.strategy=NEVER;
DESCRIBE FUNCTION stack;
EXPLAIN SELECT x, y FROM src LATERAL VIEW STACK(2, 'x', array(1), 'z') a AS x,
y LIMIT 2;
diff --git a/ql/src/test/queries/clientpositive/union26.q
b/ql/src/test/queries/clientpositive/union26.q
index 4fb30db8e45..1a236d61771 100644
--- a/ql/src/test/queries/clientpositive/union26.q
+++ b/ql/src/test/queries/clientpositive/union26.q
@@ -1,6 +1,5 @@
--! qt:dataset:srcpart
-- SORT_QUERY_RESULTS
-set hive.cbo.fallback.strategy=NEVER;
EXPLAIN
SELECT
diff --git a/ql/src/test/queries/clientpositive/union_lateralview.q
b/ql/src/test/queries/clientpositive/union_lateralview.q
index 63d7b84f310..70d88efdf99 100644
--- a/ql/src/test/queries/clientpositive/union_lateralview.q
+++ b/ql/src/test/queries/clientpositive/union_lateralview.q
@@ -1,7 +1,5 @@
--! qt:dataset:srcpart
--! qt:dataset:src
-
-set hive.cbo.fallback.strategy=NEVER;
create table test_union_lateral_view(key int, arr_ele int, value string);
EXPLAIN
diff --git a/ql/src/test/queries/clientpositive/uniquejoin.q
b/ql/src/test/queries/clientpositive/uniquejoin.q
index d3892dfe80c..e365896f618 100644
--- a/ql/src/test/queries/clientpositive/uniquejoin.q
+++ b/ql/src/test/queries/clientpositive/uniquejoin.q
@@ -1,5 +1,3 @@
-set hive.cbo.fallback.strategy=NEVER;
-
CREATE TABLE T1_n1(key STRING, val STRING) STORED AS TEXTFILE;
CREATE TABLE T2_n1(key STRING, val STRING) STORED AS TEXTFILE;
CREATE TABLE T3_n0(key STRING, val STRING) STORED AS TEXTFILE;
diff --git
a/ql/src/test/queries/clientpositive/vector_groupby_grouping_window.q
b/ql/src/test/queries/clientpositive/vector_groupby_grouping_window.q
index 2c21601bad0..78f16234313 100644
--- a/ql/src/test/queries/clientpositive/vector_groupby_grouping_window.q
+++ b/ql/src/test/queries/clientpositive/vector_groupby_grouping_window.q
@@ -5,7 +5,6 @@ SET hive.vectorized.execution.reduce.enabled=true;
set hive.vectorized.execution.ptf.enabled=true;
set hive.fetch.task.conversion=none;
set hive.cli.print.header=true;
-set hive.cbo.fallback.strategy=NEVER;
create table t_n15(category int, live int, comments int) stored as orc;
insert into table t_n15 select key, 0, 2 from src tablesample(3 rows);
diff --git
a/ql/src/test/results/clientnegative/cbo_fallback_never_subquery_exception.q.out
b/ql/src/test/results/clientnegative/cbo_fallback_never_subquery_exception.q.out
deleted file mode 100644
index 1ba4191ca07..00000000000
---
a/ql/src/test/results/clientnegative/cbo_fallback_never_subquery_exception.q.out
+++ /dev/null
@@ -1 +0,0 @@
-FAILED: CalciteSubquerySemanticException [Error 10250]: Invalid SubQuery
expression Invalid operator:=
diff --git
a/ql/src/test/results/clientnegative/cbo_fallback_strategy_illegal_00.q.out
b/ql/src/test/results/clientnegative/cbo_fallback_strategy_illegal_00.q.out
index 74b00526f25..427ed8552fb 100644
--- a/ql/src/test/results/clientnegative/cbo_fallback_strategy_illegal_00.q.out
+++ b/ql/src/test/results/clientnegative/cbo_fallback_strategy_illegal_00.q.out
@@ -1 +1 @@
-Query returned non-zero code: 1, cause: 'SET hive.cbo.fallback.strategy=never'
FAILED in validation : Invalid value.. expects one of [NEVER, CONSERVATIVE,
ALWAYS, TEST].
+Query returned non-zero code: 1, cause: 'SET hive.cbo.fallback.strategy=never'
FAILED in validation : Invalid value.. expects one of [NEVER, CONSERVATIVE,
ALWAYS].
diff --git
a/ql/src/test/results/clientnegative/cbo_fallback_strategy_illegal_01.q.out
b/ql/src/test/results/clientnegative/cbo_fallback_strategy_illegal_01.q.out
index f96a08ab3d0..2e300b9254f 100644
--- a/ql/src/test/results/clientnegative/cbo_fallback_strategy_illegal_01.q.out
+++ b/ql/src/test/results/clientnegative/cbo_fallback_strategy_illegal_01.q.out
@@ -1 +1 @@
-Query returned non-zero code: 1, cause: 'SET hive.cbo.fallback.strategy=NONE'
FAILED in validation : Invalid value.. expects one of [NEVER, CONSERVATIVE,
ALWAYS, TEST].
+Query returned non-zero code: 1, cause: 'SET hive.cbo.fallback.strategy=NONE'
FAILED in validation : Invalid value.. expects one of [NEVER, CONSERVATIVE,
ALWAYS].
diff --git
a/ql/src/test/results/clientnegative/cbo_fallback_test_subquery_exception.q.out
b/ql/src/test/results/clientnegative/cbo_fallback_test_subquery_exception.q.out
deleted file mode 100644
index 1ba4191ca07..00000000000
---
a/ql/src/test/results/clientnegative/cbo_fallback_test_subquery_exception.q.out
+++ /dev/null
@@ -1 +0,0 @@
-FAILED: CalciteSubquerySemanticException [Error 10250]: Invalid SubQuery
expression Invalid operator:=
diff --git a/ql/src/test/results/clientnegative/having1.q.out
b/ql/src/test/results/clientnegative/having1.q.out
index 31e12c59995..26d00dc1e2c 100644
--- a/ql/src/test/results/clientnegative/having1.q.out
+++ b/ql/src/test/results/clientnegative/having1.q.out
@@ -1 +1 @@
-FAILED: SemanticException HAVING specified without GROUP BY
+FAILED: CalciteSemanticException Having clause without any group-by.
diff --git a/ql/src/test/results/clientnegative/invalid_distinct2.q.out
b/ql/src/test/results/clientnegative/invalid_distinct2.q.out
index c08b1c350ca..912acc17239 100644
--- a/ql/src/test/results/clientnegative/invalid_distinct2.q.out
+++ b/ql/src/test/results/clientnegative/invalid_distinct2.q.out
@@ -1 +1 @@
-FAILED: SemanticException 2:15 Distinct keyword is not support in current
context. Error encountered near token 'value'
+FAILED: CalciteSemanticException Distinct without an aggregation.
diff --git
a/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q.out
b/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q.out
index 31e12c59995..26d00dc1e2c 100644
---
a/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q.out
+++
b/ql/src/test/results/clientnegative/ptf_negative_HavingLeadWithNoGBYNoWindowing.q.out
@@ -1 +1 @@
-FAILED: SemanticException HAVING specified without GROUP BY
+FAILED: CalciteSemanticException Having clause without any group-by.
diff --git a/ql/src/test/results/clientnegative/selectDistinctWithoutAggr.q.out
b/ql/src/test/results/clientnegative/selectDistinctWithoutAggr.q.out
index a6dbb6fef99..912acc17239 100644
--- a/ql/src/test/results/clientnegative/selectDistinctWithoutAggr.q.out
+++ b/ql/src/test/results/clientnegative/selectDistinctWithoutAggr.q.out
@@ -1 +1 @@
-FAILED: SemanticException 4:7 Distinct keyword is not support in current
context. Error encountered near token 'key'
+FAILED: CalciteSemanticException Distinct without an aggregation.
diff --git
a/ql/src/test/results/clientpositive/llap/cbo_fallback_test_semantic_exception.q.out
b/ql/src/test/results/clientpositive/llap/cbo_fallback_test_semantic_exception.q.out
deleted file mode 100644
index 3b6531ad2ba..00000000000
---
a/ql/src/test/results/clientpositive/llap/cbo_fallback_test_semantic_exception.q.out
+++ /dev/null
@@ -1,31 +0,0 @@
-PREHOOK: query: explain select count(*) from src where key <=> 100
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-#### A masked pattern was here ####
-POSTHOOK: query: explain select count(*) from src where key <=> 100
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-#### A masked pattern was here ####
-Plan optimized by CBO.
-
-Vertex dependency in root stage
-Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
-
-Stage-0
- Fetch Operator
- limit:-1
- Stage-1
- Reducer 2 vectorized, llap
- File Output Operator [FS_14]
- Group By Operator [GBY_13] (rows=1 width=8)
- Output:["_col0"],aggregations:["count(VALUE._col0)"]
- <-Map 1 [CUSTOM_SIMPLE_EDGE] vectorized, llap
- PARTITION_ONLY_SHUFFLE [RS_12]
- Group By Operator [GBY_11] (rows=1 width=8)
- Output:["_col0"],aggregations:["count()"]
- Select Operator [SEL_10] (rows=250 width=87)
- Filter Operator [FIL_9] (rows=250 width=87)
- predicate:(UDFToDouble(key) IS NOT DISTINCT FROM 100.0D)
- TableScan [TS_0] (rows=500 width=87)
- default@src,src,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
-
