ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [2/6] ignite git commit: IGNITE-3868: ODBC: Fix for driver installation. This closes #1051.
Date Tue, 13 Sep 2016 12:45:27 GMT
IGNITE-3868: ODBC: Fix for driver installation. This closes #1051.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b595991f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b595991f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b595991f

Branch: refs/heads/ignite-3887
Commit: b595991fbc8eeef4bf7f8bf1e4e096c6c1f88488
Parents: b5121ad
Author: Igor Sapego <isapego@gridgain.com>
Authored: Fri Sep 9 12:13:26 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Sep 9 12:13:26 2016 +0300

----------------------------------------------------------------------
 .../cache/GridCacheAbstractFullApiSelfTest.java |  2 +-
 .../cpp/odbc/install/ignite-odbc-install.ini    |  1 +
 .../cpp/odbc/install/install_amd64.cmd          | 22 +++++++++++---------
 .../platforms/cpp/odbc/install/install_x86.cmd  | 11 +++++-----
 4 files changed, 20 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b595991f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 3f4d812..a31c82e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -296,7 +296,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
         for (int i = 0; i < gridCount(); i++) {
             Boolean clientMode = grid(i).configuration().isClientMode();
 
-            if (clientMode)
+            if (clientMode != null && clientMode) // Can be null in multi jvm tests.
                 continue;
 
             grid(0).services(grid(0).cluster()).deployNodeSingleton(SERVICE_NAME1, new DummyServiceImpl());

http://git-wip-us.apache.org/repos/asf/ignite/blob/b595991f/modules/platforms/cpp/odbc/install/ignite-odbc-install.ini
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/install/ignite-odbc-install.ini b/modules/platforms/cpp/odbc/install/ignite-odbc-install.ini
index 2de265a..f512fb4 100644
--- a/modules/platforms/cpp/odbc/install/ignite-odbc-install.ini
+++ b/modules/platforms/cpp/odbc/install/ignite-odbc-install.ini
@@ -1,5 +1,6 @@
 [Apache Ignite]
 Description=Apache Ignite
 Driver=/usr/local/lib/libignite-odbc.so
+Setup=/usr/local/lib/libignite-odbc.so
 DriverODBCVer=03.00
 FileUsage=0
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/b595991f/modules/platforms/cpp/odbc/install/install_amd64.cmd
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/install/install_amd64.cmd b/modules/platforms/cpp/odbc/install/install_amd64.cmd
index 8a0391f..3b4b63f 100644
--- a/modules/platforms/cpp/odbc/install/install_amd64.cmd
+++ b/modules/platforms/cpp/odbc/install/install_amd64.cmd
@@ -7,17 +7,18 @@ if [%ODBC_AMD64%] == [] (
 	echo error: 64-bit driver is not specified. Call format: install_amd64 abs_path_to_64_bit_driver
[abs_path_to_32_bit_driver]
 	pause
 	exit /b 1
-) else if exist "%ODBC_AMD64%" (
-	if exist "%ODBC_AMD64%\" (
+) else if exist %ODBC_AMD64% (
+	if exist %ODBC_AMD64%\ (
 		echo warning: The path you have specified seems to be a directory. Note that you have to
specify path to driver file itself instead.
 	)
-	echo Installing 64-bit driver: "%ODBC_AMD64%"
+	echo Installing 64-bit driver: %ODBC_AMD64%
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v DriverODBCVer /t
REG_SZ /d "03.80" /f
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v UsageCount /t REG_DWORD
/d 00000001 /f
-	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v Driver /t REG_SZ
/d "%ODBC_AMD64%" /f
+	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v Driver /t REG_SZ
/d %ODBC_AMD64% /f
+	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v Setup /t REG_SZ
/d %ODBC_AMD64% /f
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" /v "Apache Ignite"
/t REG_SZ /d "Installed" /f    
 ) else (
-	echo 64-bit driver can not be found: "%ODBC_AMD64%"
+	echo 64-bit driver can not be found: %ODBC_AMD64%
 	echo Call format: install_amd64 abs_path_to_64_bit_driver [abs_path_to_32_bit_driver]
 	pause
 	exit /b 1
@@ -25,16 +26,17 @@ if [%ODBC_AMD64%] == [] (
 
 if [%ODBC_X86%] == [] (
 	echo warning: 32-bit driver is not specified. If you want to install 32-bit driver please
specify path to it as a second argument.
-) else if exist "%ODBC_X86%" (
-	if exist "%ODBC_X86%\" (
+) else if exist %ODBC_X86% (
+	if exist %ODBC_X86%\ (
 		echo warning: The path you have specified seems to be a directory. Note that you have to
specify path to driver file itself instead.
 	)
-	echo Installing 32-bit driver: "%ODBC_X86%"
+	echo Installing 32-bit driver: %ODBC_X86%
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\ODBC\ODBCINST.INI\Apache Ignite" /v DriverODBCVer
/t REG_SZ /d "03.80" /f
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\ODBC\ODBCINST.INI\Apache Ignite" /v UsageCount
/t REG_DWORD /d 00000001 /f
-	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\ODBC\ODBCINST.INI\Apache Ignite" /v Driver
/t REG_SZ /d "%ODBC_X86%" /f
+	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\ODBC\ODBCINST.INI\Apache Ignite" /v Driver
/t REG_SZ /d %ODBC_X86% /f
+	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\ODBC\ODBCINST.INI\Apache Ignite" /v Setup
/t REG_SZ /d %ODBC_X86% /f
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\ODBC\ODBCINST.INI\ODBC Drivers" /v "Apache
Ignite" /t REG_SZ /d "Installed" /f    
 ) else (
-	echo warning: 32-bit driver can not be found: "%ODBC_X86%"
+	echo warning: 32-bit driver can not be found: %ODBC_X86%
 )
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b595991f/modules/platforms/cpp/odbc/install/install_x86.cmd
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/install/install_x86.cmd b/modules/platforms/cpp/odbc/install/install_x86.cmd
index 74eea0a..93ced4b 100644
--- a/modules/platforms/cpp/odbc/install/install_x86.cmd
+++ b/modules/platforms/cpp/odbc/install/install_x86.cmd
@@ -5,17 +5,18 @@ set ODBC=%1
 if [%ODBC%] == [] (
 	echo error: driver is not specified. Call format: install_x86 abs_path_to_driver.
 	pause
-) else if exist "%ODBC%" (
-	if exist "%ODBC%\" (
+) else if exist %ODBC% (
+	if exist %ODBC%\ (
 		echo warning: The path you have specified seems to be a directory. Note that you have to
specify path to driver file itself instead.
 	)
-	echo Installing driver: "%ODBC%"
+	echo Installing driver: %ODBC%
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v DriverODBCVer /t
REG_SZ /d "03.80" /f
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v UsageCount /t REG_DWORD
/d 00000001 /f
-	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v Driver /t REG_SZ
/d "%ODBC%" /f
+	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v Driver /t REG_SZ
/d %ODBC% /f
+	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\Apache Ignite" /v Setup /t REG_SZ
/d %ODBC% /f
 	reg add "HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers" /v "Apache Ignite"
/t REG_SZ /d "Installed" /f    
 ) else (
-	echo Driver can not be found: "%ODBC%"
+	echo Driver can not be found: %ODBC%
 	echo Call format: install_x86 abs_path_to_driver
 	pause
 )


Mime
View raw message