ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/6] incubator-ignite git commit: #ignite-373: Revert TopologyVersionAwareJob.localExecute semantic.
Date Wed, 13 May 2015 09:46:50 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-373 83550f8e0 -> b8b8cf6d8


#ignite-373: Revert TopologyVersionAwareJob.localExecute semantic.


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

Branch: refs/heads/ignite-373
Commit: 3dd16ba345bdaeb47eb9bf65481503619f234085
Parents: 83550f8
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Wed May 13 12:09:23 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Wed May 13 12:09:23 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java       | 19 ++++++++-----------
 .../distributed/GridDistributedCacheAdapter.java |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dd16ba3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 0b7fa91..3826bfa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -4842,9 +4842,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object localExecute() {
-            IgniteInternalCache cache = ((IgniteKernal)ignite).context().cache().cache(cacheName);
-
+        @Nullable @Override public Object localExecute(@Nullable IgniteInternalCache cache)
{
             if (cache != null)
                 cache.clearLocally();
 
@@ -4882,9 +4880,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object localExecute() {
-            IgniteInternalCache cache = ((IgniteKernal)ignite).context().cache().cache(cacheName);
-
+        @Nullable @Override public Object localExecute(@Nullable IgniteInternalCache cache)
{
             if (cache != null)
                 cache.clearLocallyAll(keys);
 
@@ -4922,9 +4918,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object localExecute() {
-            IgniteInternalCache cache = ((IgniteKernal)ignite).context().cache().cache(cacheName);
-
+        @Nullable @Override public Object localExecute(@Nullable IgniteInternalCache cache)
{
             if (cache == null)
                 return 0;
 
@@ -5547,13 +5541,16 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
         @Nullable @Override public final Object execute() {
             waitAffinityReadyFuture();
 
-            return localExecute();
+            IgniteInternalCache cache = ((IgniteKernal)ignite).context().cache().cache(cacheName);
+
+            return localExecute(cache);
         }
 
         /**
+         * @param cache Cache.
          * @return Local execution result.
          */
-        @Nullable protected abstract Object localExecute();
+        @Nullable protected abstract Object localExecute(@Nullable IgniteInternalCache cache);
 
         /**
          * Holds (suspends) job execution until our cache version becomes equal to remote
cache's version.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dd16ba3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index 941a775..3878c67 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -316,7 +316,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends
GridCacheAdapter
         }
 
         /** {@inheritDoc} */
-        @Nullable @Override public Object localExecute() {
+        @Nullable @Override public Object localExecute(@Nullable IgniteInternalCache cache0)
{
             GridCacheAdapter cache = ((IgniteKernal) ignite).context().cache().internalCache(cacheName);
 
             if (cache == null)


Mime
View raw message