Repository: incubator-quickstep Updated Branches: refs/heads/common-subexpression bd78194e6 -> e0d9f2fd3
Updates Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/e0d9f2fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/e0d9f2fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/e0d9f2fd Branch: refs/heads/common-subexpression Commit: e0d9f2fd358c2c65de19cb94d5699775b92a38be Parents: bd78194 Author: Jianqiao Zhu <jianq...@cs.wisc.edu> Authored: Fri Apr 21 16:44:37 2017 -0500 Committer: Jianqiao Zhu <jianq...@cs.wisc.edu> Committed: Fri Apr 21 16:44:37 2017 -0500 ---------------------------------------------------------------------- .../physical_generator/CommonSubexpression.test | 4 ++-- .../tests/physical_generator/Select.test | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/e0d9f2fd/query_optimizer/tests/physical_generator/CommonSubexpression.test ---------------------------------------------------------------------- diff --git a/query_optimizer/tests/physical_generator/CommonSubexpression.test b/query_optimizer/tests/physical_generator/CommonSubexpression.test index 0d7ed3f..b23a97d 100644 --- a/query_optimizer/tests/physical_generator/CommonSubexpression.test +++ b/query_optimizer/tests/physical_generator/CommonSubexpression.test @@ -127,13 +127,13 @@ TopLevelPlan | | +-grouping_expressions= | | | +-[] | | +-aggregate_expressions= -| | +-Alias[id=6,name=,alias=$aggregate0,relation=,type=Double NULL] +| | +-Alias[id=6,name=,alias=$aggregate0,relation=$aggregate,type=Double NULL] | | | +-AggregateFunction[function=SUM] | | | +-CommonSubexpression[common_subexpression_id=8] | | | +-Operand=Add | | | +-AttributeReference[id=0,name=int_col,relation=test,type=Int NULL] | | | +-AttributeReference[id=2,name=float_col,relation=test,type=Float] -| | +-Alias[id=7,name=,alias=$aggregate1,relation=,type=Float NULL] +| | +-Alias[id=7,name=,alias=$aggregate1,relation=$aggregate,type=Float NULL] | | +-AggregateFunction[function=MIN] | | +-Multiply | | +-CommonSubexpression[common_subexpression_id=8] http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/e0d9f2fd/query_optimizer/tests/physical_generator/Select.test ---------------------------------------------------------------------- diff --git a/query_optimizer/tests/physical_generator/Select.test b/query_optimizer/tests/physical_generator/Select.test index de640f6..614347b 100644 --- a/query_optimizer/tests/physical_generator/Select.test +++ b/query_optimizer/tests/physical_generator/Select.test @@ -1044,7 +1044,7 @@ TopLevelPlan | | | +-Alias[id=8,name=,alias=$aggregate2,relation=$aggregate,type=Long NULL] | | | | +-AggregateFunction[function=SUM] | | | | +-AttributeReference[id=1,name=long_col,relation=test,type=Long] -| | | +-Alias[id=12,name=,alias=$aggregate3,relation=,type=Long NULL] +| | | +-Alias[id=12,name=,alias=$aggregate3,relation=$aggregate,type=Long NULL] | | | | +-AggregateFunction[function=SUM] | | | | +-AttributeReference[id=0,name=int_col,relation=test,type=Int NULL] | | | +-Alias[id=11,name=,alias=$aggregate4,relation=$aggregate, @@ -1059,10 +1059,10 @@ TopLevelPlan | | | type=Long] | | +-AttributeReference[id=8,name=,alias=$aggregate2,relation=$aggregate, | | | type=Long NULL] -| | +-Alias[id=9,name=,alias=$aggregate3,relation=,type=Long NULL] +| | +-Alias[id=9,name=,alias=$aggregate3,relation=$aggregate,type=Long NULL] | | | +-Divide -| | | +-AttributeReference[id=12,name=,alias=$aggregate3,relation=, -| | | | type=Long NULL] +| | | +-AttributeReference[id=12,name=,alias=$aggregate3, +| | | | relation=$aggregate,type=Long NULL] | | | +-AttributeReference[id=7,name=,alias=$aggregate1,relation=$aggregate, | | | type=Long] | | +-AttributeReference[id=11,name=,alias=$aggregate4,relation=$aggregate, @@ -1325,7 +1325,7 @@ TopLevelPlan | | | +-Alias[id=4,name=subquery_col3,relation=subquery,type=Char(20)] | | | +-AttributeReference[id=4,name=char_col,relation=test,type=Char(20)] | | +-aggregate_expressions= -| | +-Alias[id=8,name=,alias=$aggregate0,relation=,type=Long] +| | +-Alias[id=8,name=,alias=$aggregate0,relation=$aggregate,type=Long] | | | +-AggregateFunction[function=COUNT] | | | +-Add | | | +-CommonSubexpression[common_subexpression_id=13] @@ -1338,7 +1338,7 @@ TopLevelPlan | | | +-AttributeReference[id=1,name=long_col,relation=test,type=Long] | | | +-AttributeReference[id=2,name=float_col,relation=test, | | | type=Float] -| | +-Alias[id=9,name=,alias=$aggregate1,relation=,type=Long NULL] +| | +-Alias[id=9,name=,alias=$aggregate1,relation=$aggregate,type=Long NULL] | | | +-AggregateFunction[function=MAX] | | | +-Divide | | | +-CommonSubexpression[common_subexpression_id=13] @@ -1347,7 +1347,7 @@ TopLevelPlan | | | | | type=Int NULL] | | | | +-AttributeReference[id=1,name=long_col,relation=test,type=Long] | | | +-Literal[value=2,type=Int] -| | +-Alias[id=11,name=,alias=$aggregate2,relation=,type=Long NULL] +| | +-Alias[id=11,name=,alias=$aggregate2,relation=$aggregate,type=Long NULL] | | | +-AggregateFunction[function=MAX] | | | +-Add | | | +-AttributeReference[id=0,name=int_col,relation=test,type=Int NULL] @@ -1356,7 +1356,7 @@ TopLevelPlan | | | +-AttributeReference[id=0,name=int_col,relation=test, | | | | type=Int NULL] | | | +-AttributeReference[id=1,name=long_col,relation=test,type=Long] -| | +-Alias[id=12,name=,alias=$aggregate3,relation=,type=Double NULL] +| | +-Alias[id=12,name=,alias=$aggregate3,relation=$aggregate,type=Double NULL] | | +-AggregateFunction[function=SUM] | | +-CommonSubexpression[common_subexpression_id=14] | | +-Operand=Add
