include protobuf 2.4.1 and switch to older version of Lilith, to avoid conflict with hadoop 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/5bf58243 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/5bf58243 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/5bf58243 Branch: refs/heads/master Commit: 5bf58243b42e988ca623e5035629436a20454167 Parents: 86e5fb5 Author: Steven Phillips <[email protected]> Authored: Tue Sep 3 17:32:47 2013 -0700 Committer: Steven Phillips <[email protected]> Committed: Tue Sep 3 18:30:30 2013 -0700 ---------------------------------------------------------------------- sandbox/prototype/distribution/pom.xml | 11 +++++++++++ sandbox/prototype/distribution/src/assemble/bin.xml | 12 ++++++++++-- .../main/java/org/apache/drill/jdbc/DrillHandler.java | 1 + .../sqlparser/src/main/resources/storage-engines.json | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5bf58243/sandbox/prototype/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/distribution/pom.xml b/sandbox/prototype/distribution/pom.xml index 934c81a..5f60112 100644 --- a/sandbox/prototype/distribution/pom.xml +++ b/sandbox/prototype/distribution/pom.xml @@ -43,6 +43,17 @@ <artifactId>sqlparser</artifactId> <version>1.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>2.4.1</version> + </dependency> + <dependency> + <groupId>de.huxhorn.lilith</groupId> + <artifactId>de.huxhorn.lilith.logback.appender.multiplex-classic</artifactId> + <version>0.9.42.1</version> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5bf58243/sandbox/prototype/distribution/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/sandbox/prototype/distribution/src/assemble/bin.xml b/sandbox/prototype/distribution/src/assemble/bin.xml index e18d485..e739830 100644 --- a/sandbox/prototype/distribution/src/assemble/bin.xml +++ b/sandbox/prototype/distribution/src/assemble/bin.xml @@ -34,11 +34,19 @@ <excludes> <exclude>org.apache.drill</exclude> <exclude>org.apache.drill.exec</exclude> - <exclude>com.google.protobuf</exclude> - <exclude>de.huxhorn.*</exclude> + <exclude>com.google.protobuf:protobuf-java:jar:2.5.0</exclude> </excludes> <scope>test</scope> </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <unpack>false</unpack> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>com.google.protobuf:protobuf-java:jar:2.4.1</include> + </includes> + <scope>test</scope> + </dependencySet> </dependencySets> <files> <file> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5bf58243/sandbox/prototype/sqlparser/src/main/java/org/apache/drill/jdbc/DrillHandler.java ---------------------------------------------------------------------- diff --git a/sandbox/prototype/sqlparser/src/main/java/org/apache/drill/jdbc/DrillHandler.java b/sandbox/prototype/sqlparser/src/main/java/org/apache/drill/jdbc/DrillHandler.java index bd88641..7441696 100644 --- a/sandbox/prototype/sqlparser/src/main/java/org/apache/drill/jdbc/DrillHandler.java +++ b/sandbox/prototype/sqlparser/src/main/java/org/apache/drill/jdbc/DrillHandler.java @@ -31,6 +31,7 @@ import com.google.common.base.Preconditions; import com.google.common.io.Resources; public class DrillHandler extends HandlerImpl { + static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillHandler.class); private ClusterCoordinator coordinator; private volatile DrillClient client; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/5bf58243/sandbox/prototype/sqlparser/src/main/resources/storage-engines.json ---------------------------------------------------------------------- diff --git a/sandbox/prototype/sqlparser/src/main/resources/storage-engines.json b/sandbox/prototype/sqlparser/src/main/resources/storage-engines.json index 0dff70c..d1d0413 100644 --- a/sandbox/prototype/sqlparser/src/main/resources/storage-engines.json +++ b/sandbox/prototype/sqlparser/src/main/resources/storage-engines.json @@ -23,7 +23,7 @@ "parquet" : { "type":"parquet", - "dfsName" : "maprfs://10.10.30.52/" + "dfsName" : "file:///" } } } \ No newline at end of file
