diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java index 2f36f04..87f3716 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java @@ -578,8 +578,6 @@ public static void setMapWork(MapWork plan, ParseContext parseCtx, Set> mvTasks, HiveConf hco // There are separate configuration parameters to control whether to // merge for a map-only job // or for a map-reduce job - if (currTask.getWork() instanceof MapredWork) { + if (currTask.getWork() instanceof MapredWork) { ReduceWork reduceWork = ((MapredWork) currTask.getWork()).getReduceWork(); boolean mergeMapOnly = hconf.getBoolVar(ConfVars.HIVEMERGEMAPFILES) && reduceWork == null; @@ -1788,7 +1786,7 @@ public static Path createMoveTask(Task currTask, boolean return Collections.emptyList(); } - public static List getInputPathsForPartialScan(QBParseInfo parseInfo, StringBuffer aggregationKey) + public static List getInputPathsForPartialScan(QBParseInfo parseInfo, StringBuffer aggregationKey) throws SemanticException { List inputPaths = new ArrayList(); switch (parseInfo.getTableSpec().specType) { @@ -1825,6 +1823,7 @@ public static Path createMoveTask(Task currTask, boolean public static Set> findTopOps(Operator startOp, final Class clazz) { final Set> operators = new LinkedHashSet>(); OperatorUtils.iterateParents(startOp, new NodeUtils.Function>() { + @Override public void apply(Operator argument) { if (argument.getNumParent() == 0 && (clazz == null || clazz.isInstance(argument))) { operators.add(argument); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index c4dacf9..ddd645b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -1624,6 +1624,10 @@ public void getMetaData(QB qb, ReadEntity parentInput) throws SemanticException qb.getParseInfo().addTableSpec(alias, ts); } + + ReadEntity parentViewInfo = PlanUtils.getParentViewInfo(getAliasId(alias, qb), viewAliasToInput); + PlanUtils.addInput(inputs, + new ReadEntity(tab, parentViewInfo, parentViewInfo == null)); } LOG.info("Get metadata for subqueries"); @@ -2428,7 +2432,7 @@ private Operator genHavingPlan(String dest, QB qb, Operator input, output = putOpInsertMap(output, inputRR); return output; } - + private Operator genPlanForSubQueryPredicate( QB qbSQ, ISubQueryJoinInfo subQueryPredicate) throws SemanticException { diff --git a/ql/src/test/results/clientnegative/limit_partition_stats.q.out b/ql/src/test/results/clientnegative/limit_partition_stats.q.out index 5a5fe1f..6ecf5b7 100644 --- a/ql/src/test/results/clientnegative/limit_partition_stats.q.out +++ b/ql/src/test/results/clientnegative/limit_partition_stats.q.out @@ -43,9 +43,11 @@ STAGE PLANS: PREHOOK: query: select count(*) from part PREHOOK: type: QUERY +PREHOOK: Input: default@part #### A masked pattern was here #### POSTHOOK: query: select count(*) from part POSTHOOK: type: QUERY +POSTHOOK: Input: default@part #### A masked pattern was here #### 2000 PREHOOK: query: explain select count(*) from part diff --git a/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out b/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out index eae45b2..f3b3e91 100644 --- a/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out +++ b/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out @@ -65,9 +65,11 @@ value string #### A masked pattern was here #### PREHOOK: query: analyze table src_orc_merge_test_stat compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@src_orc_merge_test_stat PREHOOK: Output: default@src_orc_merge_test_stat POSTHOOK: query: analyze table src_orc_merge_test_stat compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@src_orc_merge_test_stat POSTHOOK: Output: default@src_orc_merge_test_stat PREHOOK: query: desc formatted src_orc_merge_test_stat PREHOOK: type: DESCTABLE @@ -115,9 +117,11 @@ POSTHOOK: Input: default@src_orc_merge_test_stat POSTHOOK: Output: default@src_orc_merge_test_stat PREHOOK: query: analyze table src_orc_merge_test_stat compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@src_orc_merge_test_stat PREHOOK: Output: default@src_orc_merge_test_stat POSTHOOK: query: analyze table src_orc_merge_test_stat compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@src_orc_merge_test_stat POSTHOOK: Output: default@src_orc_merge_test_stat PREHOOK: query: desc formatted src_orc_merge_test_stat PREHOOK: type: DESCTABLE @@ -260,10 +264,12 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: analyze table src_orc_merge_test_part_stat partition(ds='2011') compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@src_orc_merge_test_part_stat PREHOOK: Output: default@src_orc_merge_test_part_stat PREHOOK: Output: default@src_orc_merge_test_part_stat@ds=2011 POSTHOOK: query: analyze table src_orc_merge_test_part_stat partition(ds='2011') compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@src_orc_merge_test_part_stat POSTHOOK: Output: default@src_orc_merge_test_part_stat POSTHOOK: Output: default@src_orc_merge_test_part_stat@ds=2011 PREHOOK: query: desc formatted src_orc_merge_test_part_stat partition (ds='2011') @@ -317,10 +323,12 @@ POSTHOOK: Input: default@src_orc_merge_test_part_stat POSTHOOK: Output: default@src_orc_merge_test_part_stat@ds=2011 PREHOOK: query: analyze table src_orc_merge_test_part_stat partition(ds='2011') compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@src_orc_merge_test_part_stat PREHOOK: Output: default@src_orc_merge_test_part_stat PREHOOK: Output: default@src_orc_merge_test_part_stat@ds=2011 POSTHOOK: query: analyze table src_orc_merge_test_part_stat partition(ds='2011') compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@src_orc_merge_test_part_stat POSTHOOK: Output: default@src_orc_merge_test_part_stat POSTHOOK: Output: default@src_orc_merge_test_part_stat@ds=2011 PREHOOK: query: desc formatted src_orc_merge_test_part_stat partition (ds='2011') diff --git a/ql/src/test/results/clientpositive/authorization_explain.q.out b/ql/src/test/results/clientpositive/authorization_explain.q.out index e5e605b..ba73021 100644 --- a/ql/src/test/results/clientpositive/authorization_explain.q.out +++ b/ql/src/test/results/clientpositive/authorization_explain.q.out @@ -5,11 +5,11 @@ POSTHOOK: query: explain authorization select * from src join srcpart POSTHOOK: type: QUERY INPUTS: default@srcpart + default@src default@srcpart@ds=2008-04-08/hr=11 default@srcpart@ds=2008-04-08/hr=12 default@srcpart@ds=2008-04-09/hr=11 default@srcpart@ds=2008-04-09/hr=12 - default@src OUTPUTS: #### A masked pattern was here #### CURRENT_USER: diff --git a/ql/src/test/results/clientpositive/explain_dependency.q.out b/ql/src/test/results/clientpositive/explain_dependency.q.out index cb98d54..b9a8ed8 100644 --- a/ql/src/test/results/clientpositive/explain_dependency.q.out +++ b/ql/src/test/results/clientpositive/explain_dependency.q.out @@ -88,7 +88,7 @@ POSTHOOK: query: EXPLAIN DEPENDENCY SELECT key, value FROM src UNION ALL SELECT key, value FROM srcpart WHERE ds IS NOT NULL ) S1 POSTHOOK: type: QUERY -{"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"},{"tablename":"default@src","tabletype":"MANAGED_TABLE"}]} +{"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@src","tabletype":"MANAGED_TABLE"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}]} PREHOOK: query: EXPLAIN DEPENDENCY SELECT S1.key, S2.value FROM src S1 JOIN srcpart S2 ON S1.key = S2.key WHERE ds IS NOT NULL PREHOOK: type: QUERY @@ -112,12 +112,12 @@ PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V3 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V3 POSTHOOK: type: QUERY -{"input_partitions":[{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@v3","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@v2","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v3]"},{"tablename":"default@src","tabletype":"MANAGED_TABLE","tableParents":"[default@v3]"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v2]"}]} +{"input_partitions":[{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@v3","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@src","tabletype":"MANAGED_TABLE","tableParents":"[default@v3]"},{"tablename":"default@v2","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v3]"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v2]"}]} PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V4 PREHOOK: type: QUERY POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V4 POSTHOOK: type: QUERY -{"input_partitions":[{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@v4","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@v2","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v4]"},{"tablename":"default@v1","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v4]"},{"tablename":"default@src","tabletype":"MANAGED_TABLE","tableParents":"[default@v4, default@v1]"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v2]"}]} +{"input_partitions":[{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@v4","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@v2","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v4]"},{"tablename":"default@src","tabletype":"MANAGED_TABLE","tableParents":"[default@v4, default@v1]"},{"tablename":"default@v1","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v4]"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v2]"}]} PREHOOK: query: -- The table should show up in the explain dependency even if none -- of the partitions are selected. CREATE VIEW V5 as SELECT * FROM srcpart where ds = '10' diff --git a/ql/src/test/results/clientpositive/limit0.q.out b/ql/src/test/results/clientpositive/limit0.q.out index d047374..3f08bdd 100644 --- a/ql/src/test/results/clientpositive/limit0.q.out +++ b/ql/src/test/results/clientpositive/limit0.q.out @@ -42,19 +42,25 @@ STAGE PLANS: PREHOOK: query: select * from src where key = '238' limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### POSTHOOK: query: select * from src where key = '238' limit 0 POSTHOOK: type: QUERY +POSTHOOK: Input: default@src #### A masked pattern was here #### PREHOOK: query: select src.key, count(src.value) from src group by src.key limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### POSTHOOK: query: select src.key, count(src.value) from src group by src.key limit 0 POSTHOOK: type: QUERY +POSTHOOK: Input: default@src #### A masked pattern was here #### PREHOOK: query: select * from ( select key from src limit 3) sq1 limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### POSTHOOK: query: select * from ( select key from src limit 3) sq1 limit 0 POSTHOOK: type: QUERY +POSTHOOK: Input: default@src #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/limit_pushdown.q.out b/ql/src/test/results/clientpositive/limit_pushdown.q.out index a5a0090..4abef8c 100644 --- a/ql/src/test/results/clientpositive/limit_pushdown.q.out +++ b/ql/src/test/results/clientpositive/limit_pushdown.q.out @@ -631,9 +631,11 @@ STAGE PLANS: PREHOOK: query: select key,value from src order by key limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### POSTHOOK: query: select key,value from src order by key limit 0 POSTHOOK: type: QUERY +POSTHOOK: Input: default@src #### A masked pattern was here #### PREHOOK: query: -- 2MR (applied to last RS) explain diff --git a/ql/src/test/results/clientpositive/metadata_only_queries.q.out b/ql/src/test/results/clientpositive/metadata_only_queries.q.out index e273570..f5b9bd8 100644 --- a/ql/src/test/results/clientpositive/metadata_only_queries.q.out +++ b/ql/src/test/results/clientpositive/metadata_only_queries.q.out @@ -340,9 +340,11 @@ STAGE PLANS: PREHOOK: query: select count(*), sum(1), sum(0.2), count(1), count(s), count(bo), count(bin), count(si) from stats_tbl PREHOOK: type: QUERY +PREHOOK: Input: default@stats_tbl #### A masked pattern was here #### POSTHOOK: query: select count(*), sum(1), sum(0.2), count(1), count(s), count(bo), count(bin), count(si) from stats_tbl POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_tbl #### A masked pattern was here #### 9999 9999 1999.8 9999 9999 9999 9999 9999 PREHOOK: query: explain @@ -363,9 +365,11 @@ STAGE PLANS: PREHOOK: query: select min(i), max(i), min(b), max(b), min(f), max(f), min(d), max(d) from stats_tbl PREHOOK: type: QUERY +PREHOOK: Input: default@stats_tbl #### A masked pattern was here #### POSTHOOK: query: select min(i), max(i), min(b), max(b), min(f), max(f), min(d), max(d) from stats_tbl POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_tbl #### A masked pattern was here #### 65536 65791 4294967296 4294967551 0.009999999776482582 99.9800033569336 0.01 50.0 PREHOOK: query: explain @@ -386,9 +390,11 @@ STAGE PLANS: PREHOOK: query: select count(*), sum(1), sum(0.2), count(1), count(s), count(bo), count(bin), count(si) from stats_tbl_part PREHOOK: type: QUERY +PREHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### POSTHOOK: query: select count(*), sum(1), sum(0.2), count(1), count(s), count(bo), count(bin), count(si) from stats_tbl_part POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### 9489 9489 1897.8 9489 9489 9489 9489 9489 PREHOOK: query: explain @@ -409,9 +415,11 @@ STAGE PLANS: PREHOOK: query: select min(i), max(i), min(b), max(b), min(f), max(f), min(d), max(d) from stats_tbl_part PREHOOK: type: QUERY +PREHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### POSTHOOK: query: select min(i), max(i), min(b), max(b), min(f), max(f), min(d), max(d) from stats_tbl_part POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### 65536 65791 4294967296 4294967551 0.009999999776482582 99.9800033569336 0.01 50.0 PREHOOK: query: explain select count(ts) from stats_tbl_part diff --git a/ql/src/test/results/clientpositive/metadata_only_queries_with_filters.q.out b/ql/src/test/results/clientpositive/metadata_only_queries_with_filters.q.out index 664e065..5be958f 100644 --- a/ql/src/test/results/clientpositive/metadata_only_queries_with_filters.q.out +++ b/ql/src/test/results/clientpositive/metadata_only_queries_with_filters.q.out @@ -160,9 +160,11 @@ STAGE PLANS: PREHOOK: query: select count(*), count(1), sum(1), count(s), count(bo), count(bin), count(si), max(i), min(b), max(f), min(d) from stats_tbl_part where dt = 2010 PREHOOK: type: QUERY +PREHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### POSTHOOK: query: select count(*), count(1), sum(1), count(s), count(bo), count(bin), count(si), max(i), min(b), max(f), min(d) from stats_tbl_part where dt = 2010 POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### 2322 2322 2322 2322 2322 2322 2322 65791 4294967296 99.9800033569336 0.03 PREHOOK: query: explain @@ -183,16 +185,20 @@ STAGE PLANS: PREHOOK: query: select count(*), count(1), sum(1), sum(2), count(s), count(bo), count(bin), count(si), max(i), min(b), max(f), min(d) from stats_tbl_part where dt > 2010 PREHOOK: type: QUERY +PREHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### POSTHOOK: query: select count(*), count(1), sum(1), sum(2), count(s), count(bo), count(bin), count(si), max(i), min(b), max(f), min(d) from stats_tbl_part where dt > 2010 POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### 2219 2219 2219 4438 2219 2219 2219 2219 65791 4294967296 99.95999908447266 0.04 PREHOOK: query: select count(*) from stats_tbl_part PREHOOK: type: QUERY +PREHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### POSTHOOK: query: select count(*) from stats_tbl_part POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### 4541 PREHOOK: query: select count(*)/2 from stats_tbl_part diff --git a/ql/src/test/results/clientpositive/orc_analyze.q.out b/ql/src/test/results/clientpositive/orc_analyze.q.out index 07e46e9..af79e26 100644 --- a/ql/src/test/results/clientpositive/orc_analyze.q.out +++ b/ql/src/test/results/clientpositive/orc_analyze.q.out @@ -73,9 +73,11 @@ POSTHOOK: Lineage: orc_create_people.start_date SIMPLE [(orc_create_people_stagi POSTHOOK: Lineage: orc_create_people.state SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:state, type:string, comment:null), ] PREHOOK: query: analyze table orc_create_people compute statistics partialscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_create_people PREHOOK: Output: default@orc_create_people POSTHOOK: query: analyze table orc_create_people compute statistics partialscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_create_people POSTHOOK: Output: default@orc_create_people PREHOOK: query: desc formatted orc_create_people PREHOOK: type: DESCTABLE @@ -269,11 +271,13 @@ POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).salary SIMPLE [(orc_cre POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).start_date SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:start_date, type:timestamp, comment:null), ] PREHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_create_people PREHOOK: Output: default@orc_create_people PREHOOK: Output: default@orc_create_people@state=Ca PREHOOK: Output: default@orc_create_people@state=Or POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_create_people POSTHOOK: Output: default@orc_create_people POSTHOOK: Output: default@orc_create_people@state=Ca POSTHOOK: Output: default@orc_create_people@state=Or @@ -581,11 +585,13 @@ POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).salary SIMPLE [(orc_cre POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).start_date SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:start_date, type:timestamp, comment:null), ] PREHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_create_people PREHOOK: Output: default@orc_create_people PREHOOK: Output: default@orc_create_people@state=Ca PREHOOK: Output: default@orc_create_people@state=Or POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_create_people POSTHOOK: Output: default@orc_create_people POSTHOOK: Output: default@orc_create_people@state=Ca POSTHOOK: Output: default@orc_create_people@state=Or @@ -942,12 +948,14 @@ POSTHOOK: Input: default@orc_create_people POSTHOOK: Output: default@orc_create_people PREHOOK: query: analyze table orc_create_people partition(state) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_create_people PREHOOK: Output: default@orc_create_people PREHOOK: Output: default@orc_create_people@state=Ca PREHOOK: Output: default@orc_create_people@state=OH PREHOOK: Output: default@orc_create_people@state=Or POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_create_people POSTHOOK: Output: default@orc_create_people POSTHOOK: Output: default@orc_create_people@state=Ca POSTHOOK: Output: default@orc_create_people@state=OH diff --git a/ql/src/test/results/clientpositive/orc_merge5.q.out b/ql/src/test/results/clientpositive/orc_merge5.q.out index 2ac3342..840dbf2 100644 --- a/ql/src/test/results/clientpositive/orc_merge5.q.out +++ b/ql/src/test/results/clientpositive/orc_merge5.q.out @@ -90,10 +90,12 @@ POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema PREHOOK: query: -- 3 files total analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: -- 3 files total analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE @@ -243,10 +245,12 @@ POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema PREHOOK: query: -- 1 file after merging analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: -- 1 file after merging analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE @@ -313,9 +317,11 @@ POSTHOOK: Lineage: orc_merge5b.ts SIMPLE [(orc_merge5)orc_merge5.FieldSchema(nam POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ] PREHOOK: query: analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE @@ -403,10 +409,12 @@ POSTHOOK: Output: default@orc_merge5b PREHOOK: query: -- 1 file after merging analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: -- 1 file after merging analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/orc_merge6.q.out b/ql/src/test/results/clientpositive/orc_merge6.q.out index 05deb57..5f51320 100644 --- a/ql/src/test/results/clientpositive/orc_merge6.q.out +++ b/ql/src/test/results/clientpositive/orc_merge6.q.out @@ -108,19 +108,23 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).userid SIMPLE [(orc_ PREHOOK: query: -- 3 files total analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2000/hour=24 POSTHOOK: query: -- 3 files total analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2001/hour=24 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24 PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24) @@ -353,19 +357,23 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).userid SIMPLE [(orc_ PREHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2000/hour=24 POSTHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2001/hour=24 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24 PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24) @@ -512,18 +520,22 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).ts SIMPLE [(orc_merg POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ] PREHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2000/hour=24 POSTHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2001/hour=24 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24 PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24) @@ -689,19 +701,23 @@ POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24 PREHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2000/hour=24 POSTHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2001/hour=24 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24 PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24) diff --git a/ql/src/test/results/clientpositive/orc_merge7.q.out b/ql/src/test/results/clientpositive/orc_merge7.q.out index d342736..2f506cb 100644 --- a/ql/src/test/results/clientpositive/orc_merge7.q.out +++ b/ql/src/test/results/clientpositive/orc_merge7.q.out @@ -141,19 +141,23 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc PREHOOK: query: -- 3 files total analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: -- 3 files total analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) @@ -418,19 +422,23 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc PREHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) @@ -614,18 +622,22 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).ts SIMPLE [(orc_merge5)orc_mer POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ] PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) @@ -791,19 +803,23 @@ POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) diff --git a/ql/src/test/results/clientpositive/orc_merge_incompat1.q.out b/ql/src/test/results/clientpositive/orc_merge_incompat1.q.out index e6ef838..cc81ead 100644 --- a/ql/src/test/results/clientpositive/orc_merge_incompat1.q.out +++ b/ql/src/test/results/clientpositive/orc_merge_incompat1.q.out @@ -141,10 +141,12 @@ POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema PREHOOK: query: -- 5 files total analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: -- 5 files total analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE @@ -219,10 +221,12 @@ POSTHOOK: Output: default@orc_merge5b PREHOOK: query: -- 3 file after merging - all 0.12 format files will be merged and 0.11 files will be left behind analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: -- 3 file after merging - all 0.12 format files will be merged and 0.11 files will be left behind analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/orc_merge_incompat2.q.out b/ql/src/test/results/clientpositive/orc_merge_incompat2.q.out index e28d8b3..c944eb6 100644 --- a/ql/src/test/results/clientpositive/orc_merge_incompat2.q.out +++ b/ql/src/test/results/clientpositive/orc_merge_incompat2.q.out @@ -200,18 +200,22 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).ts SIMPLE [(orc_merge5)orc_mer POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ] PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) @@ -385,18 +389,22 @@ POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) diff --git a/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out b/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out index 0e7c4af..f7da06c 100644 --- a/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out +++ b/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out @@ -306,6 +306,7 @@ group by l_shipdate order by l_shipdate PREHOOK: type: QUERY PREHOOK: Input: default@default__lineitem_lineitem_lshipdate_idx__ +PREHOOK: Input: default@lineitem #### A masked pattern was here #### POSTHOOK: query: select l_shipdate, count(l_shipdate) from lineitem @@ -313,6 +314,7 @@ group by l_shipdate order by l_shipdate POSTHOOK: type: QUERY POSTHOOK: Input: default@default__lineitem_lineitem_lshipdate_idx__ +POSTHOOK: Input: default@lineitem #### A masked pattern was here #### 1992-04-27 1 1992-07-02 1 @@ -654,6 +656,7 @@ group by year(l_shipdate), month(l_shipdate) order by year, month PREHOOK: type: QUERY PREHOOK: Input: default@default__lineitem_lineitem_lshipdate_idx__ +PREHOOK: Input: default@lineitem #### A masked pattern was here #### POSTHOOK: query: select year(l_shipdate) as year, month(l_shipdate) as month, @@ -663,6 +666,7 @@ group by year(l_shipdate), month(l_shipdate) order by year, month POSTHOOK: type: QUERY POSTHOOK: Input: default@default__lineitem_lineitem_lshipdate_idx__ +POSTHOOK: Input: default@lineitem #### A masked pattern was here #### 1992 4 1 1992 7 3 @@ -2628,10 +2632,12 @@ STAGE PLANS: PREHOOK: query: select key, count(key) from tbl group by key order by key PREHOOK: type: QUERY PREHOOK: Input: default@default__tbl_tbl_key_idx__ +PREHOOK: Input: default@tbl #### A masked pattern was here #### POSTHOOK: query: select key, count(key) from tbl group by key order by key POSTHOOK: type: QUERY POSTHOOK: Input: default@default__tbl_tbl_key_idx__ +POSTHOOK: Input: default@tbl #### A masked pattern was here #### 1 1 2 3 diff --git a/ql/src/test/results/clientpositive/query_properties.q.out b/ql/src/test/results/clientpositive/query_properties.q.out index 47f8d8c..5684f0d 100644 --- a/ql/src/test/results/clientpositive/query_properties.q.out +++ b/ql/src/test/results/clientpositive/query_properties.q.out @@ -1,5 +1,6 @@ PREHOOK: query: select * from src a join src b on a.key = b.key limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### Has Join: true Has Group By: false @@ -11,6 +12,7 @@ Has Distribute By: false Has Cluster By: false PREHOOK: query: select * from src group by src.key, src.value limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### Has Join: false Has Group By: true @@ -22,6 +24,7 @@ Has Distribute By: false Has Cluster By: false PREHOOK: query: select * from src order by src.key limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### Has Join: false Has Group By: false @@ -33,6 +36,7 @@ Has Distribute By: false Has Cluster By: false PREHOOK: query: select * from src sort by src.key limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### Has Join: false Has Group By: false @@ -44,6 +48,7 @@ Has Distribute By: false Has Cluster By: false PREHOOK: query: select a.key, sum(b.value) from src a join src b on a.key = b.key group by a.key limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### Has Join: true Has Group By: true @@ -55,6 +60,7 @@ Has Distribute By: false Has Cluster By: false PREHOOK: query: select transform(*) using 'cat' from src limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### Has Join: false Has Group By: false @@ -66,6 +72,7 @@ Has Distribute By: false Has Cluster By: false PREHOOK: query: select * from src distribute by src.key limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### Has Join: false Has Group By: false @@ -77,6 +84,7 @@ Has Distribute By: true Has Cluster By: false PREHOOK: query: select * from src cluster by src.key limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### Has Join: false Has Group By: false @@ -88,6 +96,7 @@ Has Distribute By: false Has Cluster By: true PREHOOK: query: select key, sum(value) from (select a.key as key, b.value as value from src a join src b on a.key = b.key) c group by key limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### Has Join: true Has Group By: true @@ -99,6 +108,7 @@ Has Distribute By: false Has Cluster By: false PREHOOK: query: select * from src a join src b on a.key = b.key order by a.key limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### Has Join: true Has Group By: false @@ -110,6 +120,7 @@ Has Distribute By: false Has Cluster By: false PREHOOK: query: select * from src a join src b on a.key = b.key distribute by a.key sort by a.key, b.value limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### Has Join: true Has Group By: false diff --git a/ql/src/test/results/clientpositive/stats_only_null.q.out b/ql/src/test/results/clientpositive/stats_only_null.q.out index c4728c9..4549b79 100644 --- a/ql/src/test/results/clientpositive/stats_only_null.q.out +++ b/ql/src/test/results/clientpositive/stats_only_null.q.out @@ -322,16 +322,20 @@ STAGE PLANS: PREHOOK: query: select count(*), count(a), count(b), count(c), count(d) from stats_null PREHOOK: type: QUERY +PREHOOK: Input: default@stats_null #### A masked pattern was here #### POSTHOOK: query: select count(*), count(a), count(b), count(c), count(d) from stats_null POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_null #### A masked pattern was here #### 10 8 8 10 10 PREHOOK: query: select count(*), count(a), count(b), count(c), count(d) from stats_null_part PREHOOK: type: QUERY +PREHOOK: Input: default@stats_null_part #### A masked pattern was here #### POSTHOOK: query: select count(*), count(a), count(b), count(c), count(d) from stats_null_part POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_null_part #### A masked pattern was here #### 10 8 8 10 10 PREHOOK: query: drop table stats_null_part diff --git a/ql/src/test/results/clientpositive/tez/alter_merge_stats_orc.q.out b/ql/src/test/results/clientpositive/tez/alter_merge_stats_orc.q.out index eae45b2..f3b3e91 100644 --- a/ql/src/test/results/clientpositive/tez/alter_merge_stats_orc.q.out +++ b/ql/src/test/results/clientpositive/tez/alter_merge_stats_orc.q.out @@ -65,9 +65,11 @@ value string #### A masked pattern was here #### PREHOOK: query: analyze table src_orc_merge_test_stat compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@src_orc_merge_test_stat PREHOOK: Output: default@src_orc_merge_test_stat POSTHOOK: query: analyze table src_orc_merge_test_stat compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@src_orc_merge_test_stat POSTHOOK: Output: default@src_orc_merge_test_stat PREHOOK: query: desc formatted src_orc_merge_test_stat PREHOOK: type: DESCTABLE @@ -115,9 +117,11 @@ POSTHOOK: Input: default@src_orc_merge_test_stat POSTHOOK: Output: default@src_orc_merge_test_stat PREHOOK: query: analyze table src_orc_merge_test_stat compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@src_orc_merge_test_stat PREHOOK: Output: default@src_orc_merge_test_stat POSTHOOK: query: analyze table src_orc_merge_test_stat compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@src_orc_merge_test_stat POSTHOOK: Output: default@src_orc_merge_test_stat PREHOOK: query: desc formatted src_orc_merge_test_stat PREHOOK: type: DESCTABLE @@ -260,10 +264,12 @@ Storage Desc Params: serialization.format 1 PREHOOK: query: analyze table src_orc_merge_test_part_stat partition(ds='2011') compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@src_orc_merge_test_part_stat PREHOOK: Output: default@src_orc_merge_test_part_stat PREHOOK: Output: default@src_orc_merge_test_part_stat@ds=2011 POSTHOOK: query: analyze table src_orc_merge_test_part_stat partition(ds='2011') compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@src_orc_merge_test_part_stat POSTHOOK: Output: default@src_orc_merge_test_part_stat POSTHOOK: Output: default@src_orc_merge_test_part_stat@ds=2011 PREHOOK: query: desc formatted src_orc_merge_test_part_stat partition (ds='2011') @@ -317,10 +323,12 @@ POSTHOOK: Input: default@src_orc_merge_test_part_stat POSTHOOK: Output: default@src_orc_merge_test_part_stat@ds=2011 PREHOOK: query: analyze table src_orc_merge_test_part_stat partition(ds='2011') compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@src_orc_merge_test_part_stat PREHOOK: Output: default@src_orc_merge_test_part_stat PREHOOK: Output: default@src_orc_merge_test_part_stat@ds=2011 POSTHOOK: query: analyze table src_orc_merge_test_part_stat partition(ds='2011') compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@src_orc_merge_test_part_stat POSTHOOK: Output: default@src_orc_merge_test_part_stat POSTHOOK: Output: default@src_orc_merge_test_part_stat@ds=2011 PREHOOK: query: desc formatted src_orc_merge_test_part_stat partition (ds='2011') diff --git a/ql/src/test/results/clientpositive/tez/limit_pushdown.q.out b/ql/src/test/results/clientpositive/tez/limit_pushdown.q.out index 23df5ec..c765ab7 100644 --- a/ql/src/test/results/clientpositive/tez/limit_pushdown.q.out +++ b/ql/src/test/results/clientpositive/tez/limit_pushdown.q.out @@ -673,9 +673,11 @@ STAGE PLANS: PREHOOK: query: select key,value from src order by key limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@src #### A masked pattern was here #### POSTHOOK: query: select key,value from src order by key limit 0 POSTHOOK: type: QUERY +POSTHOOK: Input: default@src #### A masked pattern was here #### PREHOOK: query: -- 2MR (applied to last RS) explain diff --git a/ql/src/test/results/clientpositive/tez/metadata_only_queries.q.out b/ql/src/test/results/clientpositive/tez/metadata_only_queries.q.out index 7942ce7..31c77bc 100644 --- a/ql/src/test/results/clientpositive/tez/metadata_only_queries.q.out +++ b/ql/src/test/results/clientpositive/tez/metadata_only_queries.q.out @@ -352,9 +352,11 @@ STAGE PLANS: PREHOOK: query: select count(*), sum(1), sum(0.2), count(1), count(s), count(bo), count(bin), count(si) from stats_tbl PREHOOK: type: QUERY +PREHOOK: Input: default@stats_tbl #### A masked pattern was here #### POSTHOOK: query: select count(*), sum(1), sum(0.2), count(1), count(s), count(bo), count(bin), count(si) from stats_tbl POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_tbl #### A masked pattern was here #### 9999 9999 1999.8 9999 9999 9999 9999 9999 PREHOOK: query: explain @@ -375,9 +377,11 @@ STAGE PLANS: PREHOOK: query: select min(i), max(i), min(b), max(b), min(f), max(f), min(d), max(d) from stats_tbl PREHOOK: type: QUERY +PREHOOK: Input: default@stats_tbl #### A masked pattern was here #### POSTHOOK: query: select min(i), max(i), min(b), max(b), min(f), max(f), min(d), max(d) from stats_tbl POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_tbl #### A masked pattern was here #### 65536 65791 4294967296 4294967551 0.009999999776482582 99.9800033569336 0.01 50.0 PREHOOK: query: explain @@ -398,9 +402,11 @@ STAGE PLANS: PREHOOK: query: select count(*), sum(1), sum(0.2), count(1), count(s), count(bo), count(bin), count(si) from stats_tbl_part PREHOOK: type: QUERY +PREHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### POSTHOOK: query: select count(*), sum(1), sum(0.2), count(1), count(s), count(bo), count(bin), count(si) from stats_tbl_part POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### 9489 9489 1897.8 9489 9489 9489 9489 9489 PREHOOK: query: explain @@ -421,9 +427,11 @@ STAGE PLANS: PREHOOK: query: select min(i), max(i), min(b), max(b), min(f), max(f), min(d), max(d) from stats_tbl_part PREHOOK: type: QUERY +PREHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### POSTHOOK: query: select min(i), max(i), min(b), max(b), min(f), max(f), min(d), max(d) from stats_tbl_part POSTHOOK: type: QUERY +POSTHOOK: Input: default@stats_tbl_part #### A masked pattern was here #### 65536 65791 4294967296 4294967551 0.009999999776482582 99.9800033569336 0.01 50.0 PREHOOK: query: explain select count(ts) from stats_tbl_part diff --git a/ql/src/test/results/clientpositive/tez/orc_analyze.q.out b/ql/src/test/results/clientpositive/tez/orc_analyze.q.out index 07e46e9..af79e26 100644 --- a/ql/src/test/results/clientpositive/tez/orc_analyze.q.out +++ b/ql/src/test/results/clientpositive/tez/orc_analyze.q.out @@ -73,9 +73,11 @@ POSTHOOK: Lineage: orc_create_people.start_date SIMPLE [(orc_create_people_stagi POSTHOOK: Lineage: orc_create_people.state SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:state, type:string, comment:null), ] PREHOOK: query: analyze table orc_create_people compute statistics partialscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_create_people PREHOOK: Output: default@orc_create_people POSTHOOK: query: analyze table orc_create_people compute statistics partialscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_create_people POSTHOOK: Output: default@orc_create_people PREHOOK: query: desc formatted orc_create_people PREHOOK: type: DESCTABLE @@ -269,11 +271,13 @@ POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).salary SIMPLE [(orc_cre POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).start_date SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:start_date, type:timestamp, comment:null), ] PREHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_create_people PREHOOK: Output: default@orc_create_people PREHOOK: Output: default@orc_create_people@state=Ca PREHOOK: Output: default@orc_create_people@state=Or POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_create_people POSTHOOK: Output: default@orc_create_people POSTHOOK: Output: default@orc_create_people@state=Ca POSTHOOK: Output: default@orc_create_people@state=Or @@ -581,11 +585,13 @@ POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).salary SIMPLE [(orc_cre POSTHOOK: Lineage: orc_create_people PARTITION(state=Or).start_date SIMPLE [(orc_create_people_staging)orc_create_people_staging.FieldSchema(name:start_date, type:timestamp, comment:null), ] PREHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_create_people PREHOOK: Output: default@orc_create_people PREHOOK: Output: default@orc_create_people@state=Ca PREHOOK: Output: default@orc_create_people@state=Or POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics partialscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_create_people POSTHOOK: Output: default@orc_create_people POSTHOOK: Output: default@orc_create_people@state=Ca POSTHOOK: Output: default@orc_create_people@state=Or @@ -942,12 +948,14 @@ POSTHOOK: Input: default@orc_create_people POSTHOOK: Output: default@orc_create_people PREHOOK: query: analyze table orc_create_people partition(state) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_create_people PREHOOK: Output: default@orc_create_people PREHOOK: Output: default@orc_create_people@state=Ca PREHOOK: Output: default@orc_create_people@state=OH PREHOOK: Output: default@orc_create_people@state=Or POSTHOOK: query: analyze table orc_create_people partition(state) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_create_people POSTHOOK: Output: default@orc_create_people POSTHOOK: Output: default@orc_create_people@state=Ca POSTHOOK: Output: default@orc_create_people@state=OH diff --git a/ql/src/test/results/clientpositive/tez/orc_merge5.q.out b/ql/src/test/results/clientpositive/tez/orc_merge5.q.out index b40a37d..fdd4c77 100644 --- a/ql/src/test/results/clientpositive/tez/orc_merge5.q.out +++ b/ql/src/test/results/clientpositive/tez/orc_merge5.q.out @@ -97,10 +97,12 @@ POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema PREHOOK: query: -- 3 files total analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: -- 3 files total analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE @@ -265,10 +267,12 @@ POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema PREHOOK: query: -- 1 file after merging analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: -- 1 file after merging analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE @@ -335,9 +339,11 @@ POSTHOOK: Lineage: orc_merge5b.ts SIMPLE [(orc_merge5)orc_merge5.FieldSchema(nam POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ] PREHOOK: query: analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE @@ -425,10 +431,12 @@ POSTHOOK: Output: default@orc_merge5b PREHOOK: query: -- 1 file after merging analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: -- 1 file after merging analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/tez/orc_merge6.q.out b/ql/src/test/results/clientpositive/tez/orc_merge6.q.out index 0441fa4..b9057f5 100644 --- a/ql/src/test/results/clientpositive/tez/orc_merge6.q.out +++ b/ql/src/test/results/clientpositive/tez/orc_merge6.q.out @@ -115,19 +115,23 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).userid SIMPLE [(orc_ PREHOOK: query: -- 3 files total analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2000/hour=24 POSTHOOK: query: -- 3 files total analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2001/hour=24 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24 PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24) @@ -375,19 +379,23 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).userid SIMPLE [(orc_ PREHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2000/hour=24 POSTHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2001/hour=24 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24 PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24) @@ -534,18 +542,22 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).ts SIMPLE [(orc_merg POSTHOOK: Lineage: orc_merge5a PARTITION(year=2001,hour=24).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ] PREHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2000/hour=24 POSTHOOK: query: analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2001/hour=24 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24 PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24) @@ -711,19 +723,23 @@ POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24 PREHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2000/hour=24 POSTHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(year="2000",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2000/hour=24 PREHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@year=2001/hour=24 POSTHOOK: query: analyze table orc_merge5a partition(year="2001",hour=24) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@year=2001/hour=24 PREHOOK: query: desc formatted orc_merge5a partition(year="2000",hour=24) diff --git a/ql/src/test/results/clientpositive/tez/orc_merge7.q.out b/ql/src/test/results/clientpositive/tez/orc_merge7.q.out index c6809a1..454b120 100644 --- a/ql/src/test/results/clientpositive/tez/orc_merge7.q.out +++ b/ql/src/test/results/clientpositive/tez/orc_merge7.q.out @@ -148,19 +148,23 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc PREHOOK: query: -- 3 files total analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: -- 3 files total analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) @@ -440,19 +444,23 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc PREHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) @@ -636,18 +644,22 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).ts SIMPLE [(orc_merge5)orc_mer POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ] PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) @@ -813,19 +825,23 @@ POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: -- 1 file after merging analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) diff --git a/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out b/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out index 90f7f24..33b5fcd 100644 --- a/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out +++ b/ql/src/test/results/clientpositive/tez/orc_merge_incompat1.q.out @@ -148,10 +148,12 @@ POSTHOOK: Lineage: orc_merge5b.userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema PREHOOK: query: -- 5 files total analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: -- 5 files total analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE @@ -226,10 +228,12 @@ POSTHOOK: Output: default@orc_merge5b PREHOOK: query: -- 3 file after merging - all 0.12 format files will be merged and 0.11 files will be left behind analyze table orc_merge5b compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5b PREHOOK: Output: default@orc_merge5b POSTHOOK: query: -- 3 file after merging - all 0.12 format files will be merged and 0.11 files will be left behind analyze table orc_merge5b compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5b POSTHOOK: Output: default@orc_merge5b PREHOOK: query: desc formatted orc_merge5b PREHOOK: type: DESCTABLE diff --git a/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out b/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out index 30c6ab8..963ac36 100644 --- a/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out +++ b/ql/src/test/results/clientpositive/tez/orc_merge_incompat2.q.out @@ -207,18 +207,22 @@ POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).ts SIMPLE [(orc_merge5)orc_mer POSTHOOK: Lineage: orc_merge5a PARTITION(st=80.0).userid SIMPLE [(orc_merge5)orc_merge5.FieldSchema(name:userid, type:bigint, comment:null), ] PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) @@ -392,18 +396,22 @@ POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=80.0 POSTHOOK: query: analyze table orc_merge5a partition(st=80.0) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=80.0 PREHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan PREHOOK: type: QUERY +PREHOOK: Input: default@orc_merge5a PREHOOK: Output: default@orc_merge5a PREHOOK: Output: default@orc_merge5a@st=0.8 POSTHOOK: query: analyze table orc_merge5a partition(st=0.8) compute statistics noscan POSTHOOK: type: QUERY +POSTHOOK: Input: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a POSTHOOK: Output: default@orc_merge5a@st=0.8 PREHOOK: query: desc formatted orc_merge5a partition(st=80.0) diff --git a/ql/src/test/results/clientpositive/vectorization_limit.q.out b/ql/src/test/results/clientpositive/vectorization_limit.q.out index d67d559..5a31b9e 100644 --- a/ql/src/test/results/clientpositive/vectorization_limit.q.out +++ b/ql/src/test/results/clientpositive/vectorization_limit.q.out @@ -433,9 +433,11 @@ STAGE PLANS: PREHOOK: query: select ctinyint,cdouble from alltypesorc order by ctinyint limit 0 PREHOOK: type: QUERY +PREHOOK: Input: default@alltypesorc #### A masked pattern was here #### POSTHOOK: query: select ctinyint,cdouble from alltypesorc order by ctinyint limit 0 POSTHOOK: type: QUERY +POSTHOOK: Input: default@alltypesorc #### A masked pattern was here #### PREHOOK: query: -- 2MR (applied to last RS) explain