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:25 UTC
[1/3] git commit: DRILL-533: Queries fail with NPE if dfs/cp schema
has no default workspace but has non-default workspace
Repository: incubator-drill
Updated Branches:
refs/heads/master 69c571ccd -> 059caed97
DRILL-533: Queries fail with NPE if dfs/cp schema has no default workspace but has non-default workspace
We currently add the "default" workspace only if there are no workspaces defined, but we always choose the workspace with "default" name as the default workspace. As in the repro case there is no default workspace, we end with a null.
Fix: Add default workspace if there is no "default" given in storage-engines.json
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/7a4fee42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/7a4fee42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/7a4fee42
Branch: refs/heads/master
Commit: 7a4fee42406516e729b9bdae31945cec4858a332
Parents: 69c571c
Author: vkorukanti <ve...@gmail.com>
Authored: Wed Apr 16 10:32:24 2014 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Wed Apr 23 08:08:47 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java | 5 +++++
sqlparser/src/test/resources/storage-plugins.json | 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/7a4fee42/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java
index 840a011..97427f6 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java
@@ -88,6 +88,11 @@ public class FileSystemPlugin extends AbstractStoragePlugin{
for(Map.Entry<String, String> space : config.workspaces.entrySet()){
factories.add(new WorkspaceSchemaFactory(this, space.getKey(), name, fs, space.getValue(), matchers));
}
+
+ // if the "default" workspace is not given add one.
+ if (!config.workspaces.containsKey("default")) {
+ factories.add(new WorkspaceSchemaFactory(this, "default", name, fs, "/", matchers));
+ }
}
this.schemaFactory = new FileSystemSchemaFactory(name, factories);
}catch(IOException e){
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/7a4fee42/sqlparser/src/test/resources/storage-plugins.json
----------------------------------------------------------------------
diff --git a/sqlparser/src/test/resources/storage-plugins.json b/sqlparser/src/test/resources/storage-plugins.json
index b9a4bd8..60efa50 100644
--- a/sqlparser/src/test/resources/storage-plugins.json
+++ b/sqlparser/src/test/resources/storage-plugins.json
@@ -4,7 +4,6 @@
type: "file",
connection: "file:///",
workspaces: {
- default: "/",
home: "/"
},
formats: {
@@ -44,4 +43,4 @@
}
}
}
-}
\ No newline at end of file
+}
[3/3] git commit: DRILL-554: maven-compiler-plugin only supports 'm'
suffix for 'maxmem' option
Posted by ja...@apache.org.
DRILL-554: maven-compiler-plugin only supports 'm' suffix for 'maxmem' option
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/059caed9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/059caed9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/059caed9
Branch: refs/heads/master
Commit: 059caed97a91a0f62235f00266113e86077de1e3
Parents: 70e909f
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Tue Apr 22 03:01:08 2014 -0700
Committer: Jacques Nadeau <ja...@apache.org>
Committed: Wed Apr 23 08:12:02 2014 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/059caed9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7166ee4..783db86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,7 @@
<configuration>
<source>1.7</source>
<target>1.7</target>
- <maxmem>2g</maxmem>
+ <maxmem>2048m</maxmem>
<fork>true</fork>
</configuration>
</plugin>
[2/3] git commit: DRILL-557: Fix mismatch between Jackson annotations
and field names.
Posted by ja...@apache.org.
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,