ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [08/50] [abbrv] ignite git commit: IGNITE-2621: Correct handling for tasks in mixed-platform cluster - minors
Date Fri, 18 Mar 2016 01:50:02 GMT
IGNITE-2621: Correct handling for tasks in mixed-platform cluster - minors


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

Branch: refs/heads/ignite-2407
Commit: 157ef53ea3d826db8c2455658d8694d60472e80d
Parents: c6c9389
Author: Pavel Tupitsyn <ptupitsyn@gridgain.com>
Authored: Wed Mar 9 18:12:39 2016 +0300
Committer: Pavel Tupitsyn <ptupitsyn@gridgain.com>
Committed: Wed Mar 9 18:12:39 2016 +0300

----------------------------------------------------------------------
 .../internal/processors/platform/PlatformProcessorImpl.java   | 2 +-
 .../internal/processors/platform/compute/PlatformCompute.java | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/157ef53e/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
index 95daa4d..ff7bbd7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
@@ -303,7 +303,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements
Platf
     @Override public PlatformTarget compute(PlatformTarget grp) {
         PlatformClusterGroup grp0 = (PlatformClusterGroup)grp;
 
-        return new PlatformCompute(platformCtx, grp0.projection());
+        return new PlatformCompute(platformCtx, grp0.projection(), PlatformUtils.ATTR_PLATFORM);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/157ef53e/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
index a1a82ae..9eb746c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/compute/PlatformCompute.java
@@ -78,12 +78,15 @@ public class PlatformCompute extends PlatformAbstractTarget {
      * @param platformCtx Context.
      * @param grp Cluster group.
      */
-    public PlatformCompute(PlatformContext platformCtx, ClusterGroup grp) {
+    public PlatformCompute(PlatformContext platformCtx, ClusterGroup grp, String platformAttr)
{
         super(platformCtx);
 
+        assert grp != null;
+        assert platformAttr != null;
+
         compute = (IgniteComputeImpl)grp.ignite().compute(grp);
 
-        ClusterGroup platformGrp = grp.forAttribute(PlatformUtils.ATTR_PLATFORM, platformCtx.platform());
+        ClusterGroup platformGrp = grp.forAttribute(platformAttr, platformCtx.platform());
 
         computeForPlatform = (IgniteComputeImpl)grp.ignite().compute(platformGrp);
     }


Mime
View raw message