You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/03/22 16:30:22 UTC
[ignite] branch ignite-2.7.5 updated: IGNITE-11436 Added module
flags to sqlline.sh and .bat to support JDK 9+ - Fixes #6195.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-2.7.5
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-2.7.5 by this push:
new 88ae866 IGNITE-11436 Added module flags to sqlline.sh and .bat to support JDK 9+ - Fixes #6195.
88ae866 is described below
commit 88ae86677779863d8f25e92a50d6feb833c7ed0f
Author: Stanislav Lukyanov <st...@gmail.com>
AuthorDate: Wed Feb 27 20:21:46 2019 +0300
IGNITE-11436 Added module flags to sqlline.sh and .bat to support JDK 9+ - Fixes #6195.
Signed-off-by: Ilya Kasnacheev <il...@gmail.com>
(cherry picked from commit dcd651e39dadd9c142bf93c9b4477fdb98f1f477)
---
modules/sqlline/bin/sqlline.bat | 51 ++++++++++++++++++++++++++++++++++-------
modules/sqlline/bin/sqlline.sh | 39 ++++++++++++++++++++++++++++++-
2 files changed, 81 insertions(+), 9 deletions(-)
diff --git a/modules/sqlline/bin/sqlline.bat b/modules/sqlline/bin/sqlline.bat
index c21ae82..52064b6 100644
--- a/modules/sqlline/bin/sqlline.bat
+++ b/modules/sqlline/bin/sqlline.bat
@@ -42,13 +42,12 @@ if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion
goto error_finish
:checkJdkVersion
-"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"version .9\..*" /c:"version .1\.8\..*" > nul
-if %ERRORLEVEL% equ 0 goto checkIgniteHome1
- echo %0, ERROR:
- echo The version of JAVA installed in %JAVA_HOME% is incorrect.
- echo Please point JAVA_HOME variable to installation of JDK 1.8 or later.
- echo You can also download latest JDK at http://java.com/download.
-goto error_finish
+set cmd="%JAVA_HOME%\bin\java.exe"
+for /f "tokens=* USEBACKQ" %%f in (`%cmd% -version 2^>^&1`) do (
+ set var=%%f
+ goto :LoopEscape
+)
+:LoopEscape
:: Check IGNITE_HOME.
:checkIgniteHome1
@@ -103,9 +102,45 @@ if "%OS%" == "Windows_NT" set PROG_NAME=%~nx0%
::
call "%SCRIPTS_HOME%\include\setenv.bat"
+for /f "tokens=1-3 delims= " %%a in ("%var%") do set JAVA_VER_STR=%%c
+set JAVA_VER_STR=%JAVA_VER_STR:"=%
+
+for /f "tokens=1,2 delims=." %%a in ("%JAVA_VER_STR%.x") do set MAJOR_JAVA_VER=%%a& set MINOR_JAVA_VER=%%b
+
+if %MAJOR_JAVA_VER% == 8 (
+ set JVM_OPTS= ^
+ -XX:+AggressiveOpts ^
+ %JVM_OPTS%
+)
+
+if %MAJOR_JAVA_VER% GEQ 9 if %MAJOR_JAVA_VER% LSS 11 (
+ set JVM_OPTS= ^
+ -XX:+AggressiveOpts ^
+ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ^
+ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED ^
+ --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED ^
+ --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED ^
+ --add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED ^
+ --illegal-access=permit ^
+ --add-modules=java.transaction ^
+ --add-modules=java.xml.bind ^
+ %JVM_OPTS%
+)
+
+if %MAJOR_JAVA_VER% == 11 (
+ set JVM_OPTS= ^
+ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED ^
+ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED ^
+ --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED ^
+ --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED ^
+ --add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED ^
+ --illegal-access=permit ^
+ %JVM_OPTS%
+)
+
set CP=%IGNITE_LIBS%
set CP=%CP%;%IGNITE_HOME%\bin\include\sqlline\*
-"%JAVA_HOME%\bin\java.exe" -cp "%CP%" sqlline.SqlLine -d org.apache.ignite.IgniteJdbcThinDriver %*
+"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% -cp "%CP%" sqlline.SqlLine -d org.apache.ignite.IgniteJdbcThinDriver %*
:error_finish
\ No newline at end of file
diff --git a/modules/sqlline/bin/sqlline.sh b/modules/sqlline/bin/sqlline.sh
index bfe1475..02fed75 100644
--- a/modules/sqlline/bin/sqlline.sh
+++ b/modules/sqlline/bin/sqlline.sh
@@ -56,10 +56,47 @@ setIgniteHome
#
. "${SCRIPTS_HOME}"/include/setenv.sh
+JVM_OPTS=${JVM_OPTS:-}
+
+#
+# Final JVM_OPTS for Java 9+ compatibility
+#
+javaMajorVersion "${JAVA_HOME}/bin/java"
+
+if [ $version -eq 8 ] ; then
+ JVM_OPTS="\
+ -XX:+AggressiveOpts \
+ ${JVM_OPTS}"
+
+elif [ $version -gt 8 ] && [ $version -lt 11 ]; then
+ JVM_OPTS="\
+ -XX:+AggressiveOpts \
+ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
+ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
+ --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
+ --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
+ --add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
+ --illegal-access=permit \
+ --add-modules=java.transaction \
+ --add-modules=java.xml.bind \
+ ${JVM_OPTS}"
+
+elif [ $version -eq 11 ] ; then
+ JVM_OPTS="\
+ --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED \
+ --add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
+ --add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED \
+ --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED \
+ --add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED \
+ --illegal-access=permit \
+ ${JVM_OPTS}"
+fi
+
+
JDBCLINK="jdbc:ignite:thin://${HOST_AND_PORT:-}${SCHEMA_DELIMITER:-}${SCHEMA:-}${PARAMS:-}"
CP="${IGNITE_LIBS}"
CP="${CP}${SEP}${IGNITE_HOME_TMP}/bin/include/sqlline/*"
-"$JAVA" -cp ${CP} sqlline.SqlLine -d org.apache.ignite.IgniteJdbcThinDriver $@
+"$JAVA" ${JVM_OPTS} -cp ${CP} sqlline.SqlLine -d org.apache.ignite.IgniteJdbcThinDriver $@