You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@drill.apache.org by ja...@apache.org on 2014/04/23 23:28:26 UTC
[2/3] git commit: DRILL-557: Fix mismatch between Jackson annotations
and field names.
DRILL-557: Fix mismatch between Jackson annotations and field names.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/70e909fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/70e909fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/70e909fa
Branch: refs/heads/master
Commit: 70e909fa76be561773f118a86e1ba66089140a49
Parents: 7a4fee4
Author: Mehant Baid <me...@gmail.com>
Authored: Tue Apr 22 20:43:31 2014 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Wed Apr 23 08:09:22 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/drill/exec/physical/config/HashJoinPOP.java | 4 ++--
.../java/org/apache/drill/exec/physical/config/MergeJoinPOP.java | 4 ++--
exec/java-exec/src/test/resources/join/hash_join.json | 2 +-
.../java-exec/src/test/resources/join/hash_join_multi_batch.json | 2 +-
.../src/test/resources/join/hj_left_outer_multi_batch.json | 4 ++--
.../src/test/resources/join/hj_multi_condition_join.json | 2 +-
.../src/test/resources/join/hj_right_outer_multi_batch.json | 4 ++--
exec/java-exec/src/test/resources/join/join_batchsize.json | 2 +-
.../src/test/resources/join/merge_inner_single_batch.json | 4 ++--
exec/java-exec/src/test/resources/join/merge_join.json | 2 +-
.../src/test/resources/join/merge_join_empty_batch.json | 4 ++--
exec/java-exec/src/test/resources/join/merge_multi_batch.json | 4 ++--
exec/java-exec/src/test/resources/join/merge_single_batch.json | 4 ++--
exec/java-exec/src/test/resources/sender/broadcast_exchange.json | 4 ++--
14 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java
index f4a1fc7..0718bff 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java
@@ -62,8 +62,8 @@ public class HashJoinPOP extends AbstractBase {
public HashJoinPOP(
@JsonProperty("left") PhysicalOperator left,
@JsonProperty("right") PhysicalOperator right,
- @JsonProperty("join-conditions") List<JoinCondition> conditions,
- @JsonProperty("join-type") JoinRelType joinType
+ @JsonProperty("conditions") List<JoinCondition> conditions,
+ @JsonProperty("joinType") JoinRelType joinType
) {
this.left = left;
this.right = right;
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java
index 047bed7..5bb378a 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java
@@ -55,8 +55,8 @@ public class MergeJoinPOP extends AbstractBase{
public MergeJoinPOP(
@JsonProperty("left") PhysicalOperator left,
@JsonProperty("right") PhysicalOperator right,
- @JsonProperty("join-conditions") List<JoinCondition> conditions,
- @JsonProperty("join-type") JoinRelType joinType
+ @JsonProperty("conditions") List<JoinCondition> conditions,
+ @JsonProperty("joinType") JoinRelType joinType
) {
this.left = left;
this.right = right;
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/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 6033655..e71d0bc 100644
--- a/exec/java-exec/src/test/resources/join/hash_join.json
+++ b/exec/java-exec/src/test/resources/join/hash_join.json
@@ -52,7 +52,7 @@
right: 3,
left: 4,
pop: "hash-join",
- join-conditions: [ {relationship: "==", left: "B", right: "A"} ]
+ conditions: [ {relationship: "==", left: "B", right: "A"} ]
},
{
@id: 6,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/test/resources/join/hash_join_multi_batch.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/hash_join_multi_batch.json b/exec/java-exec/src/test/resources/join/hash_join_multi_batch.json
index 7e218a4..16a1f2e 100644
--- a/exec/java-exec/src/test/resources/join/hash_join_multi_batch.json
+++ b/exec/java-exec/src/test/resources/join/hash_join_multi_batch.json
@@ -36,7 +36,7 @@
right: 1,
left: 2,
pop: "hash-join",
- join-conditions: [ {relationship: "==", left: "blue1", right: "blue"} ]
+ conditions: [ {relationship: "==", left: "blue1", right: "blue"} ]
},
{
@id: 4,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/test/resources/join/hj_left_outer_multi_batch.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/hj_left_outer_multi_batch.json b/exec/java-exec/src/test/resources/join/hj_left_outer_multi_batch.json
index 0cb5a03..1b35c5c 100644
--- a/exec/java-exec/src/test/resources/join/hj_left_outer_multi_batch.json
+++ b/exec/java-exec/src/test/resources/join/hj_left_outer_multi_batch.json
@@ -36,8 +36,8 @@
right: 1,
left: 2,
pop: "hash-join",
- join-type: "LEFT",
- join-conditions: [ {relationship: "==", left: "blue1", right: "blue"} ]
+ joinType: "LEFT",
+ conditions: [ {relationship: "==", left: "blue1", right: "blue"} ]
},
{
@id: 4,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/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 a6f0cba..23818ed 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
@@ -52,7 +52,7 @@
right: 3,
left: 4,
pop: "hash-join",
- join-conditions: [
+ conditions: [
{relationship: "==", left: "B", right: "A"},
{relationship: "==", left: "DCOL", right: "CCOL"}
]
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/test/resources/join/hj_right_outer_multi_batch.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/hj_right_outer_multi_batch.json b/exec/java-exec/src/test/resources/join/hj_right_outer_multi_batch.json
index b8723aa..c8f5136 100644
--- a/exec/java-exec/src/test/resources/join/hj_right_outer_multi_batch.json
+++ b/exec/java-exec/src/test/resources/join/hj_right_outer_multi_batch.json
@@ -36,8 +36,8 @@
right: 1,
left: 2,
pop: "hash-join",
- join-type: "RIGHT",
- join-conditions: [ {relationship: "==", left: "blue1", right: "blue"} ]
+ joinType: "RIGHT",
+ conditions: [ {relationship: "==", left: "blue1", right: "blue"} ]
},
{
@id: 4,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/test/resources/join/join_batchsize.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/join_batchsize.json b/exec/java-exec/src/test/resources/join/join_batchsize.json
index a3be355..dfbfe20 100644
--- a/exec/java-exec/src/test/resources/join/join_batchsize.json
+++ b/exec/java-exec/src/test/resources/join/join_batchsize.json
@@ -66,7 +66,7 @@
right: 6,
left: 3,
pop: "merge-join",
- join-conditions: [ {relationship: "==", left: "blue", right: "blue1"} ]
+ conditions: [ {relationship: "==", left: "blue", right: "blue1"} ]
},
{
pop : "limit",
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/test/resources/join/merge_inner_single_batch.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/merge_inner_single_batch.json b/exec/java-exec/src/test/resources/join/merge_inner_single_batch.json
index 5f00ce7..52b4141 100644
--- a/exec/java-exec/src/test/resources/join/merge_inner_single_batch.json
+++ b/exec/java-exec/src/test/resources/join/merge_inner_single_batch.json
@@ -30,8 +30,8 @@
left: 1,
right: 2,
pop: "merge-join",
- join-type: "INNER",
- join-conditions: [ { relationship: "==", left: "a", right: "aa" } ]
+ joinType: "INNER",
+ conditions: [ { relationship: "==", left: "a", right: "aa" } ]
},
{
@id: 4,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/test/resources/join/merge_join.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/merge_join.json b/exec/java-exec/src/test/resources/join/merge_join.json
index e6a92bb..fce2d5c 100644
--- a/exec/java-exec/src/test/resources/join/merge_join.json
+++ b/exec/java-exec/src/test/resources/join/merge_join.json
@@ -41,7 +41,7 @@
right: 1,
left: 2,
pop: "merge-join",
- join-conditions: [ {relationship: "==", left: "blue1", right: "blue"} ]
+ conditions: [ {relationship: "==", left: "blue1", right: "blue"} ]
},
{
@id: 4,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/test/resources/join/merge_join_empty_batch.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/merge_join_empty_batch.json b/exec/java-exec/src/test/resources/join/merge_join_empty_batch.json
index 19254e3..4820f1e 100644
--- a/exec/java-exec/src/test/resources/join/merge_join_empty_batch.json
+++ b/exec/java-exec/src/test/resources/join/merge_join_empty_batch.json
@@ -36,8 +36,8 @@
right: 1,
left: 2,
pop: "merge-join",
- join-type: "${JOIN_TYPE}",
- join-conditions: [ {relationship: "==", left: "blue1", right: "blue"} ]
+ joinType: "${JOIN_TYPE}",
+ conditions: [ {relationship: "==", left: "blue1", right: "blue"} ]
},
{
@id: 4,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/test/resources/join/merge_multi_batch.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/merge_multi_batch.json b/exec/java-exec/src/test/resources/join/merge_multi_batch.json
index 2859951..ef3ef41 100644
--- a/exec/java-exec/src/test/resources/join/merge_multi_batch.json
+++ b/exec/java-exec/src/test/resources/join/merge_multi_batch.json
@@ -30,8 +30,8 @@
left: 1,
right: 2,
pop: "merge-join",
- join-type: "LEFT",
- join-conditions: [ { relationship: "==", left: "a", right: "aa" } ]
+ joinType: "LEFT",
+ conditions: [ { relationship: "==", left: "a", right: "aa" } ]
},
{
@id: 4,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/test/resources/join/merge_single_batch.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/join/merge_single_batch.json b/exec/java-exec/src/test/resources/join/merge_single_batch.json
index 2859951..ef3ef41 100644
--- a/exec/java-exec/src/test/resources/join/merge_single_batch.json
+++ b/exec/java-exec/src/test/resources/join/merge_single_batch.json
@@ -30,8 +30,8 @@
left: 1,
right: 2,
pop: "merge-join",
- join-type: "LEFT",
- join-conditions: [ { relationship: "==", left: "a", right: "aa" } ]
+ joinType: "LEFT",
+ conditions: [ { relationship: "==", left: "a", right: "aa" } ]
},
{
@id: 4,
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/70e909fa/exec/java-exec/src/test/resources/sender/broadcast_exchange.json
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/resources/sender/broadcast_exchange.json b/exec/java-exec/src/test/resources/sender/broadcast_exchange.json
index 408e35b..950c318 100644
--- a/exec/java-exec/src/test/resources/sender/broadcast_exchange.json
+++ b/exec/java-exec/src/test/resources/sender/broadcast_exchange.json
@@ -31,8 +31,8 @@
@id : 4,
left: 3,
right: 2,
- join-type: "LEFT",
- join-conditions: [ { relationship: "==", left: "a", right: "aa" } ]
+ joinType: "LEFT",
+ conditions: [ { relationship: "==", left: "a", right: "aa" } ]
},
{
@id: 5,