Skip to content
Permalink
Browse files
DRILL-6540: Updated Hadoop and HBase libraries to the latest versions
Hadoop: 3.2.1
HBase: 2.2.2

closes #1895
  • Loading branch information
agozhiy authored and vvysotskyi committed Dec 4, 2019
1 parent f3e32c3 commit db6488238a912fefb5cc5d9e83f5575df51a74e9
Show file tree
Hide file tree
Showing 49 changed files with 269 additions and 177 deletions.
@@ -135,14 +135,29 @@ private static void patchPreconditions() {
+ " throw new IllegalArgumentException(format(errorMessageTemplate, new Object[] { new Integer(arg1) }));\n"
+ " }\n"
+ " }",
"public static void checkArgument(boolean expression, String errorMessageTemplate, long arg1) {\n"
+ " if (!expression) {\n"
+ " throw new IllegalArgumentException(format(errorMessageTemplate, new Object[] { new Long(arg1) }));\n"
+ " }\n"
+ " }",
"public static void checkArgument(boolean expression, String errorMessageTemplate, long arg1, long arg2) {\n"
+ " if (!expression) {\n"
+ " throw new IllegalArgumentException(format(errorMessageTemplate, new Object[] { new Long(arg1), new Long(arg2)}));\n"
+ " }\n"
+ " }",
"public static Object checkNotNull(Object reference, String errorMessageTemplate, int arg1) {\n"
+ " if (reference == null) {\n"
+ " throw new NullPointerException(format(errorMessageTemplate, new Object[] { new Integer(arg1) }));\n"
+ " } else {\n"
+ " return reference;\n"
+ " }\n"
+ " }",
"public static void checkState(boolean expression, String errorMessageTemplate, int arg1) {\n"
+ " if (!expression) {\n"
+ " throw new IllegalStateException(format(errorMessageTemplate, new Object[] { new Integer(arg1) }));\n"
+ " }\n"
+ " }"
);
);

