ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [28/50] [abbrv] incubator-ignite git commit: # Minor Hadoop constants adjustments.
Date Thu, 12 Mar 2015 09:30:31 GMT
# Minor Hadoop constants adjustments.


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

Branch: refs/heads/ignite-release-test-no-mod
Commit: b9485529e775c7813c4fd2fb83af7a37474534ac
Parents: 6805b7e
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Wed Mar 11 12:30:28 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Wed Mar 11 12:30:28 2015 +0300

----------------------------------------------------------------------
 .../hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java      | 3 +++
 .../internal/processors/hadoop/proto/HadoopClientProtocol.java    | 3 ---
 .../apache/ignite/client/hadoop/HadoopClientProtocolSelfTest.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b9485529/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java
b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java
index 5c52f94..407d19a 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopClientProtocolProvider.java
@@ -41,6 +41,9 @@ import static org.apache.ignite.internal.processors.hadoop.proto.HadoopClientPro
  * Ignite Hadoop client protocol provider.
  */
 public class IgniteHadoopClientProtocolProvider extends ClientProtocolProvider {
+    /** Framework name used in configuration. */
+    public static final String FRAMEWORK_NAME = "ignite";
+
     /** Clients. */
     private static final ConcurrentHashMap<String, IgniteInternalFuture<GridClient>>
cliMap = new ConcurrentHashMap<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b9485529/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/HadoopClientProtocol.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/HadoopClientProtocol.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/HadoopClientProtocol.java
index b454760..1e3c165 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/HadoopClientProtocol.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/proto/HadoopClientProtocol.java
@@ -44,9 +44,6 @@ import static org.apache.ignite.internal.processors.hadoop.HadoopUtils.*;
  * Hadoop client protocol.
  */
 public class HadoopClientProtocol implements ClientProtocol {
-    /** Ignite framework name property. */
-    public static final String FRAMEWORK_NAME = "ignite";
-
     /** Protocol version. */
     private static final long PROTO_VER = 1L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b9485529/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/HadoopClientProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/HadoopClientProtocolSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/HadoopClientProtocolSelfTest.java
index d19a8ea..b94d9d1 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/HadoopClientProtocolSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/HadoopClientProtocolSelfTest.java
@@ -453,7 +453,7 @@ public class HadoopClientProtocolSelfTest extends HadoopAbstractSelfTest
{
 
         setupFileSystems(conf);
 
-        conf.set(MRConfig.FRAMEWORK_NAME, HadoopClientProtocol.FRAMEWORK_NAME);
+        conf.set(MRConfig.FRAMEWORK_NAME, IgniteHadoopClientProtocolProvider.FRAMEWORK_NAME);
         conf.set(MRConfig.MASTER_ADDRESS, "127.0.0.1:" + port);
 
         conf.set("fs.defaultFS", "igfs://:" + getTestGridName(0) + "@/");


Mime
View raw message