diff --git ql/src/test/queries/clientpositive/decimal_join.q ql/src/test/queries/clientpositive/decimal_join.q index 86c14d9..c6d5571 100644 --- ql/src/test/queries/clientpositive/decimal_join.q +++ ql/src/test/queries/clientpositive/decimal_join.q @@ -1,4 +1,5 @@ -- HIVE-5292 Join on decimal columns fails +-- SORT_QUERY_RESULTS create table src_dec (key decimal(3,0), value string); load data local inpath '../../data/files/kv1.txt' into table src_dec; diff --git ql/src/test/queries/clientpositive/filter_join_breaktask.q ql/src/test/queries/clientpositive/filter_join_breaktask.q index fe24da7..fe4c8fe 100644 --- ql/src/test/queries/clientpositive/filter_join_breaktask.q +++ ql/src/test/queries/clientpositive/filter_join_breaktask.q @@ -1,3 +1,4 @@ +-- SORT_QUERY_RESULTS CREATE TABLE filter_join_breaktask(key int, value string) partitioned by (ds string); diff --git ql/src/test/queries/clientpositive/join1.q ql/src/test/queries/clientpositive/join1.q index 886cba7..a388683 100644 --- ql/src/test/queries/clientpositive/join1.q +++ ql/src/test/queries/clientpositive/join1.q @@ -1,4 +1,7 @@ set hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat; + +-- SORT_QUERY_RESULTS + CREATE TABLE dest_j1(key INT, value STRING) STORED AS TEXTFILE; EXPLAIN diff --git ql/src/test/queries/clientpositive/join10.q ql/src/test/queries/clientpositive/join10.q index f424618..03cd81d 100644 --- ql/src/test/queries/clientpositive/join10.q +++ ql/src/test/queries/clientpositive/join10.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + EXPLAIN FROM (SELECT src.* FROM src) x JOIN diff --git ql/src/test/queries/clientpositive/join11.q ql/src/test/queries/clientpositive/join11.q index a40f0cc..4224a38 100644 --- ql/src/test/queries/clientpositive/join11.q +++ ql/src/test/queries/clientpositive/join11.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + EXPLAIN SELECT src1.c1, src2.c4 FROM diff --git ql/src/test/queries/clientpositive/join12.q ql/src/test/queries/clientpositive/join12.q index 7053a06..121b2fd 100644 --- ql/src/test/queries/clientpositive/join12.q +++ ql/src/test/queries/clientpositive/join12.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + EXPLAIN SELECT src1.c1, src2.c4 FROM diff --git ql/src/test/queries/clientpositive/join13.q ql/src/test/queries/clientpositive/join13.q index 914fb44..4492ccb 100644 --- ql/src/test/queries/clientpositive/join13.q +++ ql/src/test/queries/clientpositive/join13.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + EXPLAIN SELECT src1.c1, src2.c4 FROM diff --git ql/src/test/queries/clientpositive/join14.q ql/src/test/queries/clientpositive/join14.q index 83346b4..638cc31 100644 --- ql/src/test/queries/clientpositive/join14.q +++ ql/src/test/queries/clientpositive/join14.q @@ -1,4 +1,5 @@ -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) +-- SORT_QUERY_RESULTS CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE; diff --git ql/src/test/queries/clientpositive/join17.q ql/src/test/queries/clientpositive/join17.q index 5fbb620..4b6a1ef 100644 --- ql/src/test/queries/clientpositive/join17.q +++ ql/src/test/queries/clientpositive/join17.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE; EXPLAIN EXTENDED diff --git ql/src/test/queries/clientpositive/join19.q ql/src/test/queries/clientpositive/join19.q index 5a6b741..d5e0f42 100644 --- ql/src/test/queries/clientpositive/join19.q +++ ql/src/test/queries/clientpositive/join19.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + CREATE TABLE triples (foo string, subject string, predicate string, object string, foo2 string); EXPLAIN diff --git ql/src/test/queries/clientpositive/join2.q ql/src/test/queries/clientpositive/join2.q index 7bb547b..7b782b4 100644 --- ql/src/test/queries/clientpositive/join2.q +++ ql/src/test/queries/clientpositive/join2.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE; EXPLAIN diff --git ql/src/test/queries/clientpositive/join3.q ql/src/test/queries/clientpositive/join3.q index f38fe21..c9c6703 100644 --- ql/src/test/queries/clientpositive/join3.q +++ ql/src/test/queries/clientpositive/join3.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE; EXPLAIN diff --git ql/src/test/queries/clientpositive/join4.q ql/src/test/queries/clientpositive/join4.q index 100076e..94e9c14 100644 --- ql/src/test/queries/clientpositive/join4.q +++ ql/src/test/queries/clientpositive/join4.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE; EXPLAIN diff --git ql/src/test/queries/clientpositive/join5.q ql/src/test/queries/clientpositive/join5.q index 405a0a5..660ebf6 100644 --- ql/src/test/queries/clientpositive/join5.q +++ ql/src/test/queries/clientpositive/join5.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE; EXPLAIN diff --git ql/src/test/queries/clientpositive/join8.q ql/src/test/queries/clientpositive/join8.q index a7fdf4c..d1b3063 100644 --- ql/src/test/queries/clientpositive/join8.q +++ ql/src/test/queries/clientpositive/join8.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE; EXPLAIN diff --git ql/src/test/queries/clientpositive/join9.q ql/src/test/queries/clientpositive/join9.q index 80add73..80364e7 100644 --- ql/src/test/queries/clientpositive/join9.q +++ ql/src/test/queries/clientpositive/join9.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE; EXPLAIN EXTENDED diff --git ql/src/test/queries/clientpositive/join_rc.q ql/src/test/queries/clientpositive/join_rc.q index 8a7c2d3..b2e8c38 100644 --- ql/src/test/queries/clientpositive/join_rc.q +++ ql/src/test/queries/clientpositive/join_rc.q @@ -1,4 +1,4 @@ - +-- SORT_QUERY_RESULTS create table join_rc1(key string, value string) stored as RCFile; create table join_rc2(key string, value string) stored as RCFile; diff --git ql/src/test/queries/clientpositive/join_thrift.q ql/src/test/queries/clientpositive/join_thrift.q index 1b4d491..87fc636 100644 --- ql/src/test/queries/clientpositive/join_thrift.q +++ ql/src/test/queries/clientpositive/join_thrift.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + DESCRIBE src_thrift; EXPLAIN diff --git ql/src/test/queries/clientpositive/join_vc.q ql/src/test/queries/clientpositive/join_vc.q index 8d7dea9..bbf3e85 100644 --- ql/src/test/queries/clientpositive/join_vc.q +++ ql/src/test/queries/clientpositive/join_vc.q @@ -1,5 +1,7 @@ -- see HIVE-4033 earlier a flag named hasVC was not initialized correctly in MapOperator.java, resulting in NPE for following query. order by and limit in the query is not relevant, problem would be evident even without those. They are there to keep .q.out file small and sorted. +-- SORT_QUERY_RESULTS + explain select t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value from src t1 join src t2 on t1.key = t2.key join src t3 on t2.value = t3.value order by t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value limit 3; select t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value from src t1 join src t2 on t1.key = t2.key join src t3 on t2.value = t3.value order by t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value limit 3; diff --git ql/src/test/queries/clientpositive/louter_join_ppr.q ql/src/test/queries/clientpositive/louter_join_ppr.q index c4e25eb..90d6724 100644 --- ql/src/test/queries/clientpositive/louter_join_ppr.q +++ ql/src/test/queries/clientpositive/louter_join_ppr.q @@ -1,5 +1,7 @@ set hive.optimize.ppd=true; +-- SORT_QUERY_RESULTS + EXPLAIN EXTENDED FROM src a diff --git ql/src/test/queries/clientpositive/mapjoin_decimal.q ql/src/test/queries/clientpositive/mapjoin_decimal.q index 90e3f36..4d9121f 100644 --- ql/src/test/queries/clientpositive/mapjoin_decimal.q +++ ql/src/test/queries/clientpositive/mapjoin_decimal.q @@ -2,6 +2,8 @@ set hive.auto.convert.join=true; set hive.auto.convert.join.noconditionaltask=true; set hive.auto.convert.join.noconditionaltask.size=10000000; +-- SORT_QUERY_RESULTS + CREATE TABLE over1k(t tinyint, si smallint, i int, @@ -37,4 +39,4 @@ select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec); set hive.mapjoin.optimized.hashtable=true; -select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec); \ No newline at end of file +select t1.dec, t2.dec from t1 join t2 on (t1.dec=t2.dec); diff --git ql/src/test/queries/clientpositive/mapjoin_mapjoin.q ql/src/test/queries/clientpositive/mapjoin_mapjoin.q index f82eead..388a442 100644 --- ql/src/test/queries/clientpositive/mapjoin_mapjoin.q +++ ql/src/test/queries/clientpositive/mapjoin_mapjoin.q @@ -2,6 +2,8 @@ set hive.auto.convert.join=true; set hive.auto.convert.join.noconditionaltask=true; set hive.auto.convert.join.noconditionaltask.size=10000; +-- SORT_QUERY_RESULTS + -- Since the inputs are small, it should be automatically converted to mapjoin explain extended select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key); diff --git ql/src/test/queries/clientpositive/ppd_join.q ql/src/test/queries/clientpositive/ppd_join.q index 09323e9..1a2a198 100644 --- ql/src/test/queries/clientpositive/ppd_join.q +++ ql/src/test/queries/clientpositive/ppd_join.q @@ -1,6 +1,8 @@ set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=false; +-- SORT_QUERY_RESULTS + EXPLAIN SELECT src1.c1, src2.c4 FROM diff --git ql/src/test/queries/clientpositive/ppd_join2.q ql/src/test/queries/clientpositive/ppd_join2.q index 8bd4cae..de8db73 100644 --- ql/src/test/queries/clientpositive/ppd_join2.q +++ ql/src/test/queries/clientpositive/ppd_join2.q @@ -1,6 +1,8 @@ set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=false; +-- SORT_QUERY_RESULTS + EXPLAIN SELECT src1.c1, src2.c4 FROM diff --git ql/src/test/queries/clientpositive/ppd_join3.q ql/src/test/queries/clientpositive/ppd_join3.q index 7abf410..e2ffddf 100644 --- ql/src/test/queries/clientpositive/ppd_join3.q +++ ql/src/test/queries/clientpositive/ppd_join3.q @@ -1,6 +1,8 @@ set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=false; +-- SORT_QUERY_RESULTS + EXPLAIN SELECT src1.c1, src2.c4 FROM diff --git ql/src/test/queries/clientpositive/ppd_outer_join1.q ql/src/test/queries/clientpositive/ppd_outer_join1.q index 752176c..cd992b3 100644 --- ql/src/test/queries/clientpositive/ppd_outer_join1.q +++ ql/src/test/queries/clientpositive/ppd_outer_join1.q @@ -1,6 +1,8 @@ set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=false; +-- SORT_QUERY_RESULTS + EXPLAIN FROM src a diff --git ql/src/test/queries/clientpositive/ppd_outer_join2.q ql/src/test/queries/clientpositive/ppd_outer_join2.q index e22892b..ad96afa 100644 --- ql/src/test/queries/clientpositive/ppd_outer_join2.q +++ ql/src/test/queries/clientpositive/ppd_outer_join2.q @@ -1,6 +1,8 @@ set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=false; +-- SORT_QUERY_RESULTS + EXPLAIN FROM src a diff --git ql/src/test/queries/clientpositive/ppd_outer_join4.q ql/src/test/queries/clientpositive/ppd_outer_join4.q index e465eda..77f3be1 100644 --- ql/src/test/queries/clientpositive/ppd_outer_join4.q +++ ql/src/test/queries/clientpositive/ppd_outer_join4.q @@ -1,6 +1,8 @@ set hive.optimize.ppd=true; set hive.ppd.remove.duplicatefilters=false; +-- SORT_QUERY_RESULTS + EXPLAIN FROM src a diff --git ql/src/test/queries/clientpositive/router_join_ppr.q ql/src/test/queries/clientpositive/router_join_ppr.q index 9ec5b7b..f604f0e 100644 --- ql/src/test/queries/clientpositive/router_join_ppr.q +++ ql/src/test/queries/clientpositive/router_join_ppr.q @@ -1,5 +1,7 @@ set hive.optimize.ppd=true; +-- SORT_QUERY_RESULTS + EXPLAIN EXTENDED FROM src a diff --git ql/src/test/queries/clientpositive/temp_table_join1.q ql/src/test/queries/clientpositive/temp_table_join1.q index 95d5ad9..e1b7e15 100644 --- ql/src/test/queries/clientpositive/temp_table_join1.q +++ ql/src/test/queries/clientpositive/temp_table_join1.q @@ -1,3 +1,4 @@ +-- SORT_QUERY_RESULTS CREATE TABLE src_nontemp AS SELECT * FROM src limit 10; CREATE TEMPORARY TABLE src_temp AS SELECT * FROM src limit 10; diff --git ql/src/test/queries/clientpositive/tez_join_tests.q ql/src/test/queries/clientpositive/tez_join_tests.q index f309e3f..8b65049 100644 --- ql/src/test/queries/clientpositive/tez_join_tests.q +++ ql/src/test/queries/clientpositive/tez_join_tests.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + explain select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key; diff --git ql/src/test/queries/clientpositive/tez_joins_explain.q ql/src/test/queries/clientpositive/tez_joins_explain.q index 9193843..7d3b8f6 100644 --- ql/src/test/queries/clientpositive/tez_joins_explain.q +++ ql/src/test/queries/clientpositive/tez_joins_explain.q @@ -1,3 +1,5 @@ +-- SORT_QUERY_RESULTS + explain select * from (select b.key, b.value from src1 a left outer join src b on (a.key = b.key) order by b.key) x right outer join src c on (x.value = c.value) order by x.key; diff --git ql/src/test/results/clientpositive/decimal_join.q.out ql/src/test/results/clientpositive/decimal_join.q.out index 940ffc5..cc669a6 100644 --- ql/src/test/results/clientpositive/decimal_join.q.out +++ ql/src/test/results/clientpositive/decimal_join.q.out @@ -1,10 +1,12 @@ PREHOOK: query: -- HIVE-5292 Join on decimal columns fails +-- SORT_QUERY_RESULTS create table src_dec (key decimal(3,0), value string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@src_dec POSTHOOK: query: -- HIVE-5292 Join on decimal columns fails +-- SORT_QUERY_RESULTS create table src_dec (key decimal(3,0), value string) POSTHOOK: type: CREATETABLE diff --git ql/src/test/results/clientpositive/filter_join_breaktask.q.out ql/src/test/results/clientpositive/filter_join_breaktask.q.out index c540c4a..9cba1c3 100644 --- ql/src/test/results/clientpositive/filter_join_breaktask.q.out +++ ql/src/test/results/clientpositive/filter_join_breaktask.q.out @@ -1,8 +1,12 @@ -PREHOOK: query: CREATE TABLE filter_join_breaktask(key int, value string) partitioned by (ds string) +PREHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE filter_join_breaktask(key int, value string) partitioned by (ds string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@filter_join_breaktask -POSTHOOK: query: CREATE TABLE filter_join_breaktask(key int, value string) partitioned by (ds string) +POSTHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE filter_join_breaktask(key int, value string) partitioned by (ds string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@filter_join_breaktask diff --git ql/src/test/results/clientpositive/join10.q.out ql/src/test/results/clientpositive/join10.q.out index 1749768..199a819 100644 --- ql/src/test/results/clientpositive/join10.q.out +++ ql/src/test/results/clientpositive/join10.q.out @@ -1,11 +1,15 @@ -PREHOOK: query: EXPLAIN FROM +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y ON (x.key = Y.key) SELECT Y.* PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN FROM +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM (SELECT src.* FROM src) x JOIN (SELECT src.* FROM src) Y diff --git ql/src/test/results/clientpositive/join11.q.out ql/src/test/results/clientpositive/join11.q.out index 9e77bb7..d08b795 100644 --- ql/src/test/results/clientpositive/join11.q.out +++ ql/src/test/results/clientpositive/join11.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src) src1 @@ -6,7 +8,9 @@ JOIN (SELECT src.key as c3, src.value as c4 from src) src2 ON src1.c1 = src2.c3 AND src1.c1 < 100 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src) src1 diff --git ql/src/test/results/clientpositive/join12.q.out ql/src/test/results/clientpositive/join12.q.out index ee4b6ac..e103001 100644 --- ql/src/test/results/clientpositive/join12.q.out +++ ql/src/test/results/clientpositive/join12.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src) src1 @@ -9,7 +11,9 @@ JOIN (SELECT src.key as c5, src.value as c6 from src) src3 ON src1.c1 = src3.c5 AND src3.c5 < 80 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src) src1 diff --git ql/src/test/results/clientpositive/join13.q.out ql/src/test/results/clientpositive/join13.q.out index f5f3e08..76349b5 100644 --- ql/src/test/results/clientpositive/join13.q.out +++ ql/src/test/results/clientpositive/join13.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src) src1 @@ -9,7 +11,9 @@ JOIN (SELECT src.key as c5, src.value as c6 from src) src3 ON src1.c1 + src2.c3 = src3.c5 AND src3.c5 < 200 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src) src1 @@ -182,19 +186,6 @@ POSTHOOK: Input: default@src 0 val_0 0 val_0 0 val_0 -2 val_2 -4 val_4 -5 val_5 -5 val_5 -5 val_5 -5 val_5 -5 val_5 -5 val_5 -5 val_5 -5 val_5 -5 val_5 -9 val_9 -9 val_9 10 val_10 12 val_12 12 val_12 @@ -209,6 +200,7 @@ POSTHOOK: Input: default@src 15 val_15 15 val_15 17 val_17 +2 val_2 27 val_27 33 val_33 35 val_35 @@ -242,6 +234,7 @@ POSTHOOK: Input: default@src 37 val_37 37 val_37 37 val_37 +4 val_4 41 val_41 42 val_42 42 val_42 @@ -252,6 +245,15 @@ POSTHOOK: Input: default@src 42 val_42 42 val_42 43 val_43 +5 val_5 +5 val_5 +5 val_5 +5 val_5 +5 val_5 +5 val_5 +5 val_5 +5 val_5 +5 val_5 57 val_57 58 val_58 58 val_58 @@ -297,6 +299,8 @@ POSTHOOK: Input: default@src 86 val_86 87 val_87 87 val_87 +9 val_9 +9 val_9 90 val_90 90 val_90 90 val_90 diff --git ql/src/test/results/clientpositive/join14.q.out ql/src/test/results/clientpositive/join14.q.out index f30345b..50803f3 100644 --- ql/src/test/results/clientpositive/join14.q.out +++ ql/src/test/results/clientpositive/join14.q.out @@ -1,10 +1,12 @@ PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) +-- SORT_QUERY_RESULTS CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) +-- SORT_QUERY_RESULTS CREATE TABLE dest1(c1 INT, c2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE diff --git ql/src/test/results/clientpositive/join17.q.out ql/src/test/results/clientpositive/join17.q.out index a446215..114e535 100644 --- ql/src/test/results/clientpositive/join17.q.out +++ ql/src/test/results/clientpositive/join17.q.out @@ -1,8 +1,12 @@ -PREHOOK: query: CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(key1 INT, value1 STRING, key2 INT, value2 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 diff --git ql/src/test/results/clientpositive/join19.q.out ql/src/test/results/clientpositive/join19.q.out index 5598892..373ae6e 100644 --- ql/src/test/results/clientpositive/join19.q.out +++ ql/src/test/results/clientpositive/join19.q.out @@ -1,8 +1,12 @@ -PREHOOK: query: CREATE TABLE triples (foo string, subject string, predicate string, object string, foo2 string) +PREHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE triples (foo string, subject string, predicate string, object string, foo2 string) PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@triples -POSTHOOK: query: CREATE TABLE triples (foo string, subject string, predicate string, object string, foo2 string) +POSTHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE triples (foo string, subject string, predicate string, object string, foo2 string) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@triples diff --git ql/src/test/results/clientpositive/join2.q.out ql/src/test/results/clientpositive/join2.q.out index 4d41e9d..1a60164 100644 --- ql/src/test/results/clientpositive/join2.q.out +++ ql/src/test/results/clientpositive/join2.q.out @@ -1,8 +1,12 @@ -PREHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest_j2 -POSTHOOK: query: CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest_j2(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest_j2 @@ -169,143 +173,7 @@ POSTHOOK: Input: default@dest_j2 0 val_0 0 val_0 0 val_0 -2 val_4 -4 val_8 -5 val_10 -5 val_10 -5 val_10 -5 val_10 -5 val_10 -5 val_10 -5 val_10 -5 val_10 -5 val_10 -9 val_18 -9 val_18 10 val_20 -12 val_24 -12 val_24 -12 val_24 -12 val_24 -12 val_24 -12 val_24 -12 val_24 -12 val_24 -15 val_30 -15 val_30 -15 val_30 -15 val_30 -17 val_34 -27 val_54 -33 val_66 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -35 val_70 -37 val_74 -37 val_74 -37 val_74 -37 val_74 -41 val_82 -42 val_84 -42 val_84 -42 val_84 -42 val_84 -42 val_84 -42 val_84 -42 val_84 -42 val_84 -43 val_86 -57 val_114 -58 val_116 -58 val_116 -58 val_116 -58 val_116 -64 val_128 -64 val_128 -64 val_128 -67 val_134 -67 val_134 -67 val_134 -67 val_134 -67 val_134 -67 val_134 -67 val_134 -67 val_134 -69 val_138 -69 val_138 -69 val_138 -69 val_138 -76 val_152 -76 val_152 -76 val_152 -76 val_152 -76 val_152 -76 val_152 -76 val_152 -76 val_152 -78 val_156 -80 val_160 -82 val_164 -82 val_164 -83 val_166 -83 val_166 -83 val_166 -83 val_166 -84 val_168 -84 val_168 -84 val_168 -84 val_168 -85 val_170 -86 val_172 -86 val_172 -87 val_174 -87 val_174 -90 val_180 -90 val_180 -90 val_180 -90 val_180 -90 val_180 -90 val_180 -90 val_180 -90 val_180 -90 val_180 -95 val_190 -95 val_190 -95 val_190 -95 val_190 -96 val_192 -97 val_194 -97 val_194 -97 val_194 -97 val_194 -98 val_196 -98 val_196 -98 val_196 -98 val_196 100 val_200 100 val_200 100 val_200 @@ -350,6 +218,14 @@ POSTHOOK: Input: default@dest_j2 119 val_238 119 val_238 119 val_238 +12 val_24 +12 val_24 +12 val_24 +12 val_24 +12 val_24 +12 val_24 +12 val_24 +12 val_24 126 val_252 128 val_256 128 val_256 @@ -398,6 +274,10 @@ POSTHOOK: Input: default@dest_j2 149 val_298 149 val_298 149 val_298 +15 val_30 +15 val_30 +15 val_30 +15 val_30 153 val_306 155 val_310 158 val_316 @@ -421,6 +301,7 @@ POSTHOOK: Input: default@dest_j2 169 val_338 169 val_338 169 val_338 +17 val_34 172 val_344 172 val_344 172 val_344 @@ -488,6 +369,7 @@ POSTHOOK: Input: default@dest_j2 197 val_394 197 val_394 197 val_394 +2 val_4 200 val_400 200 val_400 200 val_400 @@ -614,3 +496,125 @@ POSTHOOK: Input: default@dest_j2 249 val_498 249 val_498 249 val_498 +27 val_54 +33 val_66 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +35 val_70 +37 val_74 +37 val_74 +37 val_74 +37 val_74 +4 val_8 +41 val_82 +42 val_84 +42 val_84 +42 val_84 +42 val_84 +42 val_84 +42 val_84 +42 val_84 +42 val_84 +43 val_86 +5 val_10 +5 val_10 +5 val_10 +5 val_10 +5 val_10 +5 val_10 +5 val_10 +5 val_10 +5 val_10 +57 val_114 +58 val_116 +58 val_116 +58 val_116 +58 val_116 +64 val_128 +64 val_128 +64 val_128 +67 val_134 +67 val_134 +67 val_134 +67 val_134 +67 val_134 +67 val_134 +67 val_134 +67 val_134 +69 val_138 +69 val_138 +69 val_138 +69 val_138 +76 val_152 +76 val_152 +76 val_152 +76 val_152 +76 val_152 +76 val_152 +76 val_152 +76 val_152 +78 val_156 +80 val_160 +82 val_164 +82 val_164 +83 val_166 +83 val_166 +83 val_166 +83 val_166 +84 val_168 +84 val_168 +84 val_168 +84 val_168 +85 val_170 +86 val_172 +86 val_172 +87 val_174 +87 val_174 +9 val_18 +9 val_18 +90 val_180 +90 val_180 +90 val_180 +90 val_180 +90 val_180 +90 val_180 +90 val_180 +90 val_180 +90 val_180 +95 val_190 +95 val_190 +95 val_190 +95 val_190 +96 val_192 +97 val_194 +97 val_194 +97 val_194 +97 val_194 +98 val_196 +98 val_196 +98 val_196 +98 val_196 diff --git ql/src/test/results/clientpositive/join3.q.out ql/src/test/results/clientpositive/join3.q.out index a0086ba..ef0969b 100644 --- ql/src/test/results/clientpositive/join3.q.out +++ ql/src/test/results/clientpositive/join3.q.out @@ -1,8 +1,12 @@ -PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 diff --git ql/src/test/results/clientpositive/join4.q.out ql/src/test/results/clientpositive/join4.q.out index 4c174c5..4c51288 100644 --- ql/src/test/results/clientpositive/join4.q.out +++ ql/src/test/results/clientpositive/join4.q.out @@ -1,8 +1,12 @@ -PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 diff --git ql/src/test/results/clientpositive/join5.q.out ql/src/test/results/clientpositive/join5.q.out index 553137e..7e69104 100644 --- ql/src/test/results/clientpositive/join5.q.out +++ ql/src/test/results/clientpositive/join5.q.out @@ -1,8 +1,12 @@ -PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 diff --git ql/src/test/results/clientpositive/join8.q.out ql/src/test/results/clientpositive/join8.q.out index 9e13a5e..ca38910 100644 --- ql/src/test/results/clientpositive/join8.q.out +++ ql/src/test/results/clientpositive/join8.q.out @@ -1,8 +1,12 @@ -PREHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(c1 INT, c2 STRING, c3 INT, c4 STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 diff --git ql/src/test/results/clientpositive/join9.q.out ql/src/test/results/clientpositive/join9.q.out index 43353c2..adbeb61 100644 --- ql/src/test/results/clientpositive/join9.q.out +++ ql/src/test/results/clientpositive/join9.q.out @@ -1,8 +1,12 @@ -PREHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE +PREHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@dest1 -POSTHOOK: query: CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE +POSTHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE dest1(key INT, value STRING) STORED AS TEXTFILE POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@dest1 diff --git ql/src/test/results/clientpositive/join_rc.q.out ql/src/test/results/clientpositive/join_rc.q.out index 5a1c511..515919d 100644 --- ql/src/test/results/clientpositive/join_rc.q.out +++ ql/src/test/results/clientpositive/join_rc.q.out @@ -1,8 +1,12 @@ -PREHOOK: query: create table join_rc1(key string, value string) stored as RCFile +PREHOOK: query: -- SORT_QUERY_RESULTS + +create table join_rc1(key string, value string) stored as RCFile PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@join_rc1 -POSTHOOK: query: create table join_rc1(key string, value string) stored as RCFile +POSTHOOK: query: -- SORT_QUERY_RESULTS + +create table join_rc1(key string, value string) stored as RCFile POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@join_rc1 diff --git ql/src/test/results/clientpositive/join_thrift.q.out ql/src/test/results/clientpositive/join_thrift.q.out index 3bbc0b9..f0751e2 100644 --- ql/src/test/results/clientpositive/join_thrift.q.out +++ ql/src/test/results/clientpositive/join_thrift.q.out @@ -1,7 +1,11 @@ -PREHOOK: query: DESCRIBE src_thrift +PREHOOK: query: -- SORT_QUERY_RESULTS + +DESCRIBE src_thrift PREHOOK: type: DESCTABLE PREHOOK: Input: default@src_thrift -POSTHOOK: query: DESCRIBE src_thrift +POSTHOOK: query: -- SORT_QUERY_RESULTS + +DESCRIBE src_thrift POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@src_thrift aint int from deserializer @@ -98,14 +102,14 @@ ON s1.aint = s2.aint POSTHOOK: type: QUERY POSTHOOK: Input: default@src_thrift #### A masked pattern was here #### --1952710710 [{"myint":25,"mystring":"125","underscore_int":5}] -1461153973 [{"myint":49,"mystring":"343","underscore_int":7}] --751827638 [{"myint":4,"mystring":"8","underscore_int":2}] +-1952710710 [{"myint":25,"mystring":"125","underscore_int":5}] -734328909 [{"myint":16,"mystring":"64","underscore_int":4}] +-751827638 [{"myint":4,"mystring":"8","underscore_int":2}] 0 NULL -336964413 [{"myint":81,"mystring":"729","underscore_int":9}] -465985200 [{"myint":1,"mystring":"1","underscore_int":1}] -477111222 [{"myint":9,"mystring":"27","underscore_int":3}] 1244525190 [{"myint":36,"mystring":"216","underscore_int":6}] 1638581578 [{"myint":64,"mystring":"512","underscore_int":8}] 1712634731 [{"myint":0,"mystring":"0","underscore_int":0}] +336964413 [{"myint":81,"mystring":"729","underscore_int":9}] +465985200 [{"myint":1,"mystring":"1","underscore_int":1}] +477111222 [{"myint":9,"mystring":"27","underscore_int":3}] diff --git ql/src/test/results/clientpositive/join_vc.q.out ql/src/test/results/clientpositive/join_vc.q.out index 45652ff..fe519e8 100644 --- ql/src/test/results/clientpositive/join_vc.q.out +++ ql/src/test/results/clientpositive/join_vc.q.out @@ -1,9 +1,13 @@ PREHOOK: query: -- see HIVE-4033 earlier a flag named hasVC was not initialized correctly in MapOperator.java, resulting in NPE for following query. order by and limit in the query is not relevant, problem would be evident even without those. They are there to keep .q.out file small and sorted. +-- SORT_QUERY_RESULTS + explain select t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value from src t1 join src t2 on t1.key = t2.key join src t3 on t2.value = t3.value order by t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value limit 3 PREHOOK: type: QUERY POSTHOOK: query: -- see HIVE-4033 earlier a flag named hasVC was not initialized correctly in MapOperator.java, resulting in NPE for following query. order by and limit in the query is not relevant, problem would be evident even without those. They are there to keep .q.out file small and sorted. +-- SORT_QUERY_RESULTS + explain select t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value from src t1 join src t2 on t1.key = t2.key join src t3 on t2.value = t3.value order by t3.BLOCK__OFFSET__INSIDE__FILE,t3.key,t3.value limit 3 POSTHOOK: type: QUERY STAGE DEPENDENCIES: @@ -213,151 +217,151 @@ from src t1 join src t2 on t1.key = t2.key where t1.key < 100 POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### +1024 +1118 +1176 +1198 +12 +1208 +1208 +1218 +1238 +1238 +1238 +1440 +1462 +1462 +1592 +1674 +1674 +1720 +1720 +1754 +1754 +1872 +1872 +1906 +1906 +1916 +1972 +1972 +198 +2030 +2030 2088 -2632 -968 2088 -2632 -968 2088 +2216 +2226 +2226 +2308 +2308 +2330 +2400 +2400 +2458 +2458 +2612 +2622 2632 -968 -2846 -3170 -1720 -4362 -1720 -4362 -386 +2632 +2632 +2652 2770 -386 2770 -910 -5340 -5514 -5340 -5514 +2792 +2792 +2802 +2802 +2802 2824 -4004 -1118 -4594 -1972 -4594 -1972 -2226 -5284 -2226 -5284 -34 -5616 -3494 -3592 -3192 +2846 +3060 +3060 +3060 +3128 +3128 3138 -4012 -1238 3138 -4012 -1238 3138 -4012 -1238 -5626 +3160 +3160 +3170 +3192 328 -5626 328 -1218 -3388 -2030 3298 -2030 3298 -2330 -4068 -1198 -3060 -4540 +3368 +3378 +3378 +3388 +34 +3494 +3516 +3538 +3538 +3548 +3570 +3592 +3794 +3794 +3794 +386 +386 3864 -3060 -4540 3864 -3060 -4540 3864 -2308 -1462 -2308 -1462 +396 +4004 +4012 +4012 +4012 +4058 +4068 4186 -1440 -1024 -1906 -3128 -1906 -3128 -3516 -1592 -198 -1754 -5306 -1754 -5306 -3570 -3794 -4640 +4304 +4304 +4304 +4362 +4362 +4540 +4540 +4540 4548 -3794 -4640 4548 -3794 -4640 4548 -2792 -1208 -2792 -1208 -3548 -3378 -3538 -3378 -3538 -2622 -3368 -1916 -4058 -396 +4594 +4594 +4640 +4640 +4640 5070 -1674 5070 -1674 -1872 +5284 +5284 +5306 +5306 +5340 +5340 +5398 +5514 +5514 +5572 +5572 5606 -1872 5606 -2612 -12 -2652 -5398 -2802 +5616 +5626 +5626 5744 -4304 -2802 5744 -4304 -2802 5744 -4304 -1176 -3160 -2400 -3160 -2400 -2216 -5572 5802 -5572 5802 +910 92 -2458 92 -2458 +968 +968 +968 diff --git ql/src/test/results/clientpositive/louter_join_ppr.q.out ql/src/test/results/clientpositive/louter_join_ppr.q.out index 1e60985..7db4457 100644 --- ql/src/test/results/clientpositive/louter_join_ppr.q.out +++ ql/src/test/results/clientpositive/louter_join_ppr.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN EXTENDED +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN EXTENDED FROM src a LEFT OUTER JOIN @@ -7,7 +9,9 @@ PREHOOK: query: EXPLAIN EXTENDED SELECT a.key, a.value, b.key, b.value WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN EXTENDED +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN EXTENDED FROM src a LEFT OUTER JOIN diff --git ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out index 7ef7c3e..510f3be 100644 --- ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out +++ ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out @@ -1,8 +1,12 @@ -PREHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin +PREHOOK: query: -- SORT_QUERY_RESULTS + +-- Since the inputs are small, it should be automatically converted to mapjoin explain extended select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) PREHOOK: type: QUERY -POSTHOOK: query: -- Since the inputs are small, it should be automatically converted to mapjoin +POSTHOOK: query: -- SORT_QUERY_RESULTS + +-- Since the inputs are small, it should be automatically converted to mapjoin explain extended select srcpart.key from srcpart join src on (srcpart.value=src.value) join src1 on (srcpart.key=src1.key) POSTHOOK: type: QUERY @@ -714,24 +718,24 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### +66 +66 +66 +66 98 98 -66 98 98 98 98 -66 98 98 98 98 -66 98 98 98 98 -66 98 98 PREHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds @@ -774,24 +778,24 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 #### A masked pattern was here #### +66 +66 +66 +66 98 98 -66 98 98 98 98 -66 98 98 98 98 -66 98 98 98 98 -66 98 98 PREHOOK: query: select count(*) from srcpart join src on (srcpart.value=src.value) join src src1 on (srcpart.key=src1.key) group by ds diff --git ql/src/test/results/clientpositive/ppd_join.q.out ql/src/test/results/clientpositive/ppd_join.q.out index 413e899..7071fc7 100644 --- ql/src/test/results/clientpositive/ppd_join.q.out +++ ql/src/test/results/clientpositive/ppd_join.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src where src.key > '1' ) src1 @@ -7,7 +9,9 @@ JOIN ON src1.c1 = src2.c3 AND src1.c1 < '400' WHERE src1.c1 > '20' and (src1.c2 < 'val_50' or src1.c1 > '2') and (src2.c3 > '50' or src1.c1 < '50') and (src2.c3 <> '4') PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src where src.key > '1' ) src1 diff --git ql/src/test/results/clientpositive/ppd_join2.q.out ql/src/test/results/clientpositive/ppd_join2.q.out index e5c1ee5..10ffe4e 100644 --- ql/src/test/results/clientpositive/ppd_join2.q.out +++ ql/src/test/results/clientpositive/ppd_join2.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src where src.key <> '302' ) src1 @@ -10,7 +12,9 @@ JOIN ON src1.c2 = src3.c6 WHERE src1.c1 <> '311' and (src1.c2 <> 'val_50' or src1.c1 > '1') and (src2.c3 <> '10' or src1.c1 <> '10') and (src2.c3 <> '14') and (sqrt(src3.c5) <> 13) PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src where src.key <> '302' ) src1 diff --git ql/src/test/results/clientpositive/ppd_join3.q.out ql/src/test/results/clientpositive/ppd_join3.q.out index 62b21c8..2c77c8d 100644 --- ql/src/test/results/clientpositive/ppd_join3.q.out +++ ql/src/test/results/clientpositive/ppd_join3.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src where src.key <> '11' ) src1 @@ -10,7 +12,9 @@ JOIN ON src1.c1 = src3.c5 WHERE src1.c1 > '0' and (src1.c2 <> 'val_500' or src1.c1 > '1') and (src2.c3 > '10' or src1.c1 <> '10') and (src2.c3 <> '4') and (src3.c5 <> '1') PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN SELECT src1.c1, src2.c4 FROM (SELECT src.key as c1, src.value as c2 from src where src.key <> '11' ) src1 diff --git ql/src/test/results/clientpositive/ppd_outer_join1.q.out ql/src/test/results/clientpositive/ppd_outer_join1.q.out index fc314ca..f0163e0 100644 --- ql/src/test/results/clientpositive/ppd_outer_join1.q.out +++ ql/src/test/results/clientpositive/ppd_outer_join1.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM src a LEFT OUTER JOIN @@ -7,7 +9,9 @@ PREHOOK: query: EXPLAIN SELECT a.key, a.value, b.key, b.value WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM src a LEFT OUTER JOIN diff --git ql/src/test/results/clientpositive/ppd_outer_join2.q.out ql/src/test/results/clientpositive/ppd_outer_join2.q.out index 9ea48d4..311ec8c 100644 --- ql/src/test/results/clientpositive/ppd_outer_join2.q.out +++ ql/src/test/results/clientpositive/ppd_outer_join2.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM src a RIGHT OUTER JOIN @@ -7,7 +9,9 @@ PREHOOK: query: EXPLAIN SELECT a.key, a.value, b.key, b.value WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25' PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM src a RIGHT OUTER JOIN diff --git ql/src/test/results/clientpositive/ppd_outer_join4.q.out ql/src/test/results/clientpositive/ppd_outer_join4.q.out index fc729e5..e52872f 100644 --- ql/src/test/results/clientpositive/ppd_outer_join4.q.out +++ ql/src/test/results/clientpositive/ppd_outer_join4.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM src a LEFT OUTER JOIN @@ -10,7 +12,9 @@ PREHOOK: query: EXPLAIN SELECT a.key, a.value, b.key, b.value, c.key WHERE a.key > '10' AND a.key < '20' AND b.key > '15' AND b.key < '25' AND sqrt(c.key) <> 13 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN FROM src a LEFT OUTER JOIN diff --git ql/src/test/results/clientpositive/router_join_ppr.q.out ql/src/test/results/clientpositive/router_join_ppr.q.out index f70706b..95c51ba 100644 --- ql/src/test/results/clientpositive/router_join_ppr.q.out +++ ql/src/test/results/clientpositive/router_join_ppr.q.out @@ -1,4 +1,6 @@ -PREHOOK: query: EXPLAIN EXTENDED +PREHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN EXTENDED FROM src a RIGHT OUTER JOIN @@ -7,7 +9,9 @@ PREHOOK: query: EXPLAIN EXTENDED SELECT a.key, a.value, b.key, b.value WHERE a.key > 10 AND a.key < 20 AND b.key > 15 AND b.key < 25 PREHOOK: type: QUERY -POSTHOOK: query: EXPLAIN EXTENDED +POSTHOOK: query: -- SORT_QUERY_RESULTS + +EXPLAIN EXTENDED FROM src a RIGHT OUTER JOIN diff --git ql/src/test/results/clientpositive/temp_table_join1.q.out ql/src/test/results/clientpositive/temp_table_join1.q.out index 79d5774..dfb227e 100644 --- ql/src/test/results/clientpositive/temp_table_join1.q.out +++ ql/src/test/results/clientpositive/temp_table_join1.q.out @@ -1,9 +1,13 @@ -PREHOOK: query: CREATE TABLE src_nontemp AS SELECT * FROM src limit 10 +PREHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE src_nontemp AS SELECT * FROM src limit 10 PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@src PREHOOK: Output: database:default PREHOOK: Output: default@src_nontemp -POSTHOOK: query: CREATE TABLE src_nontemp AS SELECT * FROM src limit 10 +POSTHOOK: query: -- SORT_QUERY_RESULTS + +CREATE TABLE src_nontemp AS SELECT * FROM src limit 10 POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@src POSTHOOK: Output: database:default