ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [17/22] ignite git commit: Reworking TX adapter.
Date Fri, 01 Apr 2016 08:25:02 GMT
Reworking TX adapter.


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

Branch: refs/heads/ignite-2931
Commit: 4d1d18db78f122642d1bbc16a72f2336e8997904
Parents: c2cd557
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Apr 1 10:20:24 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Apr 1 10:20:24 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheAdapter.java     | 6 +++---
 .../processors/cache/transactions/IgniteTxLocalAdapter.java    | 6 +++---
 .../processors/cache/transactions/IgniteTxLocalEx.java         | 4 +---
 3 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4d1d18db/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 8fd318b..c42af9d 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
@@ -2772,7 +2772,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
 
         syncOp(new SyncInOp(m.size() == 1) {
             @Override public void inOp(IgniteTxLocalAdapter tx) throws IgniteCheckedException
{
-                tx.putAllAsync(ctx, m, false, CU.empty0()).get();
+                tx.putAllAsync(ctx, m, false).get();
             }
 
             @Override public String toString() {
@@ -2794,7 +2794,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
 
         return asyncOp(new AsyncInOp(m.keySet()) {
             @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter tx)
{
-                return tx.putAllAsync(ctx, m, false, CU.empty0()).chain(RET2NULL);
+                return tx.putAllAsync(ctx, m, false).chain(RET2NULL);
             }
 
             @Override public String toString() {
@@ -4807,7 +4807,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K,
V
      * @param filter Filter.
      * @return Filter array.
      */
-    protected static CacheEntryPredicate[] filterArray(@Nullable CacheEntryPredicate filter)
{
+    public static CacheEntryPredicate[] filterArray(@Nullable CacheEntryPredicate filter)
{
         return filter != null ? new CacheEntryPredicate[] { filter } : CU.empty0();
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/4d1d18db/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 0337145..c813212 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -45,6 +45,7 @@ import org.apache.ignite.internal.processors.cache.CacheInvokeEntry;
 import org.apache.ignite.internal.processors.cache.CacheLazyEntry;
 import org.apache.ignite.internal.processors.cache.CacheObject;
 import org.apache.ignite.internal.processors.cache.CacheOperationContext;
+import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
 import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
@@ -2040,8 +2041,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements
Ig
     @Override public <K, V> IgniteInternalFuture<GridCacheReturn> putAllAsync(
         GridCacheContext cacheCtx,
         Map<? extends K, ? extends V> map,
-        boolean retval,
-        CacheEntryPredicate[] filter
+        boolean retval
     ) {
         return (IgniteInternalFuture<GridCacheReturn>)putAllAsync0(cacheCtx,
             map,
@@ -2049,7 +2049,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements
Ig
             null,
             null,
             retval,
-            filter);
+            GridCacheAdapter.filterArray(null));
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/4d1d18db/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
index 78f517c..8af1492 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java
@@ -83,14 +83,12 @@ public interface IgniteTxLocalEx extends IgniteInternalTx {
      * @param cacheCtx Cache context.
      * @param map Map to put.
      * @param retval Flag indicating whether a value should be returned.
-     * @param filter Filter.
      * @return Future for put operation.
      */
     public <K, V> IgniteInternalFuture<GridCacheReturn> putAllAsync(
         GridCacheContext cacheCtx,
         Map<? extends K, ? extends V> map,
-        boolean retval,
-        CacheEntryPredicate[] filter);
+        boolean retval);
 
     /**
      * @param cacheCtx Cache context.


Mime
View raw message