You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/03/02 15:04:02 UTC
[13/50] [abbrv] incubator-ignite git commit: # IGNITE-147: Applied
intermediate patch with minor changes from Ivan V..
# IGNITE-147: Applied intermediate patch with minor changes from Ivan V..
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd661676
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd661676
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd661676
Branch: refs/heads/ignite-sql-tests
Commit: dd66167656fb2364cac531e7780f1ec069ebfb03
Parents: cefc885
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Feb 27 16:36:03 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Feb 27 16:36:03 2015 +0300
----------------------------------------------------------------------
.../ignite/testframework/config/GridTestProperties.java | 10 +++++-----
.../ignite/client/hadoop/GridHadoopClientProtocol.java | 2 +-
.../processors/hadoop/GridHadoopClassLoader.java | 12 ++++++------
.../internal/processors/hadoop/GridHadoopSetup.java | 8 ++++----
.../client/hadoop/GridHadoopClientProtocolSelfTest.java | 6 +++---
5 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd661676/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 37b3a44..5fa78ed 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
@@ -66,13 +66,13 @@ public final class GridTestProperties {
/** */
static {
// Initialize IGNITE_HOME system property.
- String ggHome = System.getProperty("IGNITE_HOME");
+ String igniteHome = System.getProperty("IGNITE_HOME");
- if (ggHome == null || ggHome.isEmpty()) {
- ggHome = System.getenv("IGNITE_HOME");
+ if (igniteHome == null || igniteHome.isEmpty()) {
+ igniteHome = System.getenv("IGNITE_HOME");
- if (ggHome != null && !ggHome.isEmpty())
- System.setProperty("IGNITE_HOME", ggHome);
+ if (igniteHome != null && !igniteHome.isEmpty())
+ System.setProperty("IGNITE_HOME", igniteHome);
}
// Load default properties.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd661676/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
index 1a70593..bd31951 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
@@ -311,7 +311,7 @@ public class GridHadoopClientProtocol implements ClientProtocol {
/**
* Process received status update.
*
- * @param status Hadoop map-reduce job status.
+ * @param status Ignite status.
* @return Hadoop status.
*/
private JobStatus processStatus(GridHadoopJobStatus status) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd661676/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
index 4a81bba..bc4c0bb 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java
@@ -73,11 +73,11 @@ public class GridHadoopClassLoader extends URLClassLoader {
* @param cls Class name.
* @return {@code true} if we need to check this class.
*/
- private static boolean isIgfsOrGgHadoop(String cls) {
- String gg = "org.apache.ignite";
- int len = gg.length();
+ private static boolean isIgfsHadoop(String cls) {
+ String ignitePackagePrefix = "org.apache.ignite";
+ int len = ignitePackagePrefix.length();
- return cls.startsWith(gg) && (cls.indexOf("igfs.", len) != -1 || cls.indexOf(".fs.", len) != -1 || cls.indexOf("hadoop.", len) != -1);
+ return cls.startsWith(ignitePackagePrefix) && (cls.indexOf("igfs.", len) != -1 || cls.indexOf(".fs.", len) != -1 || cls.indexOf("hadoop.", len) != -1);
}
/**
@@ -100,7 +100,7 @@ public class GridHadoopClassLoader extends URLClassLoader {
return loadClassExplicitly(name, resolve);
}
- if (isIgfsOrGgHadoop(name)) { // For Ignite Hadoop and IGFS classes we have to check if they depend on Hadoop.
+ if (isIgfsHadoop(name)) { // For Ignite Hadoop and IGFS classes we have to check if they depend on Hadoop.
Boolean hasDeps = cache.get(name);
if (hasDeps == null) {
@@ -224,7 +224,7 @@ public class GridHadoopClassLoader extends URLClassLoader {
if (in == null) // The class is external itself, it must be loaded from this class loader.
return true;
- if (!isIgfsOrGgHadoop(clsName)) // Other classes should not have external dependencies.
+ if (!isIgfsHadoop(clsName)) // Other classes should not have external dependencies.
return false;
final ClassReader rdr;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd661676/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
index 0f09600..66b1db4 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
@@ -289,16 +289,16 @@ public class GridHadoopSetup {
/**
* Checks Ignite home.
*
- * @param ggHome Ignite home.
+ * @param igniteHome Ignite home.
*/
- private static void checkIgniteHome(String ggHome) {
+ private static void checkIgniteHome(String igniteHome) {
URL jarUrl = U.class.getProtectionDomain().getCodeSource().getLocation();
try {
Path jar = Paths.get(jarUrl.toURI());
- Path gg = Paths.get(ggHome);
+ Path igHome = Paths.get(igniteHome);
- if (!jar.startsWith(gg))
+ if (!jar.startsWith(igHome))
exit("Ignite JAR files are not under IGNITE_HOME.", null);
}
catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd661676/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
index 0d4b0fc..ff8798b 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java
@@ -51,15 +51,15 @@ public class GridHadoopClientProtocolSelfTest extends GridHadoopAbstractSelfTest
/** Setup lock file. */
private static File setupLockFile = new File(U.isWindows() ? System.getProperty("java.io.tmpdir") : "/tmp",
- "gg-lock-setup.file");
+ "ignite-lock-setup.file");
/** Map lock file. */
private static File mapLockFile = new File(U.isWindows() ? System.getProperty("java.io.tmpdir") : "/tmp",
- "gg-lock-map.file");
+ "ignite-lock-map.file");
/** Reduce lock file. */
private static File reduceLockFile = new File(U.isWindows() ? System.getProperty("java.io.tmpdir") : "/tmp",
- "gg-lock-reduce.file");
+ "ignite-lock-reduce.file");
/** {@inheritDoc} */
@Override protected int gridCount() {