Skip to content

Commit

Permalink
Merge branch 'master-up' into IGNITE-7090-1
Browse files Browse the repository at this point in the history 
* master-up: (224 commits)
  ignite-7989 returned cutted ConcurrentHashMap8 for backward compatibility - Fixes apache#3663.
  master Web Console: Fixed broken links.
  IGNITE-7864 Control utility: Added confirm on dangerous operations.
  IGNITE-7887: Adopt SVM Linear Multi-Class Classification Model and Trainer to the new Partitioned Dataset.
  IGNITE-7984: SQL: improved deadlock handling in DML. This closes apache#3655.
  IGNITE-7888: Implemented login timeout for ODBC.
  IGNITE-7976: Fixed SQL schema normalization. This closes apache#3650.
  Added new test to suite
  IGNITE-7794 - Share persisted marshaller mappings when connecting - Fixes apache#3620.
  Update docs
  IGNITE-7816: Fixing Spark examples tests. - Fixes apache#3590.
  IGNITE-7916: GA Grid examples should be ready for auto run on TeamCity
  IGNITE-7811: Implemented connection failover for ODBC
  IGNITE-7029: JDBC thin driver now supports multiple IP addresses with transparent failover. This closes apache#3585.
  IGNITE-7863: Spark dependencies cleaned up. - Fixes apache#3648.
  IGNITE-7964 rmvId is stored to MetaStorage metapage during operations - Fixes apache#3645.
  IGNITE-7932: Add SVM example
  .NET: Fix IgniteUuid type id (broken by IGNITE-7756 changes)
  IGNITE:7862: flatten plugin updated to version 1.0.1
  IGNITE-7879: Fixed splitter logic for DISTINCT with subqueries. This closes apache#3634.
  ...
  • Loading branch information
Tim Onyschak authored and Tim Onyschak committed Mar 21, 2018
2 parents 1937aeb + ffbc56e commit b9d792d
Show file tree
Hide file tree
Showing 1,211 changed files with 63,103 additions and 16,963 deletions.
7 changes: 3 additions & 4 deletions bin/control.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion
goto error_finish

