Repository: hive Updated Branches: refs/heads/master ebd2c5f8a -> 4ec256c23
http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q index a5f5522..f933545 100644 --- a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q +++ b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_2.q @@ -4,7 +4,6 @@ set hive.optimize.listbucketing=true; set mapred.input.dir.recursive=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- SORT_QUERY_RESULTS -- List bucketing query logic test case. We simulate the directory structure by DML here. http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q index 4020063..d5f6a26 100644 --- a/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q +++ b/ql/src/test/queries/clientpositive/list_bucket_query_multiskew_3.q @@ -4,7 +4,6 @@ set hive.optimize.listbucketing=true; set mapred.input.dir.recursive=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- List bucketing query logic test case. We simulate the directory structure by DML here. -- Test condition: http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q index 54ab75e..fc5815c 100644 --- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q +++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_1.q @@ -4,7 +4,6 @@ set hive.optimize.listbucketing=true; set mapred.input.dir.recursive=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- SORT_QUERY_RESULTS -- List bucketing query logic test case. http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q index 77974cf..bc4f96c 100644 --- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q +++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_2.q @@ -4,7 +4,6 @@ set hive.optimize.listbucketing=true; set mapred.input.dir.recursive=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- SORT_QUERY_RESULTS -- List bucketing query logic test case. http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q index bf6b227..64193f1 100644 --- a/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q +++ b/ql/src/test/queries/clientpositive/list_bucket_query_oneskew_3.q @@ -4,7 +4,6 @@ set hive.optimize.listbucketing=true; set mapred.input.dir.recursive=true; set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- SORT_QUERY_RESULTS -- List bucketing query logic test case. http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/loadpart_err.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/loadpart_err.q b/ql/src/test/queries/clientpositive/loadpart_err.q deleted file mode 100644 index 1204622..0000000 --- a/ql/src/test/queries/clientpositive/loadpart_err.q +++ /dev/null @@ -1,21 +0,0 @@ ---! qt:dataset:src -set hive.cli.errors.ignore=true; - -ADD FILE ../../data/scripts/error_script; - --- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20S, 0.23) --- (this test is flaky so it is currently disabled for all Hadoop versions) - -CREATE TABLE loadpart1(a STRING, b STRING) PARTITIONED BY (ds STRING); - -INSERT OVERWRITE TABLE loadpart1 PARTITION (ds='2009-01-01') -SELECT TRANSFORM(src.key, src.value) USING 'error_script' AS (tkey, tvalue) -FROM src; - -DESCRIBE loadpart1; -SHOW PARTITIONS loadpart1; - -LOAD DATA LOCAL INPATH '../../data1/files/kv1.txt' INTO TABLE loadpart1 PARTITION(ds='2009-05-05'); -SHOW PARTITIONS loadpart1; - - http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/recursive_dir.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/recursive_dir.q b/ql/src/test/queries/clientpositive/recursive_dir.q index 2b25f60..33b2186 100644 --- a/ql/src/test/queries/clientpositive/recursive_dir.q +++ b/ql/src/test/queries/clientpositive/recursive_dir.q @@ -1,5 +1,4 @@ --! qt:dataset:src --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) CREATE TABLE fact_daily_n1(x int) PARTITIONED BY (ds STRING); CREATE TABLE fact_tz_n0(x int) PARTITIONED BY (ds STRING, hr STRING) http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/sample10.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/sample10.q b/ql/src/test/queries/clientpositive/sample10.q index b0aab14..e566a17 100644 --- a/ql/src/test/queries/clientpositive/sample10.q +++ b/ql/src/test/queries/clientpositive/sample10.q @@ -10,7 +10,6 @@ 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; --- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.17, 0.18, 0.19) create table srcpartbucket (key string, value string) partitioned by (ds string, hr string) clustered by (key) into 4 buckets; http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q b/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q index 1518529..8eb4a86 100644 --- a/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q +++ b/ql/src/test/queries/clientpositive/sample_islocalmode_hook.q @@ -10,7 +10,6 @@ set mapred.min.split.size.per.rack=300; set hive.exec.mode.local.auto=true; set hive.merge.smallfiles.avgsize=1; --- EXCLUDE_HADOOP_MAJOR_VERSIONS( 0.20S) -- create file inputs create table sih_i_part (key int, value string) partitioned by (p string); http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/sample_islocalmode_hook_hadoop20.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/sample_islocalmode_hook_hadoop20.q b/ql/src/test/queries/clientpositive/sample_islocalmode_hook_hadoop20.q deleted file mode 100644 index 803ca91..0000000 --- a/ql/src/test/queries/clientpositive/sample_islocalmode_hook_hadoop20.q +++ /dev/null @@ -1,42 +0,0 @@ ---! qt:dataset:src -USE default; - -set hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat; -set mapred.max.split.size=300; -set mapred.min.split.size=300; -set mapred.min.split.size.per.node=300; -set mapred.min.split.size.per.rack=300; -set hive.exec.mode.local.auto=true; -set hive.merge.smallfiles.avgsize=1; - --- INCLUDE_HADOOP_MAJOR_VERSIONS( 0.20S) --- This test sets mapred.max.split.size=300 and hive.merge.smallfiles.avgsize=1 --- in an attempt to force the generation of multiple splits and multiple output files. --- However, Hadoop 0.20 is incapable of generating splits smaller than the block size --- when using CombineFileInputFormat, so only one split is generated. This has a --- significant impact on the results of the TABLESAMPLE(x PERCENT). This issue was --- fixed in MAPREDUCE-2046 which is included in 0.22. - --- create file inputs -create table sih_i_part_n0 (key int, value string) partitioned by (p string); -insert overwrite table sih_i_part_n0 partition (p='1') select key, value from src; -insert overwrite table sih_i_part_n0 partition (p='2') select key+10000, value from src; -insert overwrite table sih_i_part_n0 partition (p='3') select key+20000, value from src; -create table sih_src_n0 as select key, value from sih_i_part_n0 order by key, value; -create table sih_src2_n0 as select key, value from sih_src_n0 order by key, value; - -set hive.exec.post.hooks = org.apache.hadoop.hive.ql.hooks.VerifyIsLocalModeHook ; -set mapred.job.tracker=localhost:58; -set hive.exec.mode.local.auto.input.files.max=1; - --- Sample split, running locally limited by num tasks -select count(1) from sih_src_n0 tablesample(1 percent); - --- sample two tables -select count(1) from sih_src_n0 tablesample(1 percent)a join sih_src2_n0 tablesample(1 percent)b on a.key = b.key; - -set hive.exec.mode.local.auto.inputbytes.max=1000; -set hive.exec.mode.local.auto.input.files.max=4; - --- sample split, running locally limited by max bytes -select count(1) from sih_src_n0 tablesample(1 percent); http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/sample_islocalmode_hook_use_metadata.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/sample_islocalmode_hook_use_metadata.q b/ql/src/test/queries/clientpositive/sample_islocalmode_hook_use_metadata.q index 1675263..a08d0c5 100644 --- a/ql/src/test/queries/clientpositive/sample_islocalmode_hook_use_metadata.q +++ b/ql/src/test/queries/clientpositive/sample_islocalmode_hook_use_metadata.q @@ -11,7 +11,6 @@ set hive.exec.mode.local.auto=true; set hive.merge.smallfiles.avgsize=1; set hive.compute.query.using.stats=true; --- EXCLUDE_HADOOP_MAJOR_VERSIONS( 0.20S) -- create file inputs create table sih_i_part_n1 (key int, value string) partitioned by (p string); http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q b/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q index 9d5571b..2db13f0 100644 --- a/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q +++ b/ql/src/test/queries/clientpositive/skewjoin_union_remove_1.q @@ -13,7 +13,6 @@ set mapred.input.dir.recursive=true; -- Union of 2 map-reduce subqueries is performed for the skew join -- There is no need to write the temporary results of the sub-queries, and then read them -- again to process the union. The union can be removed completely. --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output, it might be easier to run the test -- only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q b/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q index 06ebfdc..2a41e3a 100644 --- a/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q +++ b/ql/src/test/queries/clientpositive/skewjoin_union_remove_2.q @@ -27,7 +27,6 @@ LOAD DATA LOCAL INPATH '../../data/files/T3.txt' INTO TABLE T3_n2; -- Union of 3 map-reduce subqueries is performed for the skew join -- There is no need to write the temporary results of the sub-queries, and then read them -- again to process the union. The union can be removed completely. --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/stats_list_bucket.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/stats_list_bucket.q b/ql/src/test/queries/clientpositive/stats_list_bucket.q index c4339d0..bbb4206 100644 --- a/ql/src/test/queries/clientpositive/stats_list_bucket.q +++ b/ql/src/test/queries/clientpositive/stats_list_bucket.q @@ -1,6 +1,5 @@ --! qt:dataset:src --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) drop table stats_list_bucket; drop table stats_list_bucket_1; http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q b/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q index f7498aa..eb08af1 100644 --- a/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q +++ b/ql/src/test/queries/clientpositive/truncate_column_list_bucket.q @@ -8,7 +8,6 @@ set mapred.input.dir.recursive=true; -- Tests truncating a column from a list bucketing table --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) CREATE TABLE test_tab_n3 (key STRING, value STRING) PARTITIONED BY (part STRING) STORED AS RCFILE; http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/uber_reduce.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/uber_reduce.q b/ql/src/test/queries/clientpositive/uber_reduce.q index c6bbf60..a8b1e36 100644 --- a/ql/src/test/queries/clientpositive/uber_reduce.q +++ b/ql/src/test/queries/clientpositive/uber_reduce.q @@ -3,7 +3,6 @@ SET mapreduce.job.ubertask.maxreduces=1; SET mapred.reduce.tasks=1; -- Uberized mode is a YARN option, ignore this test for non-YARN Hadoop versions --- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20S) CREATE TABLE T1_n136(key STRING, val STRING); LOAD DATA LOCAL INPATH '../../data/files/T1.txt' INTO TABLE T1_n136; http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/udaf_percentile_approx_20.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/udaf_percentile_approx_20.q b/ql/src/test/queries/clientpositive/udaf_percentile_approx_20.q deleted file mode 100644 index 8fca1c9..0000000 --- a/ql/src/test/queries/clientpositive/udaf_percentile_approx_20.q +++ /dev/null @@ -1,87 +0,0 @@ -set hive.strict.checks.bucketing=false; - --- INCLUDE_HADOOP_MAJOR_VERSIONS( 0.20S) - -CREATE TABLE bucket (key double, value string) CLUSTERED BY (key) SORTED BY (key DESC) INTO 4 BUCKETS STORED AS TEXTFILE; -load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket; -load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket; -load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket; -load data local inpath '../../data/files/auto_sortmerge_join/big/000003_0' INTO TABLE bucket; - -create table t1_n10 (result double); -create table t2_n6 (result double); -create table t3_n3 (result double); -create table t4_n0 (result double); -create table t5 (result double); -create table t6 (result double); -create table t7_n0 (result array<double>); -create table t8 (result array<double>); -create table t9 (result array<double>); -create table t10 (result array<double>); -create table t11 (result array<double>); -create table t12 (result array<double>); - -set hive.input.format = org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat; -set hive.map.aggr=false; --- disable map-side aggregation -FROM bucket -insert overwrite table t1_n10 SELECT percentile_approx(cast(key AS double), 0.5) -insert overwrite table t2_n6 SELECT percentile_approx(cast(key AS double), 0.5, 100) -insert overwrite table t3_n3 SELECT percentile_approx(cast(key AS double), 0.5, 1000) - -insert overwrite table t4_n0 SELECT percentile_approx(cast(key AS int), 0.5) -insert overwrite table t5 SELECT percentile_approx(cast(key AS int), 0.5, 100) -insert overwrite table t6 SELECT percentile_approx(cast(key AS int), 0.5, 1000) - -insert overwrite table t7_n0 SELECT percentile_approx(cast(key AS double), array(0.05,0.5,0.95,0.98)) -insert overwrite table t8 SELECT percentile_approx(cast(key AS double), array(0.05,0.5,0.95,0.98), 100) -insert overwrite table t9 SELECT percentile_approx(cast(key AS double), array(0.05,0.5,0.95,0.98), 1000) - -insert overwrite table t10 SELECT percentile_approx(cast(key AS int), array(0.05,0.5,0.95,0.98)) -insert overwrite table t11 SELECT percentile_approx(cast(key AS int), array(0.05,0.5,0.95,0.98), 100) -insert overwrite table t12 SELECT percentile_approx(cast(key AS int), array(0.05,0.5,0.95,0.98), 1000); - -select * from t1_n10; -select * from t2_n6; -select * from t3_n3; -select * from t4_n0; -select * from t5; -select * from t6; -select * from t7_n0; -select * from t8; -select * from t9; -select * from t10; -select * from t11; -select * from t12; - -set hive.map.aggr=true; --- enable map-side aggregation -FROM bucket -insert overwrite table t1_n10 SELECT percentile_approx(cast(key AS double), 0.5) -insert overwrite table t2_n6 SELECT percentile_approx(cast(key AS double), 0.5, 100) -insert overwrite table t3_n3 SELECT percentile_approx(cast(key AS double), 0.5, 1000) - -insert overwrite table t4_n0 SELECT percentile_approx(cast(key AS int), 0.5) -insert overwrite table t5 SELECT percentile_approx(cast(key AS int), 0.5, 100) -insert overwrite table t6 SELECT percentile_approx(cast(key AS int), 0.5, 1000) - -insert overwrite table t7_n0 SELECT percentile_approx(cast(key AS double), array(0.05,0.5,0.95,0.98)) -insert overwrite table t8 SELECT percentile_approx(cast(key AS double), array(0.05,0.5,0.95,0.98), 100) -insert overwrite table t9 SELECT percentile_approx(cast(key AS double), array(0.05,0.5,0.95,0.98), 1000) - -insert overwrite table t10 SELECT percentile_approx(cast(key AS int), array(0.05,0.5,0.95,0.98)) -insert overwrite table t11 SELECT percentile_approx(cast(key AS int), array(0.05,0.5,0.95,0.98), 100) -insert overwrite table t12 SELECT percentile_approx(cast(key AS int), array(0.05,0.5,0.95,0.98), 1000); - -select * from t1_n10; -select * from t2_n6; -select * from t3_n3; -select * from t4_n0; -select * from t5; -select * from t6; -select * from t7_n0; -select * from t8; -select * from t9; -select * from t10; -select * from t11; -select * from t12; http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q ---------------------------------------------------------------------- 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 db1fc88..bce38ef 100644 --- a/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q +++ b/ql/src/test/queries/clientpositive/udaf_percentile_approx_23.q @@ -1,7 +1,6 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- 0.23 changed input order of data in reducer task, which affects result of percentile_approx CREATE TABLE bucket_n0 (key double, value string) CLUSTERED BY (key) SORTED BY (key DESC) INTO 4 BUCKETS STORED AS TEXTFILE; http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_1.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_1.q b/ql/src/test/queries/clientpositive/union_remove_1.q index 0a69068..7276804 100644 --- a/ql/src/test/queries/clientpositive/union_remove_1.q +++ b/ql/src/test/queries/clientpositive/union_remove_1.q @@ -14,7 +14,6 @@ set mapred.input.dir.recursive=true; -- again to process the union. The union can be removed completely. -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_10.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_10.q b/ql/src/test/queries/clientpositive/union_remove_10.q index 71a0892..dfd5d0a 100644 --- a/ql/src/test/queries/clientpositive/union_remove_10.q +++ b/ql/src/test/queries/clientpositive/union_remove_10.q @@ -19,7 +19,6 @@ set mapred.input.dir.recursive=true; -- It does not matter, whether the output is merged or not. In this case, merging is turned -- on --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n9, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_11.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_11.q b/ql/src/test/queries/clientpositive/union_remove_11.q index bfd734d..6017336 100644 --- a/ql/src/test/queries/clientpositive/union_remove_11.q +++ b/ql/src/test/queries/clientpositive/union_remove_11.q @@ -19,7 +19,6 @@ set mapred.input.dir.recursive=true; -- It does not matter, whether the output is merged or not. In this case, merging is turned -- on --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n21, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_12.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_12.q b/ql/src/test/queries/clientpositive/union_remove_12.q index cdddc71..392c297 100644 --- a/ql/src/test/queries/clientpositive/union_remove_12.q +++ b/ql/src/test/queries/clientpositive/union_remove_12.q @@ -15,7 +15,6 @@ set mapred.input.dir.recursive=true; -- other one is a map-join query), followed by select star and a file sink. -- The union optimization is applied, and the union is removed. --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n29, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_13.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_13.q b/ql/src/test/queries/clientpositive/union_remove_13.q index dcf14e0..6f337ad 100644 --- a/ql/src/test/queries/clientpositive/union_remove_13.q +++ b/ql/src/test/queries/clientpositive/union_remove_13.q @@ -15,7 +15,6 @@ set mapred.input.dir.recursive=true; -- other one is a map-join query), followed by select star and a file sink. -- The union selectstar optimization should be performed, and the union should be removed. --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n3, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_14.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_14.q b/ql/src/test/queries/clientpositive/union_remove_14.q index 04e2998..d98dbe5 100644 --- a/ql/src/test/queries/clientpositive/union_remove_14.q +++ b/ql/src/test/queries/clientpositive/union_remove_14.q @@ -16,7 +16,6 @@ set mapred.input.dir.recursive=true; -- followed by select star and a file sink. -- The union selectstar optimization should be performed, and the union should be removed. --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n16, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_15.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_15.q b/ql/src/test/queries/clientpositive/union_remove_15.q index 096d330..9c0f3a3 100644 --- a/ql/src/test/queries/clientpositive/union_remove_15.q +++ b/ql/src/test/queries/clientpositive/union_remove_15.q @@ -20,7 +20,6 @@ set mapred.input.dir.recursive=true; -- off -- This tests demonstrates that this optimization works in the presence of dynamic partitions. --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n25, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_16.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_16.q b/ql/src/test/queries/clientpositive/union_remove_16.q index 053528e..ec24cf0 100644 --- a/ql/src/test/queries/clientpositive/union_remove_16.q +++ b/ql/src/test/queries/clientpositive/union_remove_16.q @@ -20,7 +20,6 @@ set hive.exec.dynamic.partition=true; -- It does not matter, whether the output is merged or not. In this case, merging is turned -- on -- This test demonstrates that this optimization works in the presence of dynamic partitions. --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n32, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_17.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_17.q b/ql/src/test/queries/clientpositive/union_remove_17.q index eb9a093..92fa2e9 100644 --- a/ql/src/test/queries/clientpositive/union_remove_17.q +++ b/ql/src/test/queries/clientpositive/union_remove_17.q @@ -17,7 +17,6 @@ set mapred.input.dir.recursive=true; -- There is no need for this optimization, since the query is a map-only query. -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n4, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_18.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_18.q b/ql/src/test/queries/clientpositive/union_remove_18.q index 1c5e921..8259198 100644 --- a/ql/src/test/queries/clientpositive/union_remove_18.q +++ b/ql/src/test/queries/clientpositive/union_remove_18.q @@ -19,7 +19,6 @@ set mapred.input.dir.recursive=true; -- off -- This test demonstrates that the optimization works with dynamic partitions irrespective of the -- file format of the output file --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n30, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_19.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_19.q b/ql/src/test/queries/clientpositive/union_remove_19.q index 75285ee..675f01b 100644 --- a/ql/src/test/queries/clientpositive/union_remove_19.q +++ b/ql/src/test/queries/clientpositive/union_remove_19.q @@ -14,7 +14,6 @@ set mapred.input.dir.recursive=true; -- again to process the union. The union can be removed completely. -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n1, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_2.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_2.q b/ql/src/test/queries/clientpositive/union_remove_2.q index c0e395f..e5fe0bf 100644 --- a/ql/src/test/queries/clientpositive/union_remove_2.q +++ b/ql/src/test/queries/clientpositive/union_remove_2.q @@ -15,7 +15,6 @@ set mapred.input.dir.recursive=true; -- again to process the union. The union can be removed completely. -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n11, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_20.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_20.q b/ql/src/test/queries/clientpositive/union_remove_20.q index 5343f58..79a9059 100644 --- a/ql/src/test/queries/clientpositive/union_remove_20.q +++ b/ql/src/test/queries/clientpositive/union_remove_20.q @@ -14,7 +14,6 @@ set mapred.input.dir.recursive=true; -- be removed. -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n27, it might be easier -- to run the test only on hadoop 23. The union is removed, the select (which changes the order of -- columns being selected) is pushed above the union. http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_21.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_21.q b/ql/src/test/queries/clientpositive/union_remove_21.q index d51de64..088a80e 100644 --- a/ql/src/test/queries/clientpositive/union_remove_21.q +++ b/ql/src/test/queries/clientpositive/union_remove_21.q @@ -14,7 +14,6 @@ set mapred.input.dir.recursive=true; -- be removed. -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n17, it might be easier -- to run the test only on hadoop 23. The union is removed, the select (which changes the order of -- columns being selected) is pushed above the union. http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_22.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_22.q b/ql/src/test/queries/clientpositive/union_remove_22.q index 134e650..ef3ba51 100644 --- a/ql/src/test/queries/clientpositive/union_remove_22.q +++ b/ql/src/test/queries/clientpositive/union_remove_22.q @@ -14,7 +14,6 @@ set mapred.input.dir.recursive=true; -- However, some columns are repeated. So, union cannot be removed. -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n7, it might be easier -- to run the test only on hadoop 23. The union is removed, the select (which selects columns from -- both the sub-qeuries of the union) is pushed above the union. http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_23.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_23.q b/ql/src/test/queries/clientpositive/union_remove_23.q index 8ac2093..3145ac0 100644 --- a/ql/src/test/queries/clientpositive/union_remove_23.q +++ b/ql/src/test/queries/clientpositive/union_remove_23.q @@ -15,7 +15,6 @@ set mapred.input.dir.recursive=true; -- would have multiple map-reduce jobs. -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n34, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_24.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_24.q b/ql/src/test/queries/clientpositive/union_remove_24.q index ea3c12b..6c34f56 100644 --- a/ql/src/test/queries/clientpositive/union_remove_24.q +++ b/ql/src/test/queries/clientpositive/union_remove_24.q @@ -13,7 +13,6 @@ set mapred.input.dir.recursive=true; -- There is no need to write the temporary results of the sub-queries, and then read them -- again to process the union. The union can be removed completely. -- One sub-query has a double and the other sub-query has a bigint. --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n28, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_25.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_25.q b/ql/src/test/queries/clientpositive/union_remove_25.q index e6d1b0d..b186c2c 100644 --- a/ql/src/test/queries/clientpositive/union_remove_25.q +++ b/ql/src/test/queries/clientpositive/union_remove_25.q @@ -16,7 +16,6 @@ set mapred.input.dir.recursive=true; -- again to process the union. The union can be removed completely. -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n19, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_3.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_3.q b/ql/src/test/queries/clientpositive/union_remove_3.q index f2c8541..490be99 100644 --- a/ql/src/test/queries/clientpositive/union_remove_3.q +++ b/ql/src/test/queries/clientpositive/union_remove_3.q @@ -15,7 +15,6 @@ set mapred.input.dir.recursive=true; -- a single map-only job -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n23, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_4.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_4.q b/ql/src/test/queries/clientpositive/union_remove_4.q index 0b2b818..adc45e7 100644 --- a/ql/src/test/queries/clientpositive/union_remove_4.q +++ b/ql/src/test/queries/clientpositive/union_remove_4.q @@ -15,7 +15,6 @@ set hive.merge.smallfiles.avgsize=1; -- again to process the union. The union can be removed completely. -- It does not matter, whether the output is merged or not. In this case, merging is turned -- on --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n33, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_5.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_5.q b/ql/src/test/queries/clientpositive/union_remove_5.q index 7c78714..05f7c32 100644 --- a/ql/src/test/queries/clientpositive/union_remove_5.q +++ b/ql/src/test/queries/clientpositive/union_remove_5.q @@ -17,7 +17,6 @@ set mapred.input.dir.recursive=true; -- It does not matter, whether the output is merged or not. In this case, merging is turned -- on --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n6, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_7.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_7.q b/ql/src/test/queries/clientpositive/union_remove_7.q index 43a5fe1..caca645 100644 --- a/ql/src/test/queries/clientpositive/union_remove_7.q +++ b/ql/src/test/queries/clientpositive/union_remove_7.q @@ -16,7 +16,6 @@ set mapred.input.dir.recursive=true; -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n24, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_8.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_8.q b/ql/src/test/queries/clientpositive/union_remove_8.q index 05a5671..397460e 100644 --- a/ql/src/test/queries/clientpositive/union_remove_8.q +++ b/ql/src/test/queries/clientpositive/union_remove_8.q @@ -17,7 +17,6 @@ set mapred.input.dir.recursive=true; -- It does not matter, whether the output is merged or not. In this case, merging is turned -- off --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n12, it might be easier -- to run the test only on hadoop 23 http://git-wip-us.apache.org/repos/asf/hive/blob/4ec256c2/ql/src/test/queries/clientpositive/union_remove_9.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/union_remove_9.q b/ql/src/test/queries/clientpositive/union_remove_9.q index 475e52c..3b24b95 100644 --- a/ql/src/test/queries/clientpositive/union_remove_9.q +++ b/ql/src/test/queries/clientpositive/union_remove_9.q @@ -17,7 +17,6 @@ set mapred.input.dir.recursive=true; -- It does not matter, whether the output is merged or not. In this case, merging is turned -- on --- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- Since this test creates sub-directories for the output table outputTbl1_n22, it might be easier -- to run the test only on hadoop 23
