Repository: drill Updated Branches: refs/heads/master 5efc7e686 -> c8d2fe1b8
DRILL-1733 - Include Hadoop winutils in Drill distribution Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/c8d2fe1b Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/c8d2fe1b Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/c8d2fe1b Branch: refs/heads/master Commit: c8d2fe1b8f61884997162560c23661895ce0188f Parents: 5efc7e6 Author: Patrick Wong <pw...@maprtech.com> Authored: Fri Feb 20 16:08:33 2015 -0800 Committer: Parth Chandra <pchan...@maprtech.com> Committed: Mon Feb 23 13:16:05 2015 -0800 ---------------------------------------------------------------------- distribution/pom.xml | 13 ++- distribution/src/assemble/bin.xml | 100 ++++++++++++++---------- distribution/src/resources/drill-config.sh | 4 + distribution/src/resources/sqlline.bat | 1 + 4 files changed, 75 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/c8d2fe1b/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 703a4c4..294cd0a 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -192,6 +192,12 @@ </property> </activation> <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-winutils</artifactId> + <version>2.4.1</version> + <type>zip</type> + </dependency> </dependencies> <build> </build> @@ -212,7 +218,12 @@ <groupId>com.mapr.fs</groupId> <artifactId>mapr-hbase</artifactId> </dependency> - + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-winutils</artifactId> + <version>2.4.1-mapr-1408</version> + <type>zip</type> + </dependency> </dependencies> <build> </build> http://git-wip-us.apache.org/repos/asf/drill/blob/c8d2fe1b/distribution/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml index 8f6e90d..0576fd2 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/bin.xml @@ -44,42 +44,42 @@ <useProjectArtifact>false</useProjectArtifact> <includes> - <include>org.glassfish.jersey.containers</include> - <include>org.glassfish.jersey.core</include> - <include>org.reflections</include> + <include>org.glassfish.jersey.containers</include> + <include>org.glassfish.jersey.core</include> + <include>org.reflections</include> - <include>org.glassfish.hk2.external</include> - <include>org.mortbay.jetty</include> - <include>org.jboss.spec.javax.transaction</include> - <include>javax.activation</include> - <include>javax.annotation</include> - <include>org.glassfish.jersey.containers</include> - <include>org.glassfish.jersey.core</include> - <include>org.glassfish.jersey.ext</include> - <include>org.glassfish.jersey.media</include> - <include>org.glassfish.jersey.bundles.repackaged</include> - <include>org.glassfish.hk2</include> - <include>javax.servlet</include> + <include>org.glassfish.hk2.external</include> + <include>org.mortbay.jetty</include> + <include>org.jboss.spec.javax.transaction</include> + <include>javax.activation</include> + <include>javax.annotation</include> + <include>org.glassfish.jersey.containers</include> + <include>org.glassfish.jersey.core</include> + <include>org.glassfish.jersey.ext</include> + <include>org.glassfish.jersey.media</include> + <include>org.glassfish.jersey.bundles.repackaged</include> + <include>org.glassfish.hk2</include> + <include>javax.servlet</include> - <include>javax.ws.rs </include> - <include>com.sun.xml.bind </include> - <include>com.sun.jersey </include> - <include>org.jvnet.mimepull </include> - <include>com.sun.codemodel </include> - <include>javax.xml.bind</include> + <include>javax.ws.rs </include> + <include>com.sun.xml.bind </include> + <include>com.sun.jersey </include> + <include>org.jvnet.mimepull </include> + <include>com.sun.codemodel </include> + <include>javax.xml.bind</include> - <include>org.jruby</include> - <include>ch.qos.logback </include> - <include>ch.qos.logback</include> - <include>org.eclipse.jdt</include> - <include>com.github.stephenc.high-scale-lib</include> + <include>org.jruby</include> + <include>ch.qos.logback </include> + <include>ch.qos.logback</include> + <include>org.eclipse.jdt</include> + <include>com.github.stephenc.high-scale-lib</include> + + <include>org.jamon</include> - <include>org.jamon</include> - </includes> <scope>test</scope> </dependencySet> - + <dependencySet> <!-- Now, select which projects to include in this module-set. --> <includes> @@ -127,23 +127,23 @@ <!-- exclude or sqlline has problems --> <exclude>hsqldb:hsqldb</exclude> <!-- exclude or sqlline has problems --> - + <exclude>org.glassfish.jersey.containers</exclude> <exclude>org.glassfish.jersey.core</exclude> <exclude>org.reflections</exclude> - <exclude>org.glassfish.hk2.external</exclude> - <exclude>org.mortbay.jetty</exclude> - <exclude>org.jboss.spec.javax.transaction</exclude> - <exclude>javax.activation</exclude> - <exclude>javax.annotation</exclude> - <exclude>org.glassfish.jersey.containers</exclude> - <exclude>org.glassfish.jersey.core</exclude> - <exclude>org.glassfish.jersey.ext</exclude> - <exclude>org.glassfish.jersey.media</exclude> - <exclude>org.glassfish.jersey.bundles.repackaged</exclude> - <exclude>org.glassfish.hk2</exclude> - <exclude>javax.servlet</exclude> + <exclude>org.glassfish.hk2.external</exclude> + <exclude>org.mortbay.jetty</exclude> + <exclude>org.jboss.spec.javax.transaction</exclude> + <exclude>javax.activation</exclude> + <exclude>javax.annotation</exclude> + <exclude>org.glassfish.jersey.containers</exclude> + <exclude>org.glassfish.jersey.core</exclude> + <exclude>org.glassfish.jersey.ext</exclude> + <exclude>org.glassfish.jersey.media</exclude> + <exclude>org.glassfish.jersey.bundles.repackaged</exclude> + <exclude>org.glassfish.hk2</exclude> + <exclude>javax.servlet</exclude> <exclude>javax.ws.rs </exclude> <exclude>com.sun.xml.bind </exclude> @@ -184,6 +184,22 @@ <scope>test</scope> </dependencySet> + <dependencySet> + <outputDirectory>winutils/bin</outputDirectory> + <unpack>true</unpack> + <unpackOptions> + <excludes> + <exclude>**/*.pdb</exclude> + <exclude>**/*.lib</exclude> + <exclude>**/*.exp</exclude> + </excludes> + </unpackOptions> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.apache.hadoop:hadoop-winutils</include> + </includes> + </dependencySet> + </dependencySets> <fileSets> http://git-wip-us.apache.org/repos/asf/drill/blob/c8d2fe1b/distribution/src/resources/drill-config.sh ---------------------------------------------------------------------- diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh index 313c568..210c246 100644 --- a/distribution/src/resources/drill-config.sh +++ b/distribution/src/resources/drill-config.sh @@ -178,9 +178,13 @@ if $is_cygwin; then DRILL_CONF_DIR=`cygpath -w "$DRILL_CONF_DIR"` DRILL_LOG_DIR=`cygpath -w "$DRILL_LOG_DIR"` CP=`cygpath -w -p "$CP"` + if [ -z "$HADOOP_HOME" ]; then + HADOOP_HOME=${DRILL_HOME}/winutils + fi fi # Variables exported form this script +export HADOOP_HOME export is_cygwin export DRILL_HOME export DRILL_CONF_DIR http://git-wip-us.apache.org/repos/asf/drill/blob/c8d2fe1b/distribution/src/resources/sqlline.bat ---------------------------------------------------------------------- diff --git a/distribution/src/resources/sqlline.bat b/distribution/src/resources/sqlline.bat index ca883b5..755526c 100755 --- a/distribution/src/resources/sqlline.bat +++ b/distribution/src/resources/sqlline.bat @@ -121,6 +121,7 @@ rem ---- if "test%HADOOP_HOME%" == "test" ( echo HADOOP_HOME not detected... set USE_HADOOP_CP=0 + set HADOOP_HOME=%DRILL_HOME%\winutils ) else ( echo Calculating HADOOP_CLASSPATH ... for %%i in (%HADOOP_HOME%\lib\*.jar) do (