ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [46/46] incubator-ignite git commit: # ignite-656
Date Wed, 22 Apr 2015 14:14:01 GMT
# ignite-656


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

Branch: refs/heads/ignite-656
Commit: 27d11b563e3344844097b4ca56230ceb08108d2e
Parents: 0bd9052
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Apr 22 17:12:56 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Apr 22 17:12:56 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/GridDistributedLockRequest.java   |  1 +
 .../cache/distributed/dht/GridDhtGetFuture.java         |  7 ++++---
 .../cache/distributed/dht/GridDhtLockFuture.java        |  9 +++++----
 .../cache/distributed/dht/GridDhtTxLocalAdapter.java    | 12 +++++++++++-
 .../dht/colocated/GridDhtColocatedCache.java            |  2 ++
 .../cache/distributed/near/GridNearCacheAdapter.java    |  1 +
 .../distributed/near/GridNearTransactionalCache.java    |  1 +
 .../cache/transactions/IgniteTxLocalAdapter.java        |  4 ++--
 8 files changed, 27 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index 2baee77..fd1040f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -103,6 +103,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage
{
     }
 
     /**
+     * @param cacheId Cache ID.
      * @param nodeId Node ID.
      * @param nearXidVer Near transaction ID.
      * @param threadId Thread ID.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
index ed5414d..f6f930e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
@@ -356,7 +356,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
                         /*deserialize portable*/false,
                         skipVals,
                         /*keep cache objects*/true,
-                        /*skip store*/readThrough);
+                        /*skip store*/!readThrough);
                 }
             }
         }
@@ -384,7 +384,8 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
                                     readThrough,
                                     subjId,
                                     taskName,
-                                    expiryPlc, skipVals);
+                                    expiryPlc,
+                                    skipVals);
                             }
                             else {
                                 return tx.getAllAsync(cctx,
@@ -393,7 +394,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
                                     /*deserialize portable*/false,
                                     skipVals,
                                     /*keep cache objects*/true,
-                                    /*skip store*/readThrough);
+                                    /*skip store*/!readThrough);
                             }
                         }
                     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 28b80ee..7263dfe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -130,7 +130,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
     private long accessTtl;
 
     /** Need return value flag. */
-    private boolean needReturnValue;
+    private boolean needReturnVal;
 
     /** Skip store flag. */
     private final boolean skipStore;
@@ -142,6 +142,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
      * @param topVer Topology version.
      * @param cnt Number of keys to lock.
      * @param read Read flag.
+     * @param needReturnVal Need return value flag.
      * @param timeout Lock acquisition timeout.
      * @param tx Transaction.
      * @param threadId Thread ID.
@@ -156,7 +157,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
         @NotNull AffinityTopologyVersion topVer,
         int cnt,
         boolean read,
-        boolean needReturnValue,
+        boolean needReturnVal,
         long timeout,
         GridDhtTxLocalAdapter tx,
         long threadId,
@@ -174,7 +175,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
         this.nearLockVer = nearLockVer;
         this.topVer = topVer;
         this.read = read;
-        this.needReturnValue = needReturnValue;
+        this.needReturnVal = needReturnVal;
         this.timeout = timeout;
         this.filter = filter;
         this.tx = tx;
@@ -957,7 +958,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
      *
      */
     private void loadMissingFromStore() {
-        if (cctx.loadPreviousValue() && cctx.readThrough() && (needReturnValue
|| read)) {
+        if (cctx.loadPreviousValue() && cctx.readThrough() && (needReturnVal
|| read)) {
             final Map<KeyCacheObject, GridDhtCacheEntry> loadMap = new LinkedHashMap<>();
 
             final GridCacheVersion ver = version();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index 65ca0ad..b32f0bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -530,6 +530,7 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter
{
      * @param msgId Message ID.
      * @param read Read flag.
      * @param accessTtl TTL for read operation.
+     * @param needRetVal Return value flag.
      * @param skipStore Skip store flag.
      * @return Lock future.
      */
@@ -624,7 +625,15 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter
{
             if (log.isDebugEnabled())
                 log.debug("Lock keys: " + passedKeys);
 
-            return obtainLockAsync(cacheCtx, ret, passedKeys, read, needRetVal, skipped,
accessTtl, null, skipStore);
+            return obtainLockAsync(cacheCtx,
+                ret,
+                passedKeys,
+                read,
+                needRetVal,
+                skipped,
+                accessTtl,
+                null,
+                skipStore);
         }
         catch (IgniteCheckedException e) {
             setRollbackOnly();
@@ -638,6 +647,7 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter
{
      * @param ret Return value.
      * @param passedKeys Passed keys.
      * @param read {@code True} if read.
+     * @param needRetVal Return value flag.
      * @param skipped Skipped keys.
      * @param accessTtl TTL for read operation.
      * @param filter Entry write filter.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 654e1ea..4489776 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -594,6 +594,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
      * @param topVer Topology version.
      * @param keys Mapped keys.
      * @param txRead Tx read.
+     * @param retval Return value flag.
      * @param timeout Lock timeout.
      * @param accessTtl TTL for read operation.
      * @param filter filter Optional filter.
@@ -674,6 +675,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte
      * @param topVer Topology version.
      * @param keys Mapped keys.
      * @param txRead Tx read.
+     * @param retval Return value flag.
      * @param timeout Lock timeout.
      * @param accessTtl TTL for read operation.
      * @param filter filter Optional filter.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 28e1f28..29c1d45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -210,6 +210,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
      * @param taskName Task name.
      * @param deserializePortable Deserialize portable flag.
      * @param expiryPlc Expiry policy.
+     * @param skipVal Skip value flag.
      * @param skipStore Skip store flag.
      * @return Loaded values.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
index ca292dc..62b9aee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -151,6 +151,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K,
V>
      * @param readThrough Read through flag.
      * @param deserializePortable Deserialize portable flag.
      * @param expiryPlc Expiry policy.
+     * @param skipVals Skip values flag.
      * @return Future.
      */
     IgniteInternalFuture<Map<K, V>> txLoadAsync(GridNearTxLocal tx,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/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 8f66d62..c0f91b7 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
@@ -1399,6 +1399,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
      * @param missedMap Missed keys.
      * @param redos Keys to retry.
      * @param deserializePortable Deserialize portable flag.
+     * @param skipVals Skip values flag.
      * @param keepCacheObjects Keep cache objects flag.
      * @param skipStore Skip store flag.
      * @return Loaded key-value pairs.
@@ -2814,9 +2815,8 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter
 
             ExpiryPolicy plc;
 
-            if (!F.isEmpty(filter)) {
+            if (!F.isEmpty(filter))
                 plc = opCtx != null ? opCtx.expiry() : null;
-            }
             else
                 plc = null;
 


Mime
View raw message