:checkJdkVersion
"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" /c:"java version .1\.8\..*" > nul
"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"version .9\..*" /c:"java version .1\.8\..*" > nul
if %ERRORLEVEL% equ 0 goto checkIgniteHome1
echo %0, ERROR:
echo The version of JAVA installed in %JAVA_HOME% is incorrect.
Expand Down Expand Up @@ -159,8 +159,7 @@ if %ERRORLEVEL% equ 0 (
::
:: Uncomment the following GC settings if you see spikes in your throughput due to Garbage Collection.
::
:: set JVM_OPTS=%JVM_OPTS% -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseTLAB -XX:NewSize=128m -XX:MaxNewSize=128m
:: set JVM_OPTS=%JVM_OPTS% -XX:MaxTenuringThreshold=0 -XX:SurvivorRatio=1024 -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=60
:: set JVM_OPTS=%JVM_OPTS% -XX:+UseG1GC

::
:: Uncomment if you get StackOverflowError.
Expand Down Expand Up @@ -201,7 +200,7 @@ if "%MAIN_CLASS%" == "" set MAIN_CLASS=org.apache.ignite.internal.commandline.Co
::
:: Final JVM_OPTS for Java 9 compatibility
::
"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" > nul && 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-modules java.xml.bind %JVM_OPTS%
"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"version .9\..*" > nul && 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-modules java.xml.bind %JVM_OPTS%

if "%INTERACTIVE%" == "1" (
"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% %QUIET% %RESTART_SUCCESS_OPT% %JMX_MON% ^
Expand Down
3 changes: 1 addition & 2 deletions bin/control.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ fi
#
# Uncomment the following GC settings if you see spikes in your throughput due to Garbage Collection.
#
# JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseTLAB -XX:NewSize=128m -XX:MaxNewSize=128m"
# JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=0 -XX:SurvivorRatio=1024 -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=60"
# JVM_OPTS="$JVM_OPTS -XX:+UseG1GC"

#
# Uncomment if you get StackOverflowError.
Expand Down
15 changes: 7 additions & 8 deletions bin/ignite.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion
goto error_finish

:checkJdkVersion
"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" /c:"java version .1\.8\..*" > nul
"%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.
Expand Down Expand Up @@ -98,7 +98,6 @@ set PROG_NAME=ignite.bat
if "%OS%" == "Windows_NT" set PROG_NAME=%~nx0%

:run

::
:: Set IGNITE_LIBS
::
Expand All @@ -119,8 +118,8 @@ if %ERRORLEVEL% neq 0 (
::
:: Process 'restart'.
::
set RANDOM_NUMBER_COMMAND="!JAVA_HOME!\bin\java.exe" -cp %CP% org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator
for /f "usebackq tokens=*" %%i in (`!RANDOM_NUMBER_COMMAND!`) do set RANDOM_NUMBER=%%i
set RANDOM_NUMBER_COMMAND="!JAVA_HOME!\bin\java.exe" -cp "%CP%" org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator
for /f "usebackq tokens=*" %%i in (`"!RANDOM_NUMBER_COMMAND!"`) do set RANDOM_NUMBER=%%i

set RESTART_SUCCESS_FILE="%IGNITE_HOME%\work\ignite_success_%RANDOM_NUMBER%"
set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
Expand All @@ -133,7 +132,8 @@ set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE%
:: This is executed if -nojmx is not specified
::
if not "%NO_JMX%" == "1" (
for /F "usebackq tokens=*" %%A in (`"!JAVA_HOME!\bin\java.exe -cp %CP% org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"`) do (
set JMX_PORT="!JAVA_HOME!\bin\java.exe" -cp "%CP%" org.apache.ignite.internal.util.portscanner.GridJmxPortFinder
for /f "usebackq tokens=*" %%A in (`"!JMX_PORT!"`) do (
set JMX_PORT=%%A
)
)
Expand Down Expand Up @@ -169,8 +169,7 @@ if %ERRORLEVEL% equ 0 (
::
:: Uncomment the following GC settings if you see spikes in your throughput due to Garbage Collection.
::
:: set JVM_OPTS=%JVM_OPTS% -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseTLAB -XX:NewSize=128m -XX:MaxNewSize=128m
:: set JVM_OPTS=%JVM_OPTS% -XX:MaxTenuringThreshold=0 -XX:SurvivorRatio=1024 -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=60
:: set JVM_OPTS=%JVM_OPTS% -XX:+UseG1GC

::
:: Uncomment if you get StackOverflowError.
Expand Down Expand Up @@ -216,7 +215,7 @@ if "%MAIN_CLASS%" == "" set MAIN_CLASS=org.apache.ignite.startup.cmdline.Command
::
:: Final JVM_OPTS for Java 9 compatibility
::
"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" > nul && 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-modules java.xml.bind %JVM_OPTS%
"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"version .9\..*" > nul && 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-modules java.xml.bind %JVM_OPTS%

if "%INTERACTIVE%" == "1" (
"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% %QUIET% %RESTART_SUCCESS_OPT% %JMX_MON% ^
Expand Down
3 changes: 1 addition & 2 deletions bin/ignite.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ fi
#
# Uncomment the following GC settings if you see spikes in your throughput due to Garbage Collection.
#
# JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseTLAB -XX:NewSize=128m -XX:MaxNewSize=128m"
# JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=0 -XX:SurvivorRatio=1024 -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=60"
# JVM_OPTS="$JVM_OPTS -XX:+UseG1GC"

#
# Uncomment if you get StackOverflowError.
Expand Down
4 changes: 2 additions & 2 deletions bin/ignitevisorcmd.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion
goto error_finish

:checkJdkVersion
"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" /c:"java version .1\.8\..*" > nul
"%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.
Expand Down Expand Up @@ -144,7 +144,7 @@ if "%ARGS%" == "" set ARGS=%*
::
:: Final JVM_OPTS for Java 9 compatibility
::
"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"java version .9\..*" > nul && set JVM_OPTS_VISOR=--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-modules java.xml.bind %JVM_OPTS%
"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr /R /c:"version .9\..*" > nul && set JVM_OPTS_VISOR=--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-modules java.xml.bind %JVM_OPTS%

::
:: Starts Visor console.
Expand Down
13 changes: 6 additions & 7 deletions bin/include/build-classpath.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,19 @@

for /D %%F in (modules\*) do if not %%F == "modules" call :includeToClassPath %%F

for /D %%F in (%IGNITE_HOME%\modules\*) do if not %%F == "%IGNITE_HOME%\modules" call :includeToClassPath %%F

for /F %%F in ('dir /A:D /b "%IGNITE_HOME%\modules\*" /b') do call :includeToClassPath "%IGNITE_HOME%\modules\%%F"
goto :eof

:includeToClassPath
if exist "%1\target\" (
if exist "%1\target\classes\" call :concat %1\target\classes
if exist "%~1\target\" (
if exist "%~1\target\classes\" call :concat "%~1\target\classes"

if exist "%1\target\test-classes\" call :concat %1\target\test-classes
if exist "%~1\target\test-classes\" call :concat "%~1\target\test-classes"

if exist "%1\target\libs\" call :concat %1\target\libs\*
if exist "%~1\target\libs\" call :concat "%~1\target\libs\*"
)
goto :eof

:concat
set IGNITE_LIBS=%IGNITE_LIBS%;%1
set IGNITE_LIBS=%IGNITE_LIBS%;%~1
goto :eof
7 changes: 6 additions & 1 deletion bin/include/build-classpath.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ case "`uname`" in
esac

includeToClassPath() {
SAVEIFS=$IFS
IFS=$(echo -en "\n\b")

for file in $1/*
do
if [ -d ${file} ] && [ -d "${file}/target" ]; then
Expand All @@ -58,6 +61,8 @@ includeToClassPath() {
fi
fi
done

IFS=$SAVEIFS
}

#
Expand All @@ -68,4 +73,4 @@ includeToClassPath modules
#
# Include target libraries for opensourse modules to classpath.
#
includeToClassPath ${IGNITE_HOME}/modules
includeToClassPath "${IGNITE_HOME}"/modules
2 changes: 1 addition & 1 deletion bin/include/functions.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ checkJava() {
exit 1
fi

"$JAVA" -version 2>&1 | grep -qE 'java version "(1.8.*|9.*)"' || {
"$JAVA" -version 2>&1 | grep -qE 'version "(1.8.*|9.*)"' || {
echo "$0, ERROR:"
echo "The version of JAVA installed in JAVA_HOME=$JAVA_HOME is incorrect."
echo "Please point JAVA_HOME variable to installation of JDK 1.8 or JDK 9."
Expand Down
5 changes: 3 additions & 2 deletions bin/include/parseargs.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@
:: )
:: in other scripts to parse common command lines parameters.

set convertArgsCmd=!JAVA_HOME!\bin\java.exe -Dfile.encoding=IBM866 -cp %CP% org.apache.ignite.startup.cmdline.CommandLineTransformer %*
for /f "usebackq tokens=*" %%i in (`!convertArgsCmd!`) do set reformattedArgs=%%i
set convertArgsCmd="!JAVA_HOME!\bin\java.exe" -cp "%CP%" org.apache.ignite.startup.cmdline.CommandLineTransformer %*

for /f "usebackq tokens=*" %%i in (`"!convertArgsCmd!"`) do set reformattedArgs=%%i

for %%i in (%reformattedArgs%) do (
if "%%i" == "CommandLineTransformerError" exit /b 1
Expand Down
8 changes: 6 additions & 2 deletions bin/include/setenv.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,16 @@ goto :eof
:: The following libraries are required for Ignite.
set IGNITE_LIBS=%IGNITE_HOME%\libs\*

for /D %%F in (%IGNITE_HOME%\libs\*) do if not "%%F" == "%IGNITE_HOME%\libs\optional" call :concat %%F\*
if not exist "%IGNITE_LIBS%" goto :eof

for /F %%F in ('dir /A:D /b "%IGNITE_LIBS%"') do (
if not "%%F" == "optional" call :concat "%IGNITE_HOME%\libs\%%F\*"
)

if defined USER_LIBS set IGNITE_LIBS=%USER_LIBS%;%IGNITE_LIBS%

goto :eof

:concat
set IGNITE_LIBS=%IGNITE_LIBS%;%1
set IGNITE_LIBS=%IGNITE_LIBS%;%~1
goto :eof
5 changes: 5 additions & 0 deletions bin/include/setenv.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,18 @@ esac
#
IGNITE_LIBS="${IGNITE_HOME}/libs/*"

SAVEIFS=$IFS
IFS=$(echo -en "\n\b")

for file in ${IGNITE_HOME}/libs/*
do
if [ -d ${file} ] && [ "${file}" != "${IGNITE_HOME}"/libs/optional ]; then
IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/*
fi
done

IFS=$SAVEIFS

if [ "${USER_LIBS}" != "" ]; then
IGNITE_LIBS=${USER_LIBS}${SEP}${IGNITE_LIBS}
fi
2 changes: 1 addition & 1 deletion config/ignite-log4j2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
limitations under the License.
-->

<Configuration>
<Configuration monitorInterval="60">
<Appenders>
<Console name="CONSOLE" target="SYSTEM_OUT">
<PatternLayout pattern="[%d{ISO8601}][%-5p][%t][%c{1}]%notEmpty{[%markerSimpleName]} %m%n"/>
Expand Down
9 changes: 6 additions & 3 deletions examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -61,6 +59,11 @@
<artifactId>ignite-indexing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-ml</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.ignite</groupId>
Expand Down Expand Up @@ -295,4 +298,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
99 changes: 0 additions & 99 deletions ...les/src/main/java/org/apache/ignite/examples/computegrid/cluster/ClusterGroupExample.java
View file

This file was deleted.

0 comments on commit b9d792d

Please sign in to comment.