Repository: tajo Updated Branches: refs/heads/branch-0.11.0 4b9237617 -> f1cf1a242
http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash.plan ---------------------------------------------------------------------- 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 4e72e08..7263d03 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.nation + 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] http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Hash_NoBroadcast.plan ---------------------------------------------------------------------- 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 2325ed7..f8ce426 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] http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort.plan ---------------------------------------------------------------------- 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 4e72e08..7263d03 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.nation + 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] http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.Sort_NoBroadcast.plan ---------------------------------------------------------------------- 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 2325ed7..f8ce426 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] http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition5.result ---------------------------------------------------------------------- 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 9244a0b..2e3ed76 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 http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition6.Hash.plan ---------------------------------------------------------------------- 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 2402db7..2b307d7 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition6.Sort.plan ---------------------------------------------------------------------- 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 2402db7..2b307d7 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition7.Hash.plan ---------------------------------------------------------------------- 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 8e6d32b..280b4f8 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testComplexJoinCondition7.Sort.plan ---------------------------------------------------------------------- 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 8e6d32b..280b4f8 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual3.Hash.plan ---------------------------------------------------------------------- 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 195229d..dc04a93 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual3.Sort.plan ---------------------------------------------------------------------- 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 195229d..dc04a93 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual4.Hash.plan ---------------------------------------------------------------------- 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 f249f0e..7c48e47 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestInnerJoinWithSubQuery/testJoinWithMultipleJoinQual4.Sort.plan ---------------------------------------------------------------------- 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 f249f0e..7c48e47 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestMultipleJoinTypes/testComplexJoinsWithCaseWhen2.Hash.plan ---------------------------------------------------------------------- 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 a719990..8622663 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestMultipleJoinTypes/testComplexJoinsWithCaseWhen2.Sort.plan ---------------------------------------------------------------------- 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 a719990..8622663 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoin3.Hash.plan ---------------------------------------------------------------------- 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 61b4f62..637657b 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoin3.Sort.plan ---------------------------------------------------------------------- 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 61b4f62..637657b 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2.1.Hash.plan ---------------------------------------------------------------------- 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 264aafe..f7739c6 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2.1.Sort.plan ---------------------------------------------------------------------- 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 264aafe..f7739c6 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2_1.1.Hash.plan ---------------------------------------------------------------------- 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 a35e200..f49a827 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testLeftOuterJoinPredicationCaseByCase2_1.1.Sort.plan ---------------------------------------------------------------------- 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 a35e200..f49a827 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase1.1.Hash.plan ---------------------------------------------------------------------- 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 f347a88..791d378 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)) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase1.1.Sort.plan ---------------------------------------------------------------------- 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 f347a88..791d378 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)) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase2.1.Hash.plan ---------------------------------------------------------------------- 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 a5043ff..9db944e 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)) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase2.1.Sort.plan ---------------------------------------------------------------------- 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 a5043ff..9db944e 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)) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase3.1.Hash.plan ---------------------------------------------------------------------- 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 c0de2a1..8e7074e 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinQuery/testRightOuterJoinPredicationCaseByCase3.1.Sort.plan ---------------------------------------------------------------------- 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 c0de2a1..8e7074e 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinWithSubQuery/testLeftOuterJoinWithEmptySubquery2.1.Hash.plan ---------------------------------------------------------------------- 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 45b95c2..294638a 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core-tests/src/test/resources/results/TestOuterJoinWithSubQuery/testLeftOuterJoinWithEmptySubquery2.1.Sort.plan ---------------------------------------------------------------------- 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 45b95c2..294638a 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) http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core/src/main/java/org/apache/tajo/engine/planner/enforce/Enforcer.java ---------------------------------------------------------------------- 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 d67cee8..1e10372 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.catalog.proto.CatalogProtos; 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<EnforcerProto> { Map<EnforceType, List<EnforceProperty>> properties; @@ -208,7 +207,7 @@ public class Enforcer implements ProtoObject<EnforcerProto> { TUtil.putToNestedList(properties, builder.getType(), builder.build()); } - public Collection<EnforceProperty> getProperties() { + public List<EnforceProperty> getProperties() { if (proto != null) { return proto.getPropertiesList(); } else { http://git-wip-us.apache.org/repos/asf/tajo/blob/f1cf1a24/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/MasterPlan.java ---------------------------------------------------------------------- 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 80317b0..8a7229b 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.plan.util.PlannerUtil; 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 class MasterPlan { if (block.getEnforcer().getProperties().size() > 0) { sb.append("\n[Enforcers]\n"); int i = 0; - for (EnforceProperty enforce : block.getEnforcer().getProperties()) { + List<EnforceProperty> enforceProperties = block.getEnforcer().getProperties(); + Collections.sort(enforceProperties, new Comparator<EnforceProperty>() { + @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");
