This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new f4e07d2 DRILL-8144: Cannot launch Drill 1.20 RC 4 on Windows (#2470)
f4e07d2 is described below
commit f4e07d23e3a6a944ed0a5eb9dd55987cafaa0a01
Author: James Turton <[email protected]>
AuthorDate: Tue Feb 22 19:33:51 2022 +0200
DRILL-8144: Cannot launch Drill 1.20 RC 4 on Windows (#2470)
---
distribution/src/main/resources/sqlline.bat | 4 +-
.../src/main/resources/winutils/hadoop.dll | Bin 85504 -> 96256 bytes
.../src/main/resources/winutils/winutils.exe | Bin 112640 -> 118784 bytes
docs/dev/HadoopWinutils.md | 4 +-
exec/java-exec/pom.xml | 42 ++++-----------------
exec/jdbc-all/pom.xml | 4 --
pom.xml | 1 -
7 files changed, 12 insertions(+), 43 deletions(-)
diff --git a/distribution/src/main/resources/sqlline.bat
b/distribution/src/main/resources/sqlline.bat
index ac819bd..9c1c9ac 100644
--- a/distribution/src/main/resources/sqlline.bat
+++ b/distribution/src/main/resources/sqlline.bat
@@ -203,11 +203,11 @@ if errorlevel 1 (
rem allow reflective access on Java 9+
set DRILL_SHELL_JAVA_OPTS=!DRILL_SHELL_JAVA_OPTS! ^
--add-opens java.base/java.lang=ALL-UNNAMED ^
- --add-opens=java.base/java.util=ALL-UNNAMED ^
+ --add-opens java.base/java.util=ALL-UNNAMED ^
--add-opens java.base/sun.nio.ch=ALL-UNNAMED ^
--add-opens java.base/java.net=ALL-UNNAMED ^
--add-opens java.base/java.nio=ALL-UNNAMED ^
- --add-opens java.security.jgss/sun.security.krb5=ALL-UNNAMED ^
+ --add-opens java.security.jgss/sun.security.krb5=ALL-UNNAMED
)
set SQLLINE_CALL=sqlline.SqlLine -ac
org.apache.drill.exec.client.DrillSqlLineApplication
diff --git a/distribution/src/main/resources/winutils/hadoop.dll
b/distribution/src/main/resources/winutils/hadoop.dll
index e7ffeac..441d3ed 100644
Binary files a/distribution/src/main/resources/winutils/hadoop.dll and
b/distribution/src/main/resources/winutils/hadoop.dll differ
diff --git a/distribution/src/main/resources/winutils/winutils.exe
b/distribution/src/main/resources/winutils/winutils.exe
index 027ca13..75be699 100644
Binary files a/distribution/src/main/resources/winutils/winutils.exe and
b/distribution/src/main/resources/winutils/winutils.exe differ
diff --git a/docs/dev/HadoopWinutils.md b/docs/dev/HadoopWinutils.md
index 7b5b2bc..a9ead27 100644
--- a/docs/dev/HadoopWinutils.md
+++ b/docs/dev/HadoopWinutils.md
@@ -3,9 +3,9 @@
Hadoop Winutils native libraries are required to run Drill on Windows. The
last version present in maven repository is 2.7.1 and is not updated anymore.
That's why Winutils version matching Hadoop version used in Drill is located
in distribution/src/main/resources.
-Current Winutils version: *3.2.1.*
+Current Winutils version: *3.2.2.*
## References
- Official wiki: [Windows
Problems](https://cwiki.apache.org/confluence/display/HADOOP2/WindowsProblems).
- Winutils compiling process is described
[here](https://github.com/steveloughran/winutils).
-- Actual versions are being uploaded
[here](https://github.com/cdarlint/winutils)
\ No newline at end of file
+- Actual versions are being uploaded
[here](https://github.com/cdarlint/winutils)
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index be68121..c1f11a5 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -652,6 +652,14 @@
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.github.rdblue</groupId>
+ <artifactId>brotli-codec</artifactId>
+ <version>0.1.1</version>
+ <!-- brotli-codec bundles natives for linux and darwin, amd64 only so
+ we don't ship it so as not to break startup on windows or arm -->
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -761,40 +769,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <!-- Only package a Brotli codec for Linux and Mac OS X on AMD64, see
PARQUET-1975 -->
- <id>non-win-amd64</id>
- <activation>
- <os>
- <arch>amd64</arch>
- <name>!Windows</name>
- </os>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.github.rdblue</groupId>
- <artifactId>brotli-codec</artifactId>
- <version>${brotli-codec.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <!-- A duplicate of the profile above to handle os.arch=x86_64 reported
on Macs -->
- <id>non-win-x86_64</id>
- <activation>
- <os>
- <arch>x86_64</arch>
- <name>!Windows</name>
- </os>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.github.rdblue</groupId>
- <artifactId>brotli-codec</artifactId>
- <version>${brotli-codec.version}</version>
- </dependency>
- </dependencies>
- </profile>
</profiles>
<build>
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 43b00c8..96d17dc 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -197,10 +197,6 @@
<groupId>io.airlift</groupId>
<artifactId>aircompresssor</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.github.rdblue</groupId>
- <artifactId>brotli-codec</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index f2f4fad..74ea914 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,6 @@
<commons.beanutils.version>1.9.4</commons.beanutils.version>
<httpdlog-parser.version>5.7</httpdlog-parser.version>
<yauaa.version>5.20</yauaa.version>
- <brotli-codec.version>0.1.1</brotli-codec.version>
<aircompressor.version>0.20</aircompressor.version>
<iceberg.version>0.12.1</iceberg.version>
<univocity-parsers.version>2.8.3</univocity-parsers.version>
