Merge fixes for HashJoin
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/a88102bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/a88102bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/a88102bf Branch: refs/heads/master Commit: a88102bfa05d3e5eddbb08d6534a41f8221f2690 Parents: 1fc7b98 Author: Jacques Nadeau <[email protected]> Authored: Sat Apr 19 20:57:10 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Sat Apr 19 21:07:29 2014 -0700 ---------------------------------------------------------------------- exec/java-exec/src/test/resources/join/hash_join.json | 8 ++++---- .../src/test/resources/join/hj_multi_condition_join.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a88102bf/exec/java-exec/src/test/resources/join/hash_join.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/join/hash_join.json b/exec/java-exec/src/test/resources/join/hash_join.json index 60b915b..6033655 100644 --- a/exec/java-exec/src/test/resources/join/hash_join.json +++ b/exec/java-exec/src/test/resources/join/hash_join.json @@ -27,10 +27,10 @@ "pop" : "project", "@id" : 3, "exprs" : [ { - "ref" : "output.A", + "ref" : "A", "expr" : "A" }, - { "ref" : "output.CCOL", "expr" : "C" } + { "ref" : "CCOL", "expr" : "C" } ], "child" : 1 @@ -39,10 +39,10 @@ "pop" : "project", "@id" : 4, "exprs" : [ { - "ref" : "output.B", + "ref" : "B", "expr" : "B" }, - { "ref" : "output.DCOL", "expr" : "D" } + { "ref" : "DCOL", "expr" : "D" } ], "child" : 2 http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a88102bf/exec/java-exec/src/test/resources/join/hj_multi_condition_join.json ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/resources/join/hj_multi_condition_join.json b/exec/java-exec/src/test/resources/join/hj_multi_condition_join.json index fd680d0..a6f0cba 100644 --- a/exec/java-exec/src/test/resources/join/hj_multi_condition_join.json +++ b/exec/java-exec/src/test/resources/join/hj_multi_condition_join.json @@ -27,10 +27,10 @@ "pop" : "project", "@id" : 3, "exprs" : [ { - "ref" : "output.A", + "ref" : "A", "expr" : "A" }, - { "ref" : "output.CCOL", "expr" : "C" } + { "ref" : "CCOL", "expr" : "C" } ], "child" : 1 @@ -39,10 +39,10 @@ "pop" : "project", "@id" : 4, "exprs" : [ { - "ref" : "output.B", + "ref" : "B", "expr" : "B" }, - { "ref" : "output.DCOL", "expr" : "D" } + { "ref" : "DCOL", "expr" : "D" } ], "child" : 2
