From 8cbfc640b843290d274bbc5f52215e8124023b73 Mon Sep 17 00:00:00 2001 From: Jihoon Son Date: Sun, 13 Sep 2015 01:30:38 +0900 Subject: [PATCH 1/2] TAJO-1845 --- ...testCrossJoinOfOneSmallTableAndJoin.1.Hash.plan | 4 ++-- ...testCrossJoinOfOneSmallTableAndJoin.1.Sort.plan | 4 ++-- ...rossJoinWithThetaJoinConditionInWhere.Hash.plan | 2 +- ...rossJoinWithThetaJoinConditionInWhere.Sort.plan | 2 +- .../testBroadcastTwoPartJoin.Hash.plan | 8 ++++---- .../testBroadcastTwoPartJoin.Sort.plan | 8 ++++---- .../testDifferentTypesJoinCondition.Hash.plan | 2 +- .../testDifferentTypesJoinCondition.Sort.plan | 2 +- ...nnerJoinWithThetaJoinConditionInWhere.Hash.plan | 2 +- ...nnerJoinWithThetaJoinConditionInWhere.Sort.plan | 2 +- .../testJoinOnMultipleDatabases.Hash.plan | 8 ++++---- .../testJoinOnMultipleDatabases.Sort.plan | 8 ++++---- .../testJoinWithMultipleJoinQual1.Hash.plan | 8 ++++---- .../testJoinWithMultipleJoinQual1.Sort.plan | 8 ++++---- .../TestInnerJoinQuery/testTPCHQ2Join.Hash.plan | 6 +++--- .../TestInnerJoinQuery/testTPCHQ2Join.Sort.plan | 6 +++--- .../testWhereClauseJoin5.Hash.plan | 4 ++-- .../testWhereClauseJoin5.Sort.plan | 4 ++-- .../testWhereClauseJoin6.Hash.plan | 4 ++-- .../testWhereClauseJoin6.Sort.plan | 4 ++-- .../testBroadcastSubquery.Hash.plan | 4 ++-- .../testBroadcastSubquery.Sort.plan | 4 ++-- .../testBroadcastSubquery2.Hash.plan | 6 +++--- .../testBroadcastSubquery2.Sort.plan | 6 +++--- .../testComplexJoinCondition5.Hash.plan | 2 +- .../testComplexJoinCondition5.Sort.plan | 2 +- .../testComplexJoinCondition6.Hash.plan | 4 ++-- .../testComplexJoinCondition6.Sort.plan | 4 ++-- .../testComplexJoinCondition7.Hash.plan | 4 ++-- .../testComplexJoinCondition7.Sort.plan | 4 ++-- .../testJoinWithMultipleJoinQual3.Hash.plan | 4 ++-- .../testJoinWithMultipleJoinQual3.Sort.plan | 4 ++-- .../testJoinWithMultipleJoinQual4.Hash.plan | 4 ++-- .../testJoinWithMultipleJoinQual4.Sort.plan | 4 ++-- .../testComplexJoinsWithCaseWhen2.Hash.plan | 4 ++-- .../testComplexJoinsWithCaseWhen2.Sort.plan | 4 ++-- .../testLeftOuterJoin3.Hash.plan | 8 ++++---- .../testLeftOuterJoin3.Sort.plan | 8 ++++---- ...LeftOuterJoinPredicationCaseByCase2.1.Hash.plan | 4 ++-- ...LeftOuterJoinPredicationCaseByCase2.1.Sort.plan | 4 ++-- ...ftOuterJoinPredicationCaseByCase2_1.1.Hash.plan | 4 ++-- ...ftOuterJoinPredicationCaseByCase2_1.1.Sort.plan | 4 ++-- ...ightOuterJoinPredicationCaseByCase1.1.Hash.plan | 4 ++-- ...ightOuterJoinPredicationCaseByCase1.1.Sort.plan | 4 ++-- ...ightOuterJoinPredicationCaseByCase2.1.Hash.plan | 4 ++-- ...ightOuterJoinPredicationCaseByCase2.1.Sort.plan | 4 ++-- ...ightOuterJoinPredicationCaseByCase3.1.Hash.plan | 4 ++-- ...ightOuterJoinPredicationCaseByCase3.1.Sort.plan | 4 ++-- ...testLeftOuterJoinWithEmptySubquery2.1.Hash.plan | 4 ++-- ...testLeftOuterJoinWithEmptySubquery2.1.Sort.plan | 4 ++-- .../tajo/engine/planner/enforce/Enforcer.java | 7 +++---- .../tajo/engine/planner/global/MasterPlan.java | 14 +++++++++----- 52 files changed, 124 insertions(+), 121 deletions(-) diff --git a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinOfOneSmallTableAndJoin.1.Hash.plan b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinOfOneSmallTableAndJoin.1.Hash.plan index 54d2e62b06..36a1b43c98 100644 --- a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinOfOneSmallTableAndJoin.1.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinOfOneSmallTableAndJoin.1.Hash.plan @@ -49,9 +49,9 @@ Block Id: eb_0000000000000_0000_000007 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.supplier + 0: type=Broadcast, tables=default.orders 1: type=Broadcast, tables=default.region - 2: type=Broadcast, tables=default.orders + 2: type=Broadcast, tables=default.supplier JOIN(11)(CROSS) => target list: default.lineitem.l_comment (TEXT), default.lineitem.l_commitdate (TEXT), default.lineitem.l_discount (FLOAT8), default.lineitem.l_extendedprice (FLOAT8), default.lineitem.l_linenumber (INT4), default.lineitem.l_linestatus (TEXT), default.lineitem.l_orderkey (INT4), default.lineitem.l_partkey (INT4), default.lineitem.l_quantity (FLOAT8), default.lineitem.l_receiptdate (TEXT), default.lineitem.l_returnflag (TEXT), default.lineitem.l_shipdate (TEXT), default.lineitem.l_shipinstruct (TEXT), default.lineitem.l_shipmode (TEXT), default.lineitem.l_suppkey (INT4), default.lineitem.l_tax (FLOAT8), default.orders.o_clerk (TEXT), default.orders.o_comment (TEXT), default.orders.o_custkey (INT4), default.orders.o_orderdate (TEXT), default.orders.o_orderkey (INT4), default.orders.o_orderpriority (TEXT), default.orders.o_orderstatus (TEXT), default.orders.o_shippriority (INT4), default.orders.o_totalprice (FLOAT8), default.region.r_comment (TEXT), default.region.r_name (TEXT), default.region.r_regionkey (INT4), default.supplier.s_acctbal (FLOAT8), default.supplier.s_address (TEXT), default.supplier.s_comment (TEXT), default.supplier.s_name (TEXT), default.supplier.s_nationkey (INT4), default.supplier.s_phone (TEXT), default.supplier.s_suppkey (INT4) diff --git a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinOfOneSmallTableAndJoin.1.Sort.plan b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinOfOneSmallTableAndJoin.1.Sort.plan index 54d2e62b06..36a1b43c98 100644 --- a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinOfOneSmallTableAndJoin.1.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinOfOneSmallTableAndJoin.1.Sort.plan @@ -49,9 +49,9 @@ Block Id: eb_0000000000000_0000_000007 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.supplier + 0: type=Broadcast, tables=default.orders 1: type=Broadcast, tables=default.region - 2: type=Broadcast, tables=default.orders + 2: type=Broadcast, tables=default.supplier JOIN(11)(CROSS) => target list: default.lineitem.l_comment (TEXT), default.lineitem.l_commitdate (TEXT), default.lineitem.l_discount (FLOAT8), default.lineitem.l_extendedprice (FLOAT8), default.lineitem.l_linenumber (INT4), default.lineitem.l_linestatus (TEXT), default.lineitem.l_orderkey (INT4), default.lineitem.l_partkey (INT4), default.lineitem.l_quantity (FLOAT8), default.lineitem.l_receiptdate (TEXT), default.lineitem.l_returnflag (TEXT), default.lineitem.l_shipdate (TEXT), default.lineitem.l_shipinstruct (TEXT), default.lineitem.l_shipmode (TEXT), default.lineitem.l_suppkey (INT4), default.lineitem.l_tax (FLOAT8), default.orders.o_clerk (TEXT), default.orders.o_comment (TEXT), default.orders.o_custkey (INT4), default.orders.o_orderdate (TEXT), default.orders.o_orderkey (INT4), default.orders.o_orderpriority (TEXT), default.orders.o_orderstatus (TEXT), default.orders.o_shippriority (INT4), default.orders.o_totalprice (FLOAT8), default.region.r_comment (TEXT), default.region.r_name (TEXT), default.region.r_regionkey (INT4), default.supplier.s_acctbal (FLOAT8), default.supplier.s_address (TEXT), default.supplier.s_comment (TEXT), default.supplier.s_name (TEXT), default.supplier.s_nationkey (INT4), default.supplier.s_phone (TEXT), default.supplier.s_suppkey (INT4) diff --git a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash.plan b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash.plan index d1618115cb..207f9b1281 100644 --- a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash.plan @@ -37,7 +37,7 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.a + 0: type=Broadcast, tables=default.b PROJECTION(3) => Targets: a_name (TEXT), b_name (TEXT) diff --git a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort.plan b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort.plan index d1618115cb..207f9b1281 100644 --- a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort.plan @@ -37,7 +37,7 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.a + 0: type=Broadcast, tables=default.b PROJECTION(3) => Targets: a_name (TEXT), b_name (TEXT) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testBroadcastTwoPartJoin.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testBroadcastTwoPartJoin.Hash.plan index bd3ba1abd4..96e83603f4 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testBroadcastTwoPartJoin.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testBroadcastTwoPartJoin.Hash.plan @@ -66,10 +66,10 @@ Block Id: eb_0000000000000_0000_000009 [LEAF] [q_0000000000000_0000] 9 => 10 (type=RANGE_SHUFFLE, key=default.lineitem.l_orderkey (INT4), default.nation.n_name (TEXT), default.part.p_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.orders - 1: type=Broadcast, tables=default.part - 2: type=Broadcast, tables=default.lineitem - 3: type=Broadcast, tables=default.customer + 0: type=Broadcast, tables=default.customer + 1: type=Broadcast, tables=default.lineitem + 2: type=Broadcast, tables=default.orders + 3: type=Broadcast, tables=default.part SORT(26) => Sort Keys: default.lineitem.l_orderkey (INT4) (asc),default.part.p_name (TEXT) (asc),default.nation.n_name (TEXT) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testBroadcastTwoPartJoin.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testBroadcastTwoPartJoin.Sort.plan index bd3ba1abd4..96e83603f4 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testBroadcastTwoPartJoin.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testBroadcastTwoPartJoin.Sort.plan @@ -66,10 +66,10 @@ Block Id: eb_0000000000000_0000_000009 [LEAF] [q_0000000000000_0000] 9 => 10 (type=RANGE_SHUFFLE, key=default.lineitem.l_orderkey (INT4), default.nation.n_name (TEXT), default.part.p_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.orders - 1: type=Broadcast, tables=default.part - 2: type=Broadcast, tables=default.lineitem - 3: type=Broadcast, tables=default.customer + 0: type=Broadcast, tables=default.customer + 1: type=Broadcast, tables=default.lineitem + 2: type=Broadcast, tables=default.orders + 3: type=Broadcast, tables=default.part SORT(26) => Sort Keys: default.lineitem.l_orderkey (INT4) (asc),default.part.p_name (TEXT) (asc),default.nation.n_name (TEXT) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.Hash.plan index 69ede305f2..fdf227c15a 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.Hash.plan @@ -32,7 +32,7 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t4 + 0: type=Broadcast, tables=default.t3 JOIN(5)(INNER) => Join Cond: default.t3.id (INT8) = ?int8_1 (INT8) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.Sort.plan index 69ede305f2..fdf227c15a 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.Sort.plan @@ -32,7 +32,7 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t4 + 0: type=Broadcast, tables=default.t3 JOIN(5)(INNER) => Join Cond: default.t3.id (INT8) = ?int8_1 (INT8) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash.plan index b2f4ff15f5..a812559b1e 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash.plan @@ -34,7 +34,7 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.a + 0: type=Broadcast, tables=default.b SELECTION(6) => Search Cond: default.a.r_name (TEXT) <= default.b.r_name (TEXT) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort.plan index b2f4ff15f5..a812559b1e 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort.plan @@ -34,7 +34,7 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.a + 0: type=Broadcast, tables=default.b SELECTION(6) => Search Cond: default.a.r_name (TEXT) <= default.b.r_name (TEXT) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinOnMultipleDatabases.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinOnMultipleDatabases.Hash.plan index c982ee3a49..4bb88a4f38 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinOnMultipleDatabases.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinOnMultipleDatabases.Hash.plan @@ -66,10 +66,10 @@ Block Id: eb_0000000000000_0000_000009 [LEAF] [q_0000000000000_0000] 9 => 10 (type=RANGE_SHUFFLE, key=default.nation.n_name (TEXT), joins.part_.p_partkey (INT4), joins.supplier_.s_acctbal (FLOAT8), joins.supplier_.s_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=joins.supplier_ - 1: type=Broadcast, tables=joins.part_ - 2: type=Broadcast, tables=default.partsupp - 3: type=Broadcast, tables=default.region + 0: type=Broadcast, tables=default.partsupp + 1: type=Broadcast, tables=default.region + 2: type=Broadcast, tables=joins.part_ + 3: type=Broadcast, tables=joins.supplier_ SORT(26) => Sort Keys: joins.supplier_.s_acctbal (FLOAT8) (asc),joins.supplier_.s_name (TEXT) (asc),default.nation.n_name (TEXT) (asc),joins.part_.p_partkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinOnMultipleDatabases.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinOnMultipleDatabases.Sort.plan index c982ee3a49..4bb88a4f38 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinOnMultipleDatabases.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinOnMultipleDatabases.Sort.plan @@ -66,10 +66,10 @@ Block Id: eb_0000000000000_0000_000009 [LEAF] [q_0000000000000_0000] 9 => 10 (type=RANGE_SHUFFLE, key=default.nation.n_name (TEXT), joins.part_.p_partkey (INT4), joins.supplier_.s_acctbal (FLOAT8), joins.supplier_.s_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=joins.supplier_ - 1: type=Broadcast, tables=joins.part_ - 2: type=Broadcast, tables=default.partsupp - 3: type=Broadcast, tables=default.region + 0: type=Broadcast, tables=default.partsupp + 1: type=Broadcast, tables=default.region + 2: type=Broadcast, tables=joins.part_ + 3: type=Broadcast, tables=joins.supplier_ SORT(26) => Sort Keys: joins.supplier_.s_acctbal (FLOAT8) (asc),joins.supplier_.s_name (TEXT) (asc),default.nation.n_name (TEXT) (asc),joins.part_.p_partkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinWithMultipleJoinQual1.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinWithMultipleJoinQual1.Hash.plan index 8570bc7574..ccbd219a3a 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinWithMultipleJoinQual1.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinWithMultipleJoinQual1.Hash.plan @@ -66,10 +66,10 @@ Block Id: eb_0000000000000_0000_000009 [LEAF] [q_0000000000000_0000] 9 => 10 (type=RANGE_SHUFFLE, key=default.n.n_name (TEXT), default.p.p_partkey (INT4), default.s.s_acctbal (FLOAT8), default.s.s_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.ps - 1: type=Broadcast, tables=default.p - 2: type=Broadcast, tables=default.s - 3: type=Broadcast, tables=default.r + 0: type=Broadcast, tables=default.p + 1: type=Broadcast, tables=default.ps + 2: type=Broadcast, tables=default.r + 3: type=Broadcast, tables=default.s SORT(26) => Sort Keys: default.s.s_acctbal (FLOAT8) (asc),default.s.s_name (TEXT) (asc),default.n.n_name (TEXT) (asc),default.p.p_partkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinWithMultipleJoinQual1.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinWithMultipleJoinQual1.Sort.plan index 8570bc7574..ccbd219a3a 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinWithMultipleJoinQual1.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testJoinWithMultipleJoinQual1.Sort.plan @@ -66,10 +66,10 @@ Block Id: eb_0000000000000_0000_000009 [LEAF] [q_0000000000000_0000] 9 => 10 (type=RANGE_SHUFFLE, key=default.n.n_name (TEXT), default.p.p_partkey (INT4), default.s.s_acctbal (FLOAT8), default.s.s_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.ps - 1: type=Broadcast, tables=default.p - 2: type=Broadcast, tables=default.s - 3: type=Broadcast, tables=default.r + 0: type=Broadcast, tables=default.p + 1: type=Broadcast, tables=default.ps + 2: type=Broadcast, tables=default.r + 3: type=Broadcast, tables=default.s SORT(26) => Sort Keys: default.s.s_acctbal (FLOAT8) (asc),default.s.s_name (TEXT) (asc),default.n.n_name (TEXT) (asc),default.p.p_partkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testTPCHQ2Join.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testTPCHQ2Join.Hash.plan index baad6d4ea3..ba4afc115b 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testTPCHQ2Join.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testTPCHQ2Join.Hash.plan @@ -67,9 +67,9 @@ Block Id: eb_0000000000000_0000_000009 [LEAF] [Enforcers] 0: type=Broadcast, tables=default.part - 1: type=Broadcast, tables=default.supplier - 2: type=Broadcast, tables=default.partsupp - 3: type=Broadcast, tables=default.region + 1: type=Broadcast, tables=default.partsupp + 2: type=Broadcast, tables=default.region + 3: type=Broadcast, tables=default.supplier SORT(26) => Sort Keys: default.supplier.s_acctbal (FLOAT8) (asc),default.supplier.s_name (TEXT) (asc),default.nation.n_name (TEXT) (asc),default.part.p_partkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testTPCHQ2Join.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testTPCHQ2Join.Sort.plan index baad6d4ea3..ba4afc115b 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testTPCHQ2Join.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testTPCHQ2Join.Sort.plan @@ -67,9 +67,9 @@ Block Id: eb_0000000000000_0000_000009 [LEAF] [Enforcers] 0: type=Broadcast, tables=default.part - 1: type=Broadcast, tables=default.supplier - 2: type=Broadcast, tables=default.partsupp - 3: type=Broadcast, tables=default.region + 1: type=Broadcast, tables=default.partsupp + 2: type=Broadcast, tables=default.region + 3: type=Broadcast, tables=default.supplier SORT(26) => Sort Keys: default.supplier.s_acctbal (FLOAT8) (asc),default.supplier.s_name (TEXT) (asc),default.nation.n_name (TEXT) (asc),default.part.p_partkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin5.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin5.Hash.plan index cfde80afb5..ee08a7b26d 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin5.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin5.Hash.plan @@ -48,8 +48,8 @@ Block Id: eb_0000000000000_0000_000005 [LEAF] [q_0000000000000_0000] 5 => 6 (type=RANGE_SHUFFLE, key=default.part.p_partkey (INT4), default.supplier.s_acctbal (FLOAT8), default.supplier.s_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.supplier - 1: type=Broadcast, tables=default.partsupp + 0: type=Broadcast, tables=default.partsupp + 1: type=Broadcast, tables=default.supplier SORT(16) => Sort Keys: default.supplier.s_acctbal (FLOAT8) (asc),default.supplier.s_name (TEXT) (asc),default.part.p_partkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin5.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin5.Sort.plan index cfde80afb5..ee08a7b26d 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin5.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin5.Sort.plan @@ -48,8 +48,8 @@ Block Id: eb_0000000000000_0000_000005 [LEAF] [q_0000000000000_0000] 5 => 6 (type=RANGE_SHUFFLE, key=default.part.p_partkey (INT4), default.supplier.s_acctbal (FLOAT8), default.supplier.s_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.supplier - 1: type=Broadcast, tables=default.partsupp + 0: type=Broadcast, tables=default.partsupp + 1: type=Broadcast, tables=default.supplier SORT(16) => Sort Keys: default.supplier.s_acctbal (FLOAT8) (asc),default.supplier.s_name (TEXT) (asc),default.part.p_partkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin6.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin6.Hash.plan index 038f468d6d..b3f04c8b4a 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin6.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin6.Hash.plan @@ -58,8 +58,8 @@ Block Id: eb_0000000000000_0000_000007 [LEAF] [Enforcers] 0: type=Broadcast, tables=default.part - 1: type=Broadcast, tables=default.supplier - 2: type=Broadcast, tables=default.partsupp + 1: type=Broadcast, tables=default.partsupp + 2: type=Broadcast, tables=default.supplier SORT(21) => Sort Keys: default.supplier.s_acctbal (FLOAT8) (asc),default.supplier.s_name (TEXT) (asc),default.part.p_partkey (INT4) (asc),default.nation.n_name (TEXT) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin6.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin6.Sort.plan index 038f468d6d..b3f04c8b4a 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin6.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testWhereClauseJoin6.Sort.plan @@ -58,8 +58,8 @@ Block Id: eb_0000000000000_0000_000007 [LEAF] [Enforcers] 0: type=Broadcast, tables=default.part - 1: type=Broadcast, tables=default.supplier - 2: type=Broadcast, tables=default.partsupp + 1: type=Broadcast, tables=default.partsupp + 2: type=Broadcast, tables=default.supplier SORT(21) => Sort Keys: default.supplier.s_acctbal (FLOAT8) (asc),default.supplier.s_name (TEXT) (asc),default.part.p_partkey (INT4) (asc),default.nation.n_name (TEXT) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery.Hash.plan index 96858859e1..714ab2105c 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery.Hash.plan @@ -52,8 +52,8 @@ Block Id: eb_0000000000000_0000_000005 [LEAF] [q_0000000000000_0000] 5 => 6 (type=RANGE_SHUFFLE, key=default.a.o_custkey (INT4), default.lineitem.l_orderkey (INT4), default.part.p_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.part - 1: type=Broadcast, tables=default.orders + 0: type=Broadcast, tables=default.orders + 1: type=Broadcast, tables=default.part SORT(18) => Sort Keys: default.lineitem.l_orderkey (INT4) (asc),default.a.o_custkey (INT4) (asc),default.part.p_name (TEXT) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery.Sort.plan index 96858859e1..714ab2105c 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery.Sort.plan @@ -52,8 +52,8 @@ Block Id: eb_0000000000000_0000_000005 [LEAF] [q_0000000000000_0000] 5 => 6 (type=RANGE_SHUFFLE, key=default.a.o_custkey (INT4), default.lineitem.l_orderkey (INT4), default.part.p_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.part - 1: type=Broadcast, tables=default.orders + 0: type=Broadcast, tables=default.orders + 1: type=Broadcast, tables=default.part SORT(18) => Sort Keys: default.lineitem.l_orderkey (INT4) (asc),default.a.o_custkey (INT4) (asc),default.part.p_name (TEXT) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery2.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery2.Hash.plan index 5def40e3f5..20fe5ee000 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery2.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery2.Hash.plan @@ -131,9 +131,9 @@ Block Id: eb_0000000000000_0000_000010 [INTERMEDIATE] [q_0000000000000_0000] 10 => 11 (type=HASH_SHUFFLE, key=, num=1) [Enforcers] - 0: type=Broadcast, tables=default.part - 1: type=Broadcast, tables=default.a - 2: type=Broadcast, tables=default.c + 0: type=Broadcast, tables=default.a + 1: type=Broadcast, tables=default.c + 2: type=Broadcast, tables=default.part GROUP_BY(36)() => exprs: (sum(default.b.l_quantity (FLOAT8))) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery2.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery2.Sort.plan index 5def40e3f5..20fe5ee000 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery2.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testBroadcastSubquery2.Sort.plan @@ -131,9 +131,9 @@ Block Id: eb_0000000000000_0000_000010 [INTERMEDIATE] [q_0000000000000_0000] 10 => 11 (type=HASH_SHUFFLE, key=, num=1) [Enforcers] - 0: type=Broadcast, tables=default.part - 1: type=Broadcast, tables=default.a - 2: type=Broadcast, tables=default.c + 0: type=Broadcast, tables=default.a + 1: type=Broadcast, tables=default.c + 2: type=Broadcast, tables=default.part GROUP_BY(36)() => exprs: (sum(default.b.l_quantity (FLOAT8))) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash.plan index 4e72e0877d..cd63ed80d1 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash.plan @@ -43,7 +43,7 @@ Block Id: eb_0000000000000_0000_000003 [LEAF] [q_0000000000000_0000] 3 => 4 (type=RANGE_SHUFFLE, key=default.n1.n_nationkey (INT4), num=32) [Enforcers] - 0: type=Broadcast, tables=default.nation + 0: type=Broadcast, tables=default.n1 SORT(12) => Sort Keys: default.n1.n_nationkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort.plan index 4e72e0877d..cd63ed80d1 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort.plan @@ -43,7 +43,7 @@ Block Id: eb_0000000000000_0000_000003 [LEAF] [q_0000000000000_0000] 3 => 4 (type=RANGE_SHUFFLE, key=default.n1.n_nationkey (INT4), num=32) [Enforcers] - 0: type=Broadcast, tables=default.nation + 0: type=Broadcast, tables=default.n1 SORT(12) => Sort Keys: default.n1.n_nationkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition6.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition6.Hash.plan index 2402db7154..2b307d795d 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition6.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition6.Hash.plan @@ -56,8 +56,8 @@ Block Id: eb_0000000000000_0000_000003 [LEAF] [q_0000000000000_0000] 3 => 5 (type=RANGE_SHUFFLE, key=default.n1.n_nationkey (INT4), num=32) [Enforcers] - 0: type=Broadcast, tables=default.nation - 1: type=Broadcast, tables=default.n1 + 0: type=Broadcast, tables=default.n1 + 1: type=Broadcast, tables=default.nation SORT(18) => Sort Keys: default.n1.n_nationkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition6.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition6.Sort.plan index 2402db7154..2b307d795d 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition6.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition6.Sort.plan @@ -56,8 +56,8 @@ Block Id: eb_0000000000000_0000_000003 [LEAF] [q_0000000000000_0000] 3 => 5 (type=RANGE_SHUFFLE, key=default.n1.n_nationkey (INT4), num=32) [Enforcers] - 0: type=Broadcast, tables=default.nation - 1: type=Broadcast, tables=default.n1 + 0: type=Broadcast, tables=default.n1 + 1: type=Broadcast, tables=default.nation SORT(18) => Sort Keys: default.n1.n_nationkey (INT4) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition7.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition7.Hash.plan index 8e6d32bd82..280b4f8b39 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition7.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition7.Hash.plan @@ -56,8 +56,8 @@ Block Id: eb_0000000000000_0000_000003 [LEAF] [q_0000000000000_0000] 3 => 5 (type=RANGE_SHUFFLE, key=default.n1.n_nationkey (INT4), default.n2.n_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.nation - 1: type=Broadcast, tables=default.n1 + 0: type=Broadcast, tables=default.n1 + 1: type=Broadcast, tables=default.nation SORT(18) => Sort Keys: default.n1.n_nationkey (INT4) (asc),default.n2.n_name (TEXT) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition7.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition7.Sort.plan index 8e6d32bd82..280b4f8b39 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition7.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition7.Sort.plan @@ -56,8 +56,8 @@ Block Id: eb_0000000000000_0000_000003 [LEAF] [q_0000000000000_0000] 3 => 5 (type=RANGE_SHUFFLE, key=default.n1.n_nationkey (INT4), default.n2.n_name (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.nation - 1: type=Broadcast, tables=default.n1 + 0: type=Broadcast, tables=default.n1 + 1: type=Broadcast, tables=default.nation SORT(18) => Sort Keys: default.n1.n_nationkey (INT4) (asc),default.n2.n_name (TEXT) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual3.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual3.Hash.plan index 195229d9ca..dc04a934e2 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual3.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual3.Hash.plan @@ -56,8 +56,8 @@ Block Id: eb_0000000000000_0000_000007 [ROOT] [Enforcers] 0: type=Broadcast, tables=default.ps - 1: type=Broadcast, tables=default.s - 2: type=Broadcast, tables=default.r + 1: type=Broadcast, tables=default.r + 2: type=Broadcast, tables=default.s JOIN(14)(INNER) => Join Cond: default.s.s_nationkey (INT4) = default.t.n_nationkey (INT4) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual3.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual3.Sort.plan index 195229d9ca..dc04a934e2 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual3.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual3.Sort.plan @@ -56,8 +56,8 @@ Block Id: eb_0000000000000_0000_000007 [ROOT] [Enforcers] 0: type=Broadcast, tables=default.ps - 1: type=Broadcast, tables=default.s - 2: type=Broadcast, tables=default.r + 1: type=Broadcast, tables=default.r + 2: type=Broadcast, tables=default.s JOIN(14)(INNER) => Join Cond: default.s.s_nationkey (INT4) = default.t.n_nationkey (INT4) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual4.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual4.Hash.plan index f249f0e0ea..7c48e473a8 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual4.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual4.Hash.plan @@ -58,8 +58,8 @@ Block Id: eb_0000000000000_0000_000007 [ROOT] [Enforcers] 0: type=Broadcast, tables=default.ps - 1: type=Broadcast, tables=default.s - 2: type=Broadcast, tables=default.r + 1: type=Broadcast, tables=default.r + 2: type=Broadcast, tables=default.s SELECTION(12) => Search Cond: default.t.n_nationkey (INT4) > default.s.s_suppkey (INT4) diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual4.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual4.Sort.plan index f249f0e0ea..7c48e473a8 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual4.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual4.Sort.plan @@ -58,8 +58,8 @@ Block Id: eb_0000000000000_0000_000007 [ROOT] [Enforcers] 0: type=Broadcast, tables=default.ps - 1: type=Broadcast, tables=default.s - 2: type=Broadcast, tables=default.r + 1: type=Broadcast, tables=default.r + 2: type=Broadcast, tables=default.s SELECTION(12) => Search Cond: default.t.n_nationkey (INT4) > default.s.s_suppkey (INT4) diff --git a/tajo-core-tests/src/test/resources/results/TestMultipleJoinTypes/testComplexJoinsWithCaseWhen2.Hash.plan b/tajo-core-tests/src/test/resources/results/TestMultipleJoinTypes/testComplexJoinsWithCaseWhen2.Hash.plan index a719990d2d..8622663ac3 100644 --- a/tajo-core-tests/src/test/resources/results/TestMultipleJoinTypes/testComplexJoinsWithCaseWhen2.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestMultipleJoinTypes/testComplexJoinsWithCaseWhen2.Hash.plan @@ -52,8 +52,8 @@ Block Id: eb_0000000000000_0000_000005 [LEAF] [q_0000000000000_0000] 5 => 6 (type=RANGE_SHUFFLE, key=default.region.r_name (TEXT), s1 (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.supplier - 1: type=Broadcast, tables=default.region + 0: type=Broadcast, tables=default.region + 1: type=Broadcast, tables=default.supplier SORT(17) => Sort Keys: default.region.r_name (TEXT) (asc),s1 (TEXT) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestMultipleJoinTypes/testComplexJoinsWithCaseWhen2.Sort.plan b/tajo-core-tests/src/test/resources/results/TestMultipleJoinTypes/testComplexJoinsWithCaseWhen2.Sort.plan index a719990d2d..8622663ac3 100644 --- a/tajo-core-tests/src/test/resources/results/TestMultipleJoinTypes/testComplexJoinsWithCaseWhen2.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestMultipleJoinTypes/testComplexJoinsWithCaseWhen2.Sort.plan @@ -52,8 +52,8 @@ Block Id: eb_0000000000000_0000_000005 [LEAF] [q_0000000000000_0000] 5 => 6 (type=RANGE_SHUFFLE, key=default.region.r_name (TEXT), s1 (TEXT), num=32) [Enforcers] - 0: type=Broadcast, tables=default.supplier - 1: type=Broadcast, tables=default.region + 0: type=Broadcast, tables=default.region + 1: type=Broadcast, tables=default.supplier SORT(17) => Sort Keys: default.region.r_name (TEXT) (asc),s1 (TEXT) (asc) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoin3.Hash.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoin3.Hash.plan index 61b4f629f4..637657bd82 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoin3.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoin3.Hash.plan @@ -68,10 +68,10 @@ Block Id: eb_0000000000000_0000_000011 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.e - 1: type=Broadcast, tables=default.b - 2: type=Broadcast, tables=default.c - 3: type=Broadcast, tables=default.d + 0: type=Broadcast, tables=default.b + 1: type=Broadcast, tables=default.c + 2: type=Broadcast, tables=default.d + 3: type=Broadcast, tables=default.e 4: type=Broadcast, tables=default.f JOIN(17)(LEFT_OUTER) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoin3.Sort.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoin3.Sort.plan index 61b4f629f4..637657bd82 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoin3.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoin3.Sort.plan @@ -68,10 +68,10 @@ Block Id: eb_0000000000000_0000_000011 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.e - 1: type=Broadcast, tables=default.b - 2: type=Broadcast, tables=default.c - 3: type=Broadcast, tables=default.d + 0: type=Broadcast, tables=default.b + 1: type=Broadcast, tables=default.c + 2: type=Broadcast, tables=default.d + 3: type=Broadcast, tables=default.e 4: type=Broadcast, tables=default.f JOIN(17)(LEFT_OUTER) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2.1.Hash.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2.1.Hash.plan index 264aafe533..f7739c602c 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2.1.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2.1.Hash.plan @@ -50,8 +50,8 @@ Block Id: eb_0000000000000_0000_000007 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t3 - 1: type=Broadcast, tables=default.t2 + 0: type=Broadcast, tables=default.t2 + 1: type=Broadcast, tables=default.t3 2: type=Broadcast, tables=default.t4 JOIN(11)(INNER) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2.1.Sort.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2.1.Sort.plan index 264aafe533..f7739c602c 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2.1.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2.1.Sort.plan @@ -50,8 +50,8 @@ Block Id: eb_0000000000000_0000_000007 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t3 - 1: type=Broadcast, tables=default.t2 + 0: type=Broadcast, tables=default.t2 + 1: type=Broadcast, tables=default.t3 2: type=Broadcast, tables=default.t4 JOIN(11)(INNER) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2_1.1.Hash.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2_1.1.Hash.plan index a35e200dcd..f49a8274d3 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2_1.1.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2_1.1.Hash.plan @@ -53,9 +53,9 @@ Block Id: eb_0000000000000_0000_000007 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t4 + 0: type=Broadcast, tables=default.t2 1: type=Broadcast, tables=default.t3 - 2: type=Broadcast, tables=default.t2 + 2: type=Broadcast, tables=default.t4 JOIN(12)(LEFT_OUTER) => Join Cond: default.t1.id (INT4) = default.t2.id (INT4) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2_1.1.Sort.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2_1.1.Sort.plan index a35e200dcd..f49a8274d3 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2_1.1.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2_1.1.Sort.plan @@ -53,9 +53,9 @@ Block Id: eb_0000000000000_0000_000007 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t4 + 0: type=Broadcast, tables=default.t2 1: type=Broadcast, tables=default.t3 - 2: type=Broadcast, tables=default.t2 + 2: type=Broadcast, tables=default.t4 JOIN(12)(LEFT_OUTER) => Join Cond: default.t1.id (INT4) = default.t2.id (INT4) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase1.1.Hash.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase1.1.Hash.plan index f347a88cf8..791d378a26 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase1.1.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase1.1.Hash.plan @@ -41,8 +41,8 @@ Block Id: eb_0000000000000_0000_000005 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t2 - 1: type=Broadcast, tables=default.t1 + 0: type=Broadcast, tables=default.t1 + 1: type=Broadcast, tables=default.t2 JOIN(8)(RIGHT_OUTER) => Join Cond: (default.t1.id (INT4) = default.t3.id (INT4) AND default.t2.id (INT4) = default.t3.id (INT4)) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase1.1.Sort.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase1.1.Sort.plan index f347a88cf8..791d378a26 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase1.1.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase1.1.Sort.plan @@ -41,8 +41,8 @@ Block Id: eb_0000000000000_0000_000005 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t2 - 1: type=Broadcast, tables=default.t1 + 0: type=Broadcast, tables=default.t1 + 1: type=Broadcast, tables=default.t2 JOIN(8)(RIGHT_OUTER) => Join Cond: (default.t1.id (INT4) = default.t3.id (INT4) AND default.t2.id (INT4) = default.t3.id (INT4)) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase2.1.Hash.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase2.1.Hash.plan index a5043fff2c..9db944e1f2 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase2.1.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase2.1.Hash.plan @@ -43,8 +43,8 @@ Block Id: eb_0000000000000_0000_000005 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t4 - 1: type=Broadcast, tables=default.t1 + 0: type=Broadcast, tables=default.t1 + 1: type=Broadcast, tables=default.t4 JOIN(9)(RIGHT_OUTER) => Join Cond: (default.t3.id (INT4) = 2 AND default.t4.id (INT4) = default.t3.id (INT4)) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase2.1.Sort.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase2.1.Sort.plan index a5043fff2c..9db944e1f2 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase2.1.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase2.1.Sort.plan @@ -43,8 +43,8 @@ Block Id: eb_0000000000000_0000_000005 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t4 - 1: type=Broadcast, tables=default.t1 + 0: type=Broadcast, tables=default.t1 + 1: type=Broadcast, tables=default.t4 JOIN(9)(RIGHT_OUTER) => Join Cond: (default.t3.id (INT4) = 2 AND default.t4.id (INT4) = default.t3.id (INT4)) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase3.1.Hash.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase3.1.Hash.plan index c0de2a1f72..8e7074e40c 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase3.1.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase3.1.Hash.plan @@ -41,8 +41,8 @@ Block Id: eb_0000000000000_0000_000005 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t2 - 1: type=Broadcast, tables=default.t1 + 0: type=Broadcast, tables=default.t1 + 1: type=Broadcast, tables=default.t2 JOIN(8)(RIGHT_OUTER) => Join Cond: default.t1.id (INT4) = default.t3.id (INT4) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase3.1.Sort.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase3.1.Sort.plan index c0de2a1f72..8e7074e40c 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase3.1.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase3.1.Sort.plan @@ -41,8 +41,8 @@ Block Id: eb_0000000000000_0000_000005 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.t2 - 1: type=Broadcast, tables=default.t1 + 0: type=Broadcast, tables=default.t1 + 1: type=Broadcast, tables=default.t2 JOIN(8)(RIGHT_OUTER) => Join Cond: default.t1.id (INT4) = default.t3.id (INT4) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinWithSubQuery/testLeftOuterJoinWithEmptySubquery2.1.Hash.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinWithSubQuery/testLeftOuterJoinWithEmptySubquery2.1.Hash.plan index 45b95c2191..294638a327 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinWithSubQuery/testLeftOuterJoinWithEmptySubquery2.1.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinWithSubQuery/testLeftOuterJoinWithEmptySubquery2.1.Hash.plan @@ -46,8 +46,8 @@ Block Id: eb_0000000000000_0000_000005 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.jointable12 - 1: type=Broadcast, tables=default.b + 0: type=Broadcast, tables=default.b + 1: type=Broadcast, tables=default.jointable12 JOIN(10)(LEFT_OUTER) => Join Cond: default.a.id (INT4) = default.b.id (INT4) diff --git a/tajo-core-tests/src/test/resources/results/TestOuterJoinWithSubQuery/testLeftOuterJoinWithEmptySubquery2.1.Sort.plan b/tajo-core-tests/src/test/resources/results/TestOuterJoinWithSubQuery/testLeftOuterJoinWithEmptySubquery2.1.Sort.plan index 45b95c2191..294638a327 100644 --- a/tajo-core-tests/src/test/resources/results/TestOuterJoinWithSubQuery/testLeftOuterJoinWithEmptySubquery2.1.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestOuterJoinWithSubQuery/testLeftOuterJoinWithEmptySubquery2.1.Sort.plan @@ -46,8 +46,8 @@ Block Id: eb_0000000000000_0000_000005 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.jointable12 - 1: type=Broadcast, tables=default.b + 0: type=Broadcast, tables=default.b + 1: type=Broadcast, tables=default.jointable12 JOIN(10)(LEFT_OUTER) => Join Cond: default.a.id (INT4) = default.b.id (INT4) diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/enforce/Enforcer.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/enforce/Enforcer.java index d67cee83b0..1e103724f3 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/enforce/Enforcer.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/enforce/Enforcer.java @@ -24,15 +24,14 @@ import org.apache.tajo.common.ProtoObject; import org.apache.tajo.util.TUtil; -import java.util.Collection; import java.util.List; import java.util.Map; import static org.apache.tajo.plan.serder.PlanProto.*; -import static org.apache.tajo.plan.serder.PlanProto.GroupbyEnforce.GroupbyAlgorithm; +import static org.apache.tajo.plan.serder.PlanProto.ColumnPartitionEnforcer.ColumnPartitionAlgorithm; import static org.apache.tajo.plan.serder.PlanProto.DistinctGroupbyEnforcer.*; import static org.apache.tajo.plan.serder.PlanProto.EnforceProperty.EnforceType; -import static org.apache.tajo.plan.serder.PlanProto.ColumnPartitionEnforcer.ColumnPartitionAlgorithm; +import static org.apache.tajo.plan.serder.PlanProto.GroupbyEnforce.GroupbyAlgorithm; public class Enforcer implements ProtoObject { Map> properties; @@ -208,7 +207,7 @@ public void enforceColumnPartitionAlgorithm(int pid, ColumnPartitionAlgorithm al TUtil.putToNestedList(properties, builder.getType(), builder.build()); } - public Collection getProperties() { + public List getProperties() { if (proto != null) { return proto.getPropertiesList(); } else { diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/MasterPlan.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/MasterPlan.java index 80317b01ed..8a7229b3e2 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/MasterPlan.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/MasterPlan.java @@ -32,10 +32,7 @@ import org.apache.tajo.util.graph.DirectedGraphVisitor; import org.apache.tajo.util.graph.SimpleDirectedGraph; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; public class MasterPlan { @@ -287,7 +284,14 @@ public String toString() { if (block.getEnforcer().getProperties().size() > 0) { sb.append("\n[Enforcers]\n"); int i = 0; - for (EnforceProperty enforce : block.getEnforcer().getProperties()) { + List enforceProperties = block.getEnforcer().getProperties(); + Collections.sort(enforceProperties, new Comparator() { + @Override + public int compare(EnforceProperty o1, EnforceProperty o2) { + return o1.toString().compareTo(o2.toString()); + } + }); + for (EnforceProperty enforce : enforceProperties) { sb.append(" ").append(i++).append(": "); sb.append(Enforcer.toString(enforce)); sb.append("\n"); From f18e7b6492f533b4bee32ab99252b375e0f17d40 Mon Sep 17 00:00:00 2001 From: Jihoon Son Date: Sun, 13 Sep 2015 02:24:53 +0900 Subject: [PATCH 2/2] fix test failure --- .../tajo/engine/query/TestInnerJoinQuery.java | 4 +- .../query/TestInnerJoinWithSubQuery.java | 8 +- .../testComplexJoinCondition5.sql | 2 +- ...CrossJoinWithThetaJoinConditionInWhere.sql | 2 +- ...InnerJoinWithThetaJoinConditionInWhere.sql | 6 +- ...oinWithThetaJoinConditionInWhere.Hash.plan | 38 +++--- ...JoinConditionInWhere.Hash_NoBroadcast.plan | 40 +++---- ...oinWithThetaJoinConditionInWhere.Sort.plan | 38 +++--- ...JoinConditionInWhere.Sort_NoBroadcast.plan | 40 +++---- ...ssJoinWithThetaJoinConditionInWhere.result | 109 ++++++++++++++++-- .../testDifferentTypesJoinCondition.result | 7 +- ...oinWithThetaJoinConditionInWhere.Hash.plan | 38 +++--- ...JoinConditionInWhere.Hash_NoBroadcast.plan | 44 +++---- ...oinWithThetaJoinConditionInWhere.Sort.plan | 38 +++--- ...JoinConditionInWhere.Sort_NoBroadcast.plan | 44 +++---- ...erJoinWithThetaJoinConditionInWhere.result | 28 ++++- .../testComplexJoinCondition5.Hash.plan | 40 +++---- ...omplexJoinCondition5.Hash_NoBroadcast.plan | 62 +++++----- .../testComplexJoinCondition5.Sort.plan | 40 +++---- ...omplexJoinCondition5.Sort_NoBroadcast.plan | 62 +++++----- .../testComplexJoinCondition5.result | 22 ---- 21 files changed, 399 insertions(+), 313 deletions(-) diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestInnerJoinQuery.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestInnerJoinQuery.java index 6ec828cbf1..1a76f57920 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestInnerJoinQuery.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestInnerJoinQuery.java @@ -50,7 +50,7 @@ public static void classTearDown() throws SQLException { } @Test - @Option(withExplain = true, withExplainGlobal = true, parameterized = true) + @Option(withExplain = true, withExplainGlobal = true, parameterized = true, sort = true) @SimpleTest() public final void testInnerJoinWithThetaJoinConditionInWhere() throws Exception { runSimpleTests(); @@ -204,7 +204,7 @@ public final void testJoinAsterisk() throws Exception { public void testDifferentTypesJoinCondition() throws Exception { // select * from table20 t3 join table21 t4 on t3.id = t4.id; executeDDL("table1_int8_ddl.sql", "table1", "table20"); - executeDDL("table1_int4_ddl.sql", "table1", "table21"); + executeDDL("table1_int4_ddl.sql", "table2", "table21"); try { runSimpleTests(); } finally { diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestInnerJoinWithSubQuery.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestInnerJoinWithSubQuery.java index 6c9546ede7..f987c5f8de 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestInnerJoinWithSubQuery.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestInnerJoinWithSubQuery.java @@ -90,7 +90,13 @@ join partsupp ps on (s.s_suppkey = ps.ps_suppkey) @Test @Option(withExplain = true, withExplainGlobal = true, parameterized = true) - @SimpleTest() + @SimpleTest( + prepare = { + "create table small_nation as select * from nation limit 5;" + }, + cleanup = { + "drop table small_nation purge;" + }) public void testComplexJoinCondition5() throws Exception { runSimpleTests(); } diff --git a/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testComplexJoinCondition5.sql b/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testComplexJoinCondition5.sql index f604bc7f50..a3d2f3ee3e 100644 --- a/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testComplexJoinCondition5.sql +++ b/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testComplexJoinCondition5.sql @@ -2,5 +2,5 @@ select n1.n_nationkey, substr(n1.n_name, 1, 4) name1, substr(n2.n_name, 1, 4) name2 -from nation n1 join (select * from nation) n2 on substr(n1.n_name, 1, 4) = substr(n2.n_name, 1, 4) +from nation n1 join (select * from small_nation) n2 on substr(n1.n_name, 1, 4) = substr(n2.n_name, 1, 4) order by n1.n_nationkey; \ No newline at end of file diff --git a/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testCrossJoinWithThetaJoinConditionInWhere.sql b/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testCrossJoinWithThetaJoinConditionInWhere.sql index 4e20e16baa..e0ae358bd0 100644 --- a/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testCrossJoinWithThetaJoinConditionInWhere.sql +++ b/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testCrossJoinWithThetaJoinConditionInWhere.sql @@ -1,2 +1,2 @@ -select a.r_name as a_name, b.r_name as b_name from region a, region b +select a.r_name as a_name, b.n_name as b_name from region a, nation b where a_name < b_name; \ No newline at end of file diff --git a/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.sql b/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.sql index 90f4822ea7..ff679d5555 100644 --- a/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.sql +++ b/tajo-core-tests/src/test/resources/queries/TestJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.sql @@ -1,3 +1,3 @@ -select a.r_regionkey, a.r_name, b.r_name from region a join region b -on a.r_regionkey = b.r_regionkey -where a.r_name <= b.r_name; \ No newline at end of file +select a.r_regionkey, a.r_name, b.n_name from region a join nation b +on a.r_regionkey = b.n_regionkey +where a.r_name <= b.n_name; \ No newline at end of file diff --git a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash.plan b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash.plan index 207f9b1281..6ec39f95c3 100644 --- a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash.plan @@ -3,21 +3,21 @@ explain PROJECTION(3) => Targets: a_name (TEXT), b_name (TEXT) => out schema: {(2) a_name (TEXT), b_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SELECTION(6) - => Search Cond: default.a.r_name (TEXT) < default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) < default.b.n_name (TEXT) JOIN(7)(CROSS) - => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT) - => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT) + => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT) as a_name, default.a.r_name (TEXT) => out schema: {(2) a_name (TEXT), default.a.r_name (TEXT)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT) as b_name, default.b.r_name (TEXT) - => out schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT) as b_name, default.b.n_name (TEXT) + => out schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -37,26 +37,26 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.b + 0: type=Broadcast, tables=default.a PROJECTION(3) => Targets: a_name (TEXT), b_name (TEXT) => out schema: {(2) a_name (TEXT), b_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SELECTION(6) - => Search Cond: default.a.r_name (TEXT) < default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) < default.b.n_name (TEXT) JOIN(7)(CROSS) - => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT) - => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT) + => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT) as a_name, default.a.r_name (TEXT) => out schema: {(2) a_name (TEXT), default.a.r_name (TEXT)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT) as b_name, default.b.r_name (TEXT) - => out schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT) as b_name, default.b.n_name (TEXT) + => out schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000004 [TERMINAL] diff --git a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash_NoBroadcast.plan b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash_NoBroadcast.plan index cfbfa19ed8..fd89830beb 100644 --- a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash_NoBroadcast.plan +++ b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Hash_NoBroadcast.plan @@ -3,21 +3,21 @@ explain PROJECTION(3) => Targets: a_name (TEXT), b_name (TEXT) => out schema: {(2) a_name (TEXT), b_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SELECTION(6) - => Search Cond: default.a.r_name (TEXT) < default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) < default.b.n_name (TEXT) JOIN(7)(CROSS) - => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT) - => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT) + => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT) as a_name, default.a.r_name (TEXT) => out schema: {(2) a_name (TEXT), default.a.r_name (TEXT)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT) as b_name, default.b.r_name (TEXT) - => out schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT) as b_name, default.b.n_name (TEXT) + => out schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -43,10 +43,10 @@ Block Id: eb_0000000000000_0000_000001 [LEAF] [Outgoing] [q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE) -SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT) as b_name, default.b.r_name (TEXT) - => out schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} +SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT) as b_name, default.b.n_name (TEXT) + => out schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000002 [LEAF] @@ -71,19 +71,19 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] PROJECTION(3) => Targets: a_name (TEXT), b_name (TEXT) => out schema: {(2) a_name (TEXT), b_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SELECTION(6) - => Search Cond: default.a.r_name (TEXT) < default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) < default.b.n_name (TEXT) JOIN(7)(CROSS) - => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT) - => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT) + => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SCAN(10) on eb_0000000000000_0000_000002 => out schema: {(2) a_name (TEXT), default.a.r_name (TEXT)} => in schema: {(2) a_name (TEXT), default.a.r_name (TEXT)} SCAN(9) on eb_0000000000000_0000_000001 - => out schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} + => out schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} ======================================================= Block Id: eb_0000000000000_0000_000004 [TERMINAL] diff --git a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort.plan b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort.plan index 207f9b1281..6ec39f95c3 100644 --- a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort.plan @@ -3,21 +3,21 @@ explain PROJECTION(3) => Targets: a_name (TEXT), b_name (TEXT) => out schema: {(2) a_name (TEXT), b_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SELECTION(6) - => Search Cond: default.a.r_name (TEXT) < default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) < default.b.n_name (TEXT) JOIN(7)(CROSS) - => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT) - => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT) + => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT) as a_name, default.a.r_name (TEXT) => out schema: {(2) a_name (TEXT), default.a.r_name (TEXT)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT) as b_name, default.b.r_name (TEXT) - => out schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT) as b_name, default.b.n_name (TEXT) + => out schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -37,26 +37,26 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.b + 0: type=Broadcast, tables=default.a PROJECTION(3) => Targets: a_name (TEXT), b_name (TEXT) => out schema: {(2) a_name (TEXT), b_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SELECTION(6) - => Search Cond: default.a.r_name (TEXT) < default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) < default.b.n_name (TEXT) JOIN(7)(CROSS) - => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT) - => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT) + => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT) as a_name, default.a.r_name (TEXT) => out schema: {(2) a_name (TEXT), default.a.r_name (TEXT)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT) as b_name, default.b.r_name (TEXT) - => out schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT) as b_name, default.b.n_name (TEXT) + => out schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000004 [TERMINAL] diff --git a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort_NoBroadcast.plan b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort_NoBroadcast.plan index cfbfa19ed8..fd89830beb 100644 --- a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort_NoBroadcast.plan +++ b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.Sort_NoBroadcast.plan @@ -3,21 +3,21 @@ explain PROJECTION(3) => Targets: a_name (TEXT), b_name (TEXT) => out schema: {(2) a_name (TEXT), b_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SELECTION(6) - => Search Cond: default.a.r_name (TEXT) < default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) < default.b.n_name (TEXT) JOIN(7)(CROSS) - => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT) - => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT) + => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT) as a_name, default.a.r_name (TEXT) => out schema: {(2) a_name (TEXT), default.a.r_name (TEXT)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT) as b_name, default.b.r_name (TEXT) - => out schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT) as b_name, default.b.n_name (TEXT) + => out schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -43,10 +43,10 @@ Block Id: eb_0000000000000_0000_000001 [LEAF] [Outgoing] [q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE) -SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT) as b_name, default.b.r_name (TEXT) - => out schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} +SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT) as b_name, default.b.n_name (TEXT) + => out schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000002 [LEAF] @@ -71,19 +71,19 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] PROJECTION(3) => Targets: a_name (TEXT), b_name (TEXT) => out schema: {(2) a_name (TEXT), b_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SELECTION(6) - => Search Cond: default.a.r_name (TEXT) < default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) < default.b.n_name (TEXT) JOIN(7)(CROSS) - => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT) - => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.r_name (TEXT)} + => target list: a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT) + => out schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(4) a_name (TEXT), b_name (TEXT), default.a.r_name (TEXT), default.b.n_name (TEXT)} SCAN(10) on eb_0000000000000_0000_000002 => out schema: {(2) a_name (TEXT), default.a.r_name (TEXT)} => in schema: {(2) a_name (TEXT), default.a.r_name (TEXT)} SCAN(9) on eb_0000000000000_0000_000001 - => out schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} - => in schema: {(2) b_name (TEXT), default.b.r_name (TEXT)} + => out schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} + => in schema: {(2) b_name (TEXT), default.b.n_name (TEXT)} ======================================================= Block Id: eb_0000000000000_0000_000004 [TERMINAL] diff --git a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.result b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.result index 8ddc197d08..7437fb985b 100644 --- a/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.result +++ b/tajo-core-tests/src/test/resources/results/TestCrossJoin/testCrossJoinWithThetaJoinConditionInWhere.result @@ -1,12 +1,101 @@ a_name,b_name ------------------------------- -AFRICA,AMERICA -AFRICA,ASIA -AFRICA,EUROPE -AFRICA,MIDDLE EAST -AMERICA,ASIA -AMERICA,EUROPE -AMERICA,MIDDLE EAST -ASIA,EUROPE -ASIA,MIDDLE EAST -EUROPE,MIDDLE EAST +AFRICA,ALGERIA +AFRICA,ARGENTINA +AFRICA,BRAZIL +AFRICA,CANADA +AFRICA,CHINA +AFRICA,EGYPT +AFRICA,ETHIOPIA +AFRICA,FRANCE +AFRICA,GERMANY +AFRICA,INDIA +AFRICA,INDONESIA +AFRICA,IRAN +AFRICA,IRAQ +AFRICA,JAPAN +AFRICA,JORDAN +AFRICA,KENYA +AFRICA,MOROCCO +AFRICA,MOZAMBIQUE +AFRICA,PERU +AFRICA,ROMANIA +AFRICA,RUSSIA +AFRICA,SAUDI ARABIA +AFRICA,UNITED KINGDOM +AFRICA,UNITED STATES +AFRICA,VIETNAM +AMERICA,ARGENTINA +AMERICA,BRAZIL +AMERICA,CANADA +AMERICA,CHINA +AMERICA,EGYPT +AMERICA,ETHIOPIA +AMERICA,FRANCE +AMERICA,GERMANY +AMERICA,INDIA +AMERICA,INDONESIA +AMERICA,IRAN +AMERICA,IRAQ +AMERICA,JAPAN +AMERICA,JORDAN +AMERICA,KENYA +AMERICA,MOROCCO +AMERICA,MOZAMBIQUE +AMERICA,PERU +AMERICA,ROMANIA +AMERICA,RUSSIA +AMERICA,SAUDI ARABIA +AMERICA,UNITED KINGDOM +AMERICA,UNITED STATES +AMERICA,VIETNAM +ASIA,BRAZIL +ASIA,CANADA +ASIA,CHINA +ASIA,EGYPT +ASIA,ETHIOPIA +ASIA,FRANCE +ASIA,GERMANY +ASIA,INDIA +ASIA,INDONESIA +ASIA,IRAN +ASIA,IRAQ +ASIA,JAPAN +ASIA,JORDAN +ASIA,KENYA +ASIA,MOROCCO +ASIA,MOZAMBIQUE +ASIA,PERU +ASIA,ROMANIA +ASIA,RUSSIA +ASIA,SAUDI ARABIA +ASIA,UNITED KINGDOM +ASIA,UNITED STATES +ASIA,VIETNAM +EUROPE,FRANCE +EUROPE,GERMANY +EUROPE,INDIA +EUROPE,INDONESIA +EUROPE,IRAN +EUROPE,IRAQ +EUROPE,JAPAN +EUROPE,JORDAN +EUROPE,KENYA +EUROPE,MOROCCO +EUROPE,MOZAMBIQUE +EUROPE,PERU +EUROPE,ROMANIA +EUROPE,RUSSIA +EUROPE,SAUDI ARABIA +EUROPE,UNITED KINGDOM +EUROPE,UNITED STATES +EUROPE,VIETNAM +MIDDLE EAST,MOROCCO +MIDDLE EAST,MOZAMBIQUE +MIDDLE EAST,PERU +MIDDLE EAST,ROMANIA +MIDDLE EAST,RUSSIA +MIDDLE EAST,SAUDI ARABIA +MIDDLE EAST,UNITED KINGDOM +MIDDLE EAST,UNITED STATES +MIDDLE EAST,VIETNAM diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.result b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.result index 3626882ece..9e0736c22b 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.result +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testDifferentTypesJoinCondition.result @@ -1,7 +1,4 @@ id,name,score,type,id,name,score,type ------------------------------- -1,ooo,1.1,a,1,ooo,1.1,a -2,ppp,2.3,b,2,ppp,2.3,b -3,qqq,3.4,c,3,qqq,3.4,c -4,rrr,4.5,d,4,rrr,4.5,d -5,xxx,5.6,e,5,xxx,5.6,e +1,ooo,1.1,a,1,null,null,a +2,ppp,2.3,b,2,null,null,b diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash.plan index a812559b1e..7d8fe21873 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash.plan @@ -1,20 +1,20 @@ explain ------------------------------- SELECTION(6) - => Search Cond: default.a.r_name (TEXT) <= default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) <= default.b.n_name (TEXT) JOIN(7)(INNER) - => Join Cond: default.a.r_regionkey (INT4) = default.b.r_regionkey (INT4) - => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT) - => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT)} - => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + => Join Cond: default.a.r_regionkey (INT4) = default.b.n_regionkey (INT4) + => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT) + => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT)} + => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT), default.b.n_regionkey (INT4)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4) => out schema: {(2) default.a.r_name (TEXT), default.a.r_regionkey (INT4)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT), default.b.r_regionkey (INT4) - => out schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT), default.b.n_regionkey (INT4) + => out schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -34,23 +34,23 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.b + 0: type=Broadcast, tables=default.a SELECTION(6) - => Search Cond: default.a.r_name (TEXT) <= default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) <= default.b.n_name (TEXT) JOIN(7)(INNER) - => Join Cond: default.a.r_regionkey (INT4) = default.b.r_regionkey (INT4) - => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT) - => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT)} - => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + => Join Cond: default.a.r_regionkey (INT4) = default.b.n_regionkey (INT4) + => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT) + => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT)} + => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT), default.b.n_regionkey (INT4)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4) => out schema: {(2) default.a.r_name (TEXT), default.a.r_regionkey (INT4)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT), default.b.r_regionkey (INT4) - => out schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT), default.b.n_regionkey (INT4) + => out schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000004 [TERMINAL] diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash_NoBroadcast.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash_NoBroadcast.plan index 79d5e7aea5..dbf04dea98 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash_NoBroadcast.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Hash_NoBroadcast.plan @@ -1,20 +1,20 @@ explain ------------------------------- SELECTION(6) - => Search Cond: default.a.r_name (TEXT) <= default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) <= default.b.n_name (TEXT) JOIN(7)(INNER) - => Join Cond: default.a.r_regionkey (INT4) = default.b.r_regionkey (INT4) - => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT) - => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT)} - => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + => Join Cond: default.a.r_regionkey (INT4) = default.b.n_regionkey (INT4) + => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT) + => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT)} + => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT), default.b.n_regionkey (INT4)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4) => out schema: {(2) default.a.r_name (TEXT), default.a.r_regionkey (INT4)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT), default.b.r_regionkey (INT4) - => out schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT), default.b.n_regionkey (INT4) + => out schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -38,12 +38,12 @@ Block Id: eb_0000000000000_0000_000001 [LEAF] ======================================================= [Outgoing] -[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=default.b.r_regionkey (INT4), num=32) +[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=default.b.n_regionkey (INT4), num=32) -SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT), default.b.r_regionkey (INT4) - => out schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} +SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT), default.b.n_regionkey (INT4) + => out schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000002 [LEAF] @@ -62,22 +62,22 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Incoming] -[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=default.b.r_regionkey (INT4), num=32) +[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=default.b.n_regionkey (INT4), num=32) [q_0000000000000_0000] 2 => 3 (type=HASH_SHUFFLE, key=default.a.r_regionkey (INT4), num=32) SELECTION(6) - => Search Cond: default.a.r_name (TEXT) <= default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) <= default.b.n_name (TEXT) JOIN(7)(INNER) - => Join Cond: default.a.r_regionkey (INT4) = default.b.r_regionkey (INT4) - => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT) - => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT)} - => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + => Join Cond: default.a.r_regionkey (INT4) = default.b.n_regionkey (INT4) + => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT) + => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT)} + => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT), default.b.n_regionkey (INT4)} SCAN(10) on eb_0000000000000_0000_000002 => out schema: {(2) default.a.r_name (TEXT), default.a.r_regionkey (INT4)} => in schema: {(2) default.a.r_name (TEXT), default.a.r_regionkey (INT4)} SCAN(9) on eb_0000000000000_0000_000001 - => out schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} - => in schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + => out schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} + => in schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000004 [TERMINAL] diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort.plan index a812559b1e..7d8fe21873 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort.plan @@ -1,20 +1,20 @@ explain ------------------------------- SELECTION(6) - => Search Cond: default.a.r_name (TEXT) <= default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) <= default.b.n_name (TEXT) JOIN(7)(INNER) - => Join Cond: default.a.r_regionkey (INT4) = default.b.r_regionkey (INT4) - => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT) - => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT)} - => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + => Join Cond: default.a.r_regionkey (INT4) = default.b.n_regionkey (INT4) + => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT) + => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT)} + => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT), default.b.n_regionkey (INT4)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4) => out schema: {(2) default.a.r_name (TEXT), default.a.r_regionkey (INT4)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT), default.b.r_regionkey (INT4) - => out schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT), default.b.n_regionkey (INT4) + => out schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -34,23 +34,23 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Enforcers] - 0: type=Broadcast, tables=default.b + 0: type=Broadcast, tables=default.a SELECTION(6) - => Search Cond: default.a.r_name (TEXT) <= default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) <= default.b.n_name (TEXT) JOIN(7)(INNER) - => Join Cond: default.a.r_regionkey (INT4) = default.b.r_regionkey (INT4) - => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT) - => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT)} - => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + => Join Cond: default.a.r_regionkey (INT4) = default.b.n_regionkey (INT4) + => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT) + => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT)} + => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT), default.b.n_regionkey (INT4)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4) => out schema: {(2) default.a.r_name (TEXT), default.a.r_regionkey (INT4)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT), default.b.r_regionkey (INT4) - => out schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT), default.b.n_regionkey (INT4) + => out schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000004 [TERMINAL] diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort_NoBroadcast.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort_NoBroadcast.plan index 79d5e7aea5..dbf04dea98 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort_NoBroadcast.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.Sort_NoBroadcast.plan @@ -1,20 +1,20 @@ explain ------------------------------- SELECTION(6) - => Search Cond: default.a.r_name (TEXT) <= default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) <= default.b.n_name (TEXT) JOIN(7)(INNER) - => Join Cond: default.a.r_regionkey (INT4) = default.b.r_regionkey (INT4) - => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT) - => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT)} - => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + => Join Cond: default.a.r_regionkey (INT4) = default.b.n_regionkey (INT4) + => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT) + => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT)} + => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT), default.b.n_regionkey (INT4)} SCAN(0) on default.region as a => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4) => out schema: {(2) default.a.r_name (TEXT), default.a.r_regionkey (INT4)} => in schema: {(3) default.a.r_comment (TEXT), default.a.r_name (TEXT), default.a.r_regionkey (INT4)} - SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT), default.b.r_regionkey (INT4) - => out schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT), default.b.n_regionkey (INT4) + => out schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -38,12 +38,12 @@ Block Id: eb_0000000000000_0000_000001 [LEAF] ======================================================= [Outgoing] -[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=default.b.r_regionkey (INT4), num=32) +[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=default.b.n_regionkey (INT4), num=32) -SCAN(1) on default.region as b - => target list: default.b.r_name (TEXT), default.b.r_regionkey (INT4) - => out schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} - => in schema: {(3) default.b.r_comment (TEXT), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} +SCAN(1) on default.nation as b + => target list: default.b.n_name (TEXT), default.b.n_regionkey (INT4) + => out schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} + => in schema: {(4) default.b.n_comment (TEXT), default.b.n_name (TEXT), default.b.n_nationkey (INT4), default.b.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000002 [LEAF] @@ -62,22 +62,22 @@ Block Id: eb_0000000000000_0000_000003 [ROOT] ======================================================= [Incoming] -[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=default.b.r_regionkey (INT4), num=32) +[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=default.b.n_regionkey (INT4), num=32) [q_0000000000000_0000] 2 => 3 (type=HASH_SHUFFLE, key=default.a.r_regionkey (INT4), num=32) SELECTION(6) - => Search Cond: default.a.r_name (TEXT) <= default.b.r_name (TEXT) + => Search Cond: default.a.r_name (TEXT) <= default.b.n_name (TEXT) JOIN(7)(INNER) - => Join Cond: default.a.r_regionkey (INT4) = default.b.r_regionkey (INT4) - => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT) - => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT)} - => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + => Join Cond: default.a.r_regionkey (INT4) = default.b.n_regionkey (INT4) + => target list: default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT) + => out schema: {(3) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT)} + => in schema: {(4) default.a.r_name (TEXT), default.a.r_regionkey (INT4), default.b.n_name (TEXT), default.b.n_regionkey (INT4)} SCAN(10) on eb_0000000000000_0000_000002 => out schema: {(2) default.a.r_name (TEXT), default.a.r_regionkey (INT4)} => in schema: {(2) default.a.r_name (TEXT), default.a.r_regionkey (INT4)} SCAN(9) on eb_0000000000000_0000_000001 - => out schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} - => in schema: {(2) default.b.r_name (TEXT), default.b.r_regionkey (INT4)} + => out schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} + => in schema: {(2) default.b.n_name (TEXT), default.b.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000004 [TERMINAL] diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.result b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.result index 850ee29fe0..dd0da9328b 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.result +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinQuery/testInnerJoinWithThetaJoinConditionInWhere.result @@ -1,7 +1,23 @@ -r_regionkey,r_name,r_name +r_regionkey,r_name,n_name ------------------------------- -0,AFRICA,AFRICA -1,AMERICA,AMERICA -2,ASIA,ASIA -3,EUROPE,EUROPE -4,MIDDLE EAST,MIDDLE EAST +0,AFRICA,ALGERIA +0,AFRICA,ETHIOPIA +0,AFRICA,KENYA +0,AFRICA,MOROCCO +0,AFRICA,MOZAMBIQUE +1,AMERICA,ARGENTINA +1,AMERICA,BRAZIL +1,AMERICA,CANADA +1,AMERICA,PERU +1,AMERICA,UNITED STATES +2,ASIA,CHINA +2,ASIA,INDIA +2,ASIA,INDONESIA +2,ASIA,JAPAN +2,ASIA,VIETNAM +3,EUROPE,FRANCE +3,EUROPE,GERMANY +3,EUROPE,ROMANIA +3,EUROPE,RUSSIA +3,EUROPE,UNITED KINGDOM +4,MIDDLE EAST,SAUDI ARABIA diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash.plan index cd63ed80d1..7263d03a52 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash.plan @@ -7,18 +7,18 @@ SORT(5) => target list: default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT) => out schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} => in schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} - SCAN(0) on default.nation as n1 - => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 - => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} TABLE_SUBQUERY(3) as default.n2 => Targets: substr(default.n2.n_name (TEXT),1,4) as name2 => out schema: {(1) name2 (TEXT)} => in schema: {(4) default.n2.n_comment (TEXT), default.n2.n_name (TEXT), default.n2.n_nationkey (INT4), default.n2.n_regionkey (INT4)} - SCAN(1) on default.nation - => target list: default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} + SCAN(1) on default.small_nation + => target list: default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + SCAN(0) on default.nation as n1 + => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 + => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} + => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -43,7 +43,7 @@ Block Id: eb_0000000000000_0000_000003 [LEAF] [q_0000000000000_0000] 3 => 4 (type=RANGE_SHUFFLE, key=default.n1.n_nationkey (INT4), num=32) [Enforcers] - 0: type=Broadcast, tables=default.n1 + 0: type=Broadcast, tables=default.small_nation SORT(12) => Sort Keys: default.n1.n_nationkey (INT4) (asc) @@ -52,22 +52,22 @@ SORT(12) => target list: default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT) => out schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} => in schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} - SCAN(0) on default.nation as n1 - => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 - => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} TABLE_SUBQUERY(3) as default.n2 => Targets: substr(default.n2.n_name (TEXT),1,4) as name2 => out schema: {(1) name2 (TEXT)} => in schema: {(4) default.n2.n_comment (TEXT), default.n2.n_name (TEXT), default.n2.n_nationkey (INT4), default.n2.n_regionkey (INT4)} PROJECTION(2) - => Targets: default.nation.n_nationkey (INT4), default.nation.n_name (TEXT), default.nation.n_regionkey (INT4), default.nation.n_comment (TEXT) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - SCAN(1) on default.nation - => target list: default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} + => Targets: default.small_nation.n_nationkey (INT4), default.small_nation.n_name (TEXT), default.small_nation.n_regionkey (INT4), default.small_nation.n_comment (TEXT) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + SCAN(1) on default.small_nation + => target list: default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + SCAN(0) on default.nation as n1 + => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 + => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} + => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000004 [ROOT] diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash_NoBroadcast.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash_NoBroadcast.plan index 2325ed7ebd..f8ce4267d2 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash_NoBroadcast.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash_NoBroadcast.plan @@ -7,18 +7,18 @@ SORT(5) => target list: default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT) => out schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} => in schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} - SCAN(0) on default.nation as n1 - => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 - => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} TABLE_SUBQUERY(3) as default.n2 => Targets: substr(default.n2.n_name (TEXT),1,4) as name2 => out schema: {(1) name2 (TEXT)} => in schema: {(4) default.n2.n_comment (TEXT), default.n2.n_name (TEXT), default.n2.n_nationkey (INT4), default.n2.n_regionkey (INT4)} - SCAN(1) on default.nation - => target list: default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} + SCAN(1) on default.small_nation + => target list: default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + SCAN(0) on default.nation as n1 + => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 + => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} + => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -44,40 +44,40 @@ Block Id: eb_0000000000000_0000_000001 [LEAF] ======================================================= [Outgoing] -[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=name2 (TEXT), num=32) +[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=name1 (TEXT), num=32) -TABLE_SUBQUERY(3) as default.n2 - => Targets: substr(default.n2.n_name (TEXT),1,4) as name2 - => out schema: {(1) name2 (TEXT)} - => in schema: {(4) default.n2.n_comment (TEXT), default.n2.n_name (TEXT), default.n2.n_nationkey (INT4), default.n2.n_regionkey (INT4)} - PROJECTION(2) - => Targets: default.nation.n_nationkey (INT4), default.nation.n_name (TEXT), default.nation.n_regionkey (INT4), default.nation.n_comment (TEXT) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - SCAN(1) on default.nation - => target list: default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} +SCAN(0) on default.nation as n1 + => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 + => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} + => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000002 [LEAF] ======================================================= [Outgoing] -[q_0000000000000_0000] 2 => 3 (type=HASH_SHUFFLE, key=name1 (TEXT), num=32) +[q_0000000000000_0000] 2 => 3 (type=HASH_SHUFFLE, key=name2 (TEXT), num=32) -SCAN(0) on default.nation as n1 - => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 - => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} +TABLE_SUBQUERY(3) as default.n2 + => Targets: substr(default.n2.n_name (TEXT),1,4) as name2 + => out schema: {(1) name2 (TEXT)} + => in schema: {(4) default.n2.n_comment (TEXT), default.n2.n_name (TEXT), default.n2.n_nationkey (INT4), default.n2.n_regionkey (INT4)} + PROJECTION(2) + => Targets: default.small_nation.n_nationkey (INT4), default.small_nation.n_name (TEXT), default.small_nation.n_regionkey (INT4), default.small_nation.n_comment (TEXT) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + SCAN(1) on default.small_nation + => target list: default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000003 [INTERMEDIATE] ======================================================= [Incoming] -[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=name2 (TEXT), num=32) -[q_0000000000000_0000] 2 => 3 (type=HASH_SHUFFLE, key=name1 (TEXT), num=32) +[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=name1 (TEXT), num=32) +[q_0000000000000_0000] 2 => 3 (type=HASH_SHUFFLE, key=name2 (TEXT), num=32) [Outgoing] [q_0000000000000_0000] 3 => 4 (type=RANGE_SHUFFLE, key=default.n1.n_nationkey (INT4), num=32) @@ -90,11 +90,11 @@ SORT(12) => out schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} => in schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} SCAN(11) on eb_0000000000000_0000_000002 - => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - => in schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - SCAN(10) on eb_0000000000000_0000_000001 => out schema: {(1) name2 (TEXT)} => in schema: {(1) name2 (TEXT)} + SCAN(10) on eb_0000000000000_0000_000001 + => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} + => in schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} ======================================================= Block Id: eb_0000000000000_0000_000004 [ROOT] diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort.plan index cd63ed80d1..7263d03a52 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort.plan @@ -7,18 +7,18 @@ SORT(5) => target list: default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT) => out schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} => in schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} - SCAN(0) on default.nation as n1 - => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 - => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} TABLE_SUBQUERY(3) as default.n2 => Targets: substr(default.n2.n_name (TEXT),1,4) as name2 => out schema: {(1) name2 (TEXT)} => in schema: {(4) default.n2.n_comment (TEXT), default.n2.n_name (TEXT), default.n2.n_nationkey (INT4), default.n2.n_regionkey (INT4)} - SCAN(1) on default.nation - => target list: default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} + SCAN(1) on default.small_nation + => target list: default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + SCAN(0) on default.nation as n1 + => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 + => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} + => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -43,7 +43,7 @@ Block Id: eb_0000000000000_0000_000003 [LEAF] [q_0000000000000_0000] 3 => 4 (type=RANGE_SHUFFLE, key=default.n1.n_nationkey (INT4), num=32) [Enforcers] - 0: type=Broadcast, tables=default.n1 + 0: type=Broadcast, tables=default.small_nation SORT(12) => Sort Keys: default.n1.n_nationkey (INT4) (asc) @@ -52,22 +52,22 @@ SORT(12) => target list: default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT) => out schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} => in schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} - SCAN(0) on default.nation as n1 - => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 - => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} TABLE_SUBQUERY(3) as default.n2 => Targets: substr(default.n2.n_name (TEXT),1,4) as name2 => out schema: {(1) name2 (TEXT)} => in schema: {(4) default.n2.n_comment (TEXT), default.n2.n_name (TEXT), default.n2.n_nationkey (INT4), default.n2.n_regionkey (INT4)} PROJECTION(2) - => Targets: default.nation.n_nationkey (INT4), default.nation.n_name (TEXT), default.nation.n_regionkey (INT4), default.nation.n_comment (TEXT) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - SCAN(1) on default.nation - => target list: default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} + => Targets: default.small_nation.n_nationkey (INT4), default.small_nation.n_name (TEXT), default.small_nation.n_regionkey (INT4), default.small_nation.n_comment (TEXT) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + SCAN(1) on default.small_nation + => target list: default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + SCAN(0) on default.nation as n1 + => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 + => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} + => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000004 [ROOT] diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort_NoBroadcast.plan b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort_NoBroadcast.plan index 2325ed7ebd..f8ce4267d2 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort_NoBroadcast.plan +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort_NoBroadcast.plan @@ -7,18 +7,18 @@ SORT(5) => target list: default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT) => out schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} => in schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} - SCAN(0) on default.nation as n1 - => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 - => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} TABLE_SUBQUERY(3) as default.n2 => Targets: substr(default.n2.n_name (TEXT),1,4) as name2 => out schema: {(1) name2 (TEXT)} => in schema: {(4) default.n2.n_comment (TEXT), default.n2.n_name (TEXT), default.n2.n_nationkey (INT4), default.n2.n_regionkey (INT4)} - SCAN(1) on default.nation - => target list: default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} + SCAN(1) on default.small_nation + => target list: default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + SCAN(0) on default.nation as n1 + => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 + => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} + => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} explain ------------------------------- ------------------------------------------------------------------------------- @@ -44,40 +44,40 @@ Block Id: eb_0000000000000_0000_000001 [LEAF] ======================================================= [Outgoing] -[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=name2 (TEXT), num=32) +[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=name1 (TEXT), num=32) -TABLE_SUBQUERY(3) as default.n2 - => Targets: substr(default.n2.n_name (TEXT),1,4) as name2 - => out schema: {(1) name2 (TEXT)} - => in schema: {(4) default.n2.n_comment (TEXT), default.n2.n_name (TEXT), default.n2.n_nationkey (INT4), default.n2.n_regionkey (INT4)} - PROJECTION(2) - => Targets: default.nation.n_nationkey (INT4), default.nation.n_name (TEXT), default.nation.n_regionkey (INT4), default.nation.n_comment (TEXT) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - SCAN(1) on default.nation - => target list: default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4) - => out schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} - => in schema: {(4) default.nation.n_comment (TEXT), default.nation.n_name (TEXT), default.nation.n_nationkey (INT4), default.nation.n_regionkey (INT4)} +SCAN(0) on default.nation as n1 + => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 + => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} + => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000002 [LEAF] ======================================================= [Outgoing] -[q_0000000000000_0000] 2 => 3 (type=HASH_SHUFFLE, key=name1 (TEXT), num=32) +[q_0000000000000_0000] 2 => 3 (type=HASH_SHUFFLE, key=name2 (TEXT), num=32) -SCAN(0) on default.nation as n1 - => target list: default.n1.n_nationkey (INT4), substr(default.n1.n_name (TEXT),1,4) as name1 - => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - => in schema: {(4) default.n1.n_comment (TEXT), default.n1.n_name (TEXT), default.n1.n_nationkey (INT4), default.n1.n_regionkey (INT4)} +TABLE_SUBQUERY(3) as default.n2 + => Targets: substr(default.n2.n_name (TEXT),1,4) as name2 + => out schema: {(1) name2 (TEXT)} + => in schema: {(4) default.n2.n_comment (TEXT), default.n2.n_name (TEXT), default.n2.n_nationkey (INT4), default.n2.n_regionkey (INT4)} + PROJECTION(2) + => Targets: default.small_nation.n_nationkey (INT4), default.small_nation.n_name (TEXT), default.small_nation.n_regionkey (INT4), default.small_nation.n_comment (TEXT) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + SCAN(1) on default.small_nation + => target list: default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4) + => out schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} + => in schema: {(4) default.small_nation.n_comment (TEXT), default.small_nation.n_name (TEXT), default.small_nation.n_nationkey (INT4), default.small_nation.n_regionkey (INT4)} ======================================================= Block Id: eb_0000000000000_0000_000003 [INTERMEDIATE] ======================================================= [Incoming] -[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=name2 (TEXT), num=32) -[q_0000000000000_0000] 2 => 3 (type=HASH_SHUFFLE, key=name1 (TEXT), num=32) +[q_0000000000000_0000] 1 => 3 (type=HASH_SHUFFLE, key=name1 (TEXT), num=32) +[q_0000000000000_0000] 2 => 3 (type=HASH_SHUFFLE, key=name2 (TEXT), num=32) [Outgoing] [q_0000000000000_0000] 3 => 4 (type=RANGE_SHUFFLE, key=default.n1.n_nationkey (INT4), num=32) @@ -90,11 +90,11 @@ SORT(12) => out schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} => in schema: {(3) default.n1.n_nationkey (INT4), name1 (TEXT), name2 (TEXT)} SCAN(11) on eb_0000000000000_0000_000002 - => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - => in schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} - SCAN(10) on eb_0000000000000_0000_000001 => out schema: {(1) name2 (TEXT)} => in schema: {(1) name2 (TEXT)} + SCAN(10) on eb_0000000000000_0000_000001 + => out schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} + => in schema: {(2) default.n1.n_nationkey (INT4), name1 (TEXT)} ======================================================= Block Id: eb_0000000000000_0000_000004 [ROOT] diff --git a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.result b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.result index 9244a0b092..2e3ed769b0 100644 --- a/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.result +++ b/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.result @@ -5,25 +5,3 @@ n_nationkey,name1,name2 2,BRAZ,BRAZ 3,CANA,CANA 4,EGYP,EGYP -5,ETHI,ETHI -6,FRAN,FRAN -7,GERM,GERM -8,INDI,INDI -9,INDO,INDO -10,IRAN,IRAN -11,IRAQ,IRAQ -12,JAPA,JAPA -13,JORD,JORD -14,KENY,KENY -15,MORO,MORO -16,MOZA,MOZA -17,PERU,PERU -18,CHIN,CHIN -19,ROMA,ROMA -20,SAUD,SAUD -21,VIET,VIET -22,RUSS,RUSS -23,UNIT,UNIT -23,UNIT,UNIT -24,UNIT,UNIT -24,UNIT,UNIT