You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2018/10/09 06:04:04 UTC
[1/2] ignite git commit: IGNITE-9814: Hadoop: fixed native libraries
update routine for Java 11. This closes #4925.
Repository: ignite
Updated Branches:
refs/heads/ignite-2.7 79b0cafb6 -> 321d00ea4
IGNITE-9814: Hadoop: fixed native libraries update routine for Java 11. This closes #4925.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/47a1692e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/47a1692e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/47a1692e
Branch: refs/heads/ignite-2.7
Commit: 47a1692edc7980ef39ad3783c4d56b9996e8cd83
Parents: 79b0caf
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Tue Oct 9 08:56:23 2018 +0300
Committer: devozerov <pp...@gmail.com>
Committed: Tue Oct 9 09:03:44 2018 +0300
----------------------------------------------------------------------
.../processors/hadoop/HadoopClassLoader.java | 37 ++++++++++++++++----
1 file changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/47a1692e/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
index e2995bc..7dfc138 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopClassLoader.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.hadoop;
+import java.util.Collections;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.util.ClassCache;
@@ -176,11 +177,24 @@ public class HadoopClassLoader extends URLClassLoader implements ClassCache {
}
// Link libraries to class loader.
- Vector<Object> ldrLibs = nativeLibraries(this);
+ Object ldrLibsObj = nativeLibraries(this);
- synchronized (ldrLibs) {
- ldrLibs.addAll(res);
+ if (ldrLibsObj instanceof Vector) {
+ Vector<Object> ldrLibs = (Vector<Object>)ldrLibsObj;
+
+ synchronized (ldrLibs) {
+ ldrLibs.addAll(res);
+ }
+ }
+ else if (ldrLibsObj instanceof ConcurrentHashMap) {
+ ConcurrentHashMap<Object, Object> ldrLibs = (ConcurrentHashMap<Object, Object>)ldrLibsObj;
+
+ synchronized (ldrLibs) {
+ for (Object nl : res)
+ ldrLibs.put(nativeLibraryName(nl), nl);
+ }
}
+
}
/**
@@ -213,9 +227,17 @@ public class HadoopClassLoader extends URLClassLoader implements ClassCache {
ClassLoader ldr = APP_CLS_LDR;
while (ldr != null) {
- Vector<Object> ldrLibObjs = nativeLibraries(ldr);
+ Object ldrLibObject = nativeLibraries(ldr);
- synchronized (ldrLibObjs) {
+ Collection ldrLibObjs = null;
+ if (ldrLibObject instanceof Vector)
+ ldrLibObjs = (Vector<Object>)ldrLibObject;
+ else if (ldrLibObject instanceof ConcurrentHashMap)
+ ldrLibObjs = ((ConcurrentHashMap)ldrLibObject).values();
+ else
+ ldrLibObjs = Collections.emptySet();
+
+ synchronized (ldrLibObject) {
for (Object ldrLibObj : ldrLibObjs) {
String name = nativeLibraryName(ldrLibObj);
@@ -225,7 +247,8 @@ public class HadoopClassLoader extends URLClassLoader implements ClassCache {
break;
}
- } else {
+ }
+ else {
if (name.contains(libName)) {
libObj = ldrLibObj;
@@ -264,7 +287,7 @@ public class HadoopClassLoader extends URLClassLoader implements ClassCache {
* @param ldr Class loaded.
* @return Native libraries.
*/
- private static Vector<Object> nativeLibraries(ClassLoader ldr) {
+ private static Object nativeLibraries(ClassLoader ldr) {
assert ldr != null;
return U.field(ldr, "nativeLibraries");
[2/2] ignite git commit: IGNITE-9728: Java 11: fix IGNITE_HOME setup
for tests,
added required dependencies to Hibernate module (for the moment - tests only).
This closes #4901.
Posted by vo...@apache.org.
IGNITE-9728: Java 11: fix IGNITE_HOME setup for tests, added required dependencies to Hibernate module (for the moment - tests only). This closes #4901.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/321d00ea
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/321d00ea
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/321d00ea
Branch: refs/heads/ignite-2.7
Commit: 321d00ea4a26c44bbfe354fbcf6b6a55b4366d44
Parents: 47a1692
Author: devozerov <pp...@gmail.com>
Authored: Tue Oct 9 09:01:58 2018 +0300
Committer: devozerov <pp...@gmail.com>
Committed: Tue Oct 9 09:03:54 2018 +0300
----------------------------------------------------------------------
.../config/GridTestProperties.java | 10 ++-----
modules/hibernate-4.2/pom.xml | 17 +++++++++++
modules/hibernate-5.1/pom.xml | 30 ++++++++++++++++++++
3 files changed, 49 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/321d00ea/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
index e2594ca..9f6feab 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/config/GridTestProperties.java
@@ -30,6 +30,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.ignite.binary.BinaryBasicNameMapper;
import org.apache.ignite.binary.BinaryTypeConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.log4j.xml.DOMConfigurator;
import org.jetbrains.annotations.Nullable;
@@ -95,14 +96,7 @@ public final class GridTestProperties {
/** */
static {
// Initialize IGNITE_HOME system property.
- String igniteHome = System.getProperty("IGNITE_HOME");
-
- if (igniteHome == null || igniteHome.isEmpty()) {
- igniteHome = System.getenv("IGNITE_HOME");
-
- if (igniteHome != null && !igniteHome.isEmpty())
- System.setProperty("IGNITE_HOME", igniteHome);
- }
+ U.getIgniteHome();
// Load default properties.
File cfgFile = getTestConfigurationFile(null, TESTS_PROP_FILE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/321d00ea/modules/hibernate-4.2/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate-4.2/pom.xml b/modules/hibernate-4.2/pom.xml
index 41ac917..5a13c87 100644
--- a/modules/hibernate-4.2/pom.xml
+++ b/modules/hibernate-4.2/pom.xml
@@ -130,6 +130,23 @@
<version>1.4.8</version>
<scope>test</scope>
</dependency>
+
+ <!-- JDK9+ -->
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ <version>1.0.6.Final</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/ignite/blob/321d00ea/modules/hibernate-5.1/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate-5.1/pom.xml b/modules/hibernate-5.1/pom.xml
index ad30124..6528f7b 100644
--- a/modules/hibernate-5.1/pom.xml
+++ b/modules/hibernate-5.1/pom.xml
@@ -130,6 +130,36 @@
<version>1.4.8</version>
<scope>test</scope>
</dependency>
+
+ <!-- JDK9+ -->
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.rmi</groupId>
+ <artifactId>jboss-rmi-api_1.0_spec</artifactId>
+ <version>1.0.6.Final</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.1.14</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.14</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>