List<String> newMethods = IntStream.rangeClosed(startIndex, endIndex)
.mapToObj(
@@ -335,15 +335,30 @@
<name>!alt-hadoop</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-winutils</artifactId>
<version>2.7.1</version>
<type>zip</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-winutils</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/winutils</outputDirectory>
<resources>
<resource>
<directory>src/main/resources/winutils</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
@@ -360,12 +375,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-winutils</artifactId>
<version>2.7.0-mapr-1506</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
@@ -392,6 +401,44 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-winutils</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>unpack-winutils</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>process-resources</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-winutils</artifactId>
<version>2.7.0-mapr-1506</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/winutils</outputDirectory>
<excludes>**/*.pdb,**/*.lib,**/*.exp</excludes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
@@ -494,7 +541,7 @@
<directory>/etc/init.d/</directory>
<sources>
<source>
<location>src/resources/drillbit</location>
<location>src/main/resources/drillbit</location>
</source>
</sources>
<directoryIncluded>false</directoryIncluded>
@@ -599,7 +646,7 @@
</mapper>
</data>
<data>
<src>src/resources/drillbit</src>
<src>src/main/resources/drillbit</src>
<dst>/etc/init.d/drillbit</dst>
<type>file</type>
<mapper>
@@ -196,28 +196,17 @@
</includes>
<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>
<fileSet>
<directory>../sample-data</directory>
<outputDirectory>sample-data</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}/winutils</directory>
<outputDirectory>winutils/bin</outputDirectory>
</fileSet>
</fileSets>

<files>
@@ -226,11 +215,11 @@
<outputDirectory />
</file>
<file>
<source>src/resources/LICENSE</source>
<source>src/main/resources/LICENSE</source>
<outputDirectory />
</file>
<file>
<source>src/resources/README.md</source>
<source>src/main/resources/README.md</source>
<outputDirectory />
</file>
<file>
@@ -242,146 +231,146 @@
<outputDirectory />
</file>
<file>
<source>src/resources/runbit</source>
<source>src/main/resources/runbit</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/hadoop-excludes.txt</source>
<source>src/main/resources/hadoop-excludes.txt</source>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/drillbit.sh</source>
<source>src/main/resources/drillbit.sh</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/drill-conf</source>
<source>src/main/resources/drill-conf</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/drill-embedded</source>
<source>src/main/resources/drill-embedded</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/drill-embedded.bat</source>
<source>src/main/resources/drill-embedded.bat</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/drill-localhost</source>
<source>src/main/resources/drill-localhost</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/drill-config.sh</source>
<source>src/main/resources/drill-config.sh</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/sqlline</source>
<source>src/main/resources/sqlline</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/sqlline.bat</source>
<source>src/main/resources/sqlline.bat</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/drill-on-yarn.sh</source>
<source>src/main/resources/drill-on-yarn.sh</source>
<fileMode>0750</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/drill-am.sh</source>
<source>src/main/resources/drill-am.sh</source>
<fileMode>0750</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/yarn-drillbit.sh</source>
<source>src/main/resources/yarn-drillbit.sh</source>
<fileMode>0750</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/submit_plan</source>
<source>src/main/resources/submit_plan</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/drill-override.conf</source>
<source>src/main/resources/drill-override.conf</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0640</fileMode>
</file>
<file>
<source>src/resources/logback.xml</source>
<source>src/main/resources/logback.xml</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0640</fileMode>
</file>
<file>
<source>src/resources/yarn-client-log.xml</source>
<source>src/main/resources/yarn-client-log.xml</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0640</fileMode>
</file>
<file>
<source>src/resources/drill-am-log.xml</source>
<source>src/main/resources/drill-am-log.xml</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0640</fileMode>
</file>
<file>
<source>src/resources/drill-env.sh</source>
<source>src/main/resources/drill-env.sh</source>
<fileMode>0750</fileMode>
<outputDirectory>conf</outputDirectory>
</file>
<file>
<source>src/resources/distrib-env.sh</source>
<source>src/main/resources/distrib-env.sh</source>
<fileMode>0750</fileMode>
<outputDirectory>conf</outputDirectory>
</file>
<file>
<source>src/resources/auto-setup.sh</source>
<source>src/main/resources/auto-setup.sh</source>
<fileMode>0755</fileMode>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>src/resources/drill-setup.sh</source>
<source>src/main/resources/drill-setup.sh</source>
<fileMode>0750</fileMode>
<outputDirectory>conf</outputDirectory>
</file>
<file>
<source>src/resources/distrib-setup.sh</source>
<source>src/main/resources/distrib-setup.sh</source>
<fileMode>0750</fileMode>
<outputDirectory>conf</outputDirectory>
</file>
<file>
<source>src/resources/drill-override-example.conf</source>
<source>src/main/resources/drill-override-example.conf</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0640</fileMode>
</file>
<file>
<source>src/resources/core-site-example.xml</source>
<source>src/main/resources/core-site-example.xml</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0640</fileMode>
</file>
<file>
<source>src/resources/saffron.properties</source>
<source>src/main/resources/saffron.properties</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0640</fileMode>
</file>
<file>
<source>src/resources/drill-on-yarn-example.conf</source>
<source>src/main/resources/drill-on-yarn-example.conf</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0640</fileMode>
</file>
<file>
<source>src/resources/storage-plugins-override-example.conf</source>
<source>src/main/resources/storage-plugins-override-example.conf</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0640</fileMode>
</file>
<file>
<source>src/resources/drill-sqlline-override-example.conf</source>
<source>src/main/resources/drill-sqlline-override-example.conf</source>
<outputDirectory>conf</outputDirectory>
<fileMode>0640</fileMode>
</file>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -27,14 +27,14 @@
and from there into the YARN-provided output log directory.
-->
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
</pattern>
</encoder>
</appender>

<logger name="org.apache.drill" additivity="false">
<level value="info" />
<appender-ref ref="STDOUT" />
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit db64882

Please sign in to comment.