diff --git a/ql/src/test/queries/clientpositive/ambiguitycheck.q b/ql/src/test/queries/clientpositive/ambiguitycheck.q index 3b029e1..2334bc6 100644 --- a/ql/src/test/queries/clientpositive/ambiguitycheck.q +++ b/ql/src/test/queries/clientpositive/ambiguitycheck.q @@ -1,5 +1,3 @@ -set hive.cbo.enable=false; - -- check cluster/distribute/partitionBy SELECT * FROM SRC x where x.key = 20 CLUSTER BY (key,value) ; diff --git a/ql/src/test/queries/clientpositive/groupby_grouping_sets6.q b/ql/src/test/queries/clientpositive/groupby_grouping_sets6.q index a500795..882608b 100644 --- a/ql/src/test/queries/clientpositive/groupby_grouping_sets6.q +++ b/ql/src/test/queries/clientpositive/groupby_grouping_sets6.q @@ -3,7 +3,6 @@ CREATE TABLE T1(a STRING, b STRING, c STRING) ROW FORMAT DELIMITED FIELDS TERMIN LOAD DATA LOCAL INPATH '../../data/files/grouping_sets.txt' INTO TABLE T1; set hive.optimize.ppd = false; -set hive.cbo.enable = false; -- This filter is not pushed down EXPLAIN diff --git a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q index dd425f4..b3ee414 100644 --- a/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q +++ b/ql/src/test/queries/clientpositive/hybridgrace_hashjoin_2.q @@ -149,4 +149,7 @@ JOIN src y1 ON (x.key = y1.key) JOIN srcpart z2 ON (x.value = z2.value) JOIN src y2 ON (x.value = y2.value) WHERE z1.key < 'zzzzzzzz' AND z2.key < 'zzzzzzzzzz' - AND y1.value < 'zzzzzzzz' AND y2.value < 'zzzzzzzzzz'; \ No newline at end of file + AND y1.value < 'zzzzzzzz' AND y2.value < 'zzzzzzzzzz'; + + +reset hive.cbo.enable; diff --git a/ql/src/test/queries/clientpositive/ql_rewrite_gbtoidx.q b/ql/src/test/queries/clientpositive/ql_rewrite_gbtoidx.q index 59703c7..240e74e 100644 --- a/ql/src/test/queries/clientpositive/ql_rewrite_gbtoidx.q +++ b/ql/src/test/queries/clientpositive/ql_rewrite_gbtoidx.q @@ -170,4 +170,6 @@ select key, count(key) from tbl group by key order by key; set hive.optimize.index.groupby=true; explain select key, count(key) from tbl group by key order by key; select key, count(key) from tbl group by key order by key; -DROP TABLE tbl; \ No newline at end of file +DROP TABLE tbl; + +reset hive.cbo.enable; diff --git a/ql/src/test/queries/clientpositive/selectDistinctStar.q b/ql/src/test/queries/clientpositive/selectDistinctStar.q index 300d7e0..c1c1c0b 100644 --- a/ql/src/test/queries/clientpositive/selectDistinctStar.q +++ b/ql/src/test/queries/clientpositive/selectDistinctStar.q @@ -50,8 +50,6 @@ on src1.key=src2.key; select distinct * from (select distinct * from src)src1; -set hive.cbo.enable=false; - explain select distinct src.* from src; select distinct src.* from src; diff --git a/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q b/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q index 028acdb..3685b1e 100644 --- a/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q +++ b/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q @@ -85,8 +85,6 @@ select * from t10; select * from t11; select * from t12; -set hive.cbo.enable=false; - -- NaN explain select percentile_approx(case when key < 100 then cast('NaN' as double) else key end, 0.5) from bucket; diff --git a/ql/src/test/queries/clientpositive/union35.q b/ql/src/test/queries/clientpositive/union35.q index 9445711..c2a311e 100644 --- a/ql/src/test/queries/clientpositive/union35.q +++ b/ql/src/test/queries/clientpositive/union35.q @@ -1,5 +1,3 @@ -set hive.cbo.enable=true; - select * from ( select * from ( select 1 as id , 'foo' as str_1 from src tablesample(5 rows)) f union all diff --git a/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out b/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out index ebb8046..d807d44 100644 --- a/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out +++ b/ql/src/test/results/clientpositive/groupby_grouping_sets6.q.out @@ -37,20 +37,23 @@ STAGE PLANS: TableScan alias: t1 Statistics: Num rows: 1 Data size: 36 Basic stats: COMPLETE Column stats: NONE - Select Operator - expressions: a (type: string), b (type: string) - outputColumnNames: a, b + Filter Operator + predicate: (UDFToDouble(a) = 5.0) (type: boolean) Statistics: Num rows: 1 Data size: 36 Basic stats: COMPLETE Column stats: NONE - Group By Operator - keys: a (type: string), b (type: string), '0' (type: string) - mode: hash - outputColumnNames: _col0, _col1, _col2 - Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE - Reduce Output Operator - key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) - sort order: +++ - Map-reduce partition columns: _col0 (type: string), _col1 (type: string), _col2 (type: string) + Select Operator + expressions: '5' (type: string), b (type: string) + outputColumnNames: _col0, _col1 + Statistics: Num rows: 1 Data size: 36 Basic stats: COMPLETE Column stats: NONE + Group By Operator + keys: _col0 (type: string), _col1 (type: string), '0' (type: string) + mode: hash + outputColumnNames: _col0, _col1, _col2 Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE + Reduce Output Operator + key expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string) + sort order: +++ + Map-reduce partition columns: _col0 (type: string), _col1 (type: string), _col2 (type: string) + Statistics: Num rows: 2 Data size: 72 Basic stats: COMPLETE Column stats: NONE Reduce Operator Tree: Group By Operator keys: KEY._col0 (type: string), KEY._col1 (type: string), KEY._col2 (type: string) @@ -58,20 +61,13 @@ STAGE PLANS: outputColumnNames: _col0, _col1 Statistics: Num rows: 1 Data size: 36 Basic stats: COMPLETE Column stats: NONE pruneGroupingSetId: true - Filter Operator - predicate: (_col0 = 5) (type: boolean) + File Output Operator + compressed: false Statistics: Num rows: 1 Data size: 36 Basic stats: COMPLETE Column stats: NONE - Select Operator - expressions: '5' (type: string), _col1 (type: string) - outputColumnNames: _col0, _col1 - Statistics: Num rows: 1 Data size: 36 Basic stats: COMPLETE Column stats: NONE - File Output Operator - compressed: false - Statistics: Num rows: 1 Data size: 36 Basic stats: COMPLETE Column stats: NONE - table: - input format: org.apache.hadoop.mapred.TextInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat - serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + table: + input format: org.apache.hadoop.mapred.TextInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Stage: Stage-0 Fetch Operator diff --git a/ql/src/test/results/clientpositive/udaf_percentile_approx_23.q.out b/ql/src/test/results/clientpositive/udaf_percentile_approx_23.q.out index 14a6874..588f848 100644 --- a/ql/src/test/results/clientpositive/udaf_percentile_approx_23.q.out +++ b/ql/src/test/results/clientpositive/udaf_percentile_approx_23.q.out @@ -524,11 +524,11 @@ STAGE PLANS: alias: bucket Statistics: Num rows: 726 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Select Operator - expressions: key (type: double) - outputColumnNames: key + expressions: CASE WHEN ((key < 100.0)) THEN (NaN) ELSE (key) END (type: double) + outputColumnNames: _col0 Statistics: Num rows: 726 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Group By Operator - aggregations: percentile_approx(CASE WHEN ((key < 100.0)) THEN (UDFToDouble('NaN')) ELSE (key) END, 0.5) + aggregations: percentile_approx(_col0, 0.5) mode: hash outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE @@ -586,10 +586,10 @@ STAGE PLANS: Statistics: Num rows: 726 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: double) - outputColumnNames: key + outputColumnNames: _col0 Statistics: Num rows: 726 Data size: 5812 Basic stats: COMPLETE Column stats: NONE Group By Operator - aggregations: percentile_approx(key, 0.5) + aggregations: percentile_approx(_col0, 0.5) mode: hash outputColumnNames: _col0 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE