ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject incubator-ignite git commit: # IGNITE-283: Minors.
Date Fri, 20 Feb 2015 15:37:09 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-283-tx 1a0af0942 -> 7309772dc


# IGNITE-283: Minors.


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

Branch: refs/heads/ignite-283-tx
Commit: 7309772dc54fafdb521b59f0ba0e00117688932d
Parents: 1a0af09
Author: vozerov <vozerov@gridgain.com>
Authored: Fri Feb 20 18:37:05 2015 +0300
Committer: vozerov <vozerov@gridgain.com>
Committed: Fri Feb 20 18:37:05 2015 +0300

----------------------------------------------------------------------
 .../distributed/dht/atomic/GridDhtAtomicCache.java      |  3 ---
 .../processors/cache/version/GridCacheVersion.java      |  1 -
 .../cache/version/GridCacheVersionConflictContext.java  | 12 ------------
 3 files changed, 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7309772d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 218cd33..9f9af31 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -472,7 +472,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> putAllConflictAsync(Map<? extends K,
GridCacheDrInfo<V>> conflictMap) {
-        // TODO IGNITE-283: Invalid metrics update in case of local store.
         ctx.dr().onReceiveCacheEntriesReceived(conflictMap.size());
 
         return updateAllAsync0(null,
@@ -563,7 +562,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> removeAllConflictAsync(Map<? extends
K, GridCacheVersion> conflictMap) {
-        // TODO: IGNITE-283: Invalid metrics update in case of local store.
         ctx.dr().onReceiveCacheEntriesReceived(conflictMap.size());
 
         return removeAllAsync0(null, conflictMap, null, false, false, null);
@@ -1124,7 +1122,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
                         GridCacheReturn<Object> retVal = null;
 
-                        // TODO: IGNITE-283: Merge local store and DR checks into single
method inside ctx.
                         if (keys.size() > 1 &&                             //
Several keys ...
                             writeThrough() &&                              // and
store is enabled ...
                             !ctx.store().isLocalStore() &&                 // and
this is not local store ...

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7309772d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
index b3dc710..6b4fa1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
@@ -21,7 +21,6 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.plugin.extensions.communication.*;
-import org.jetbrains.annotations.*;
 
 import java.io.*;
 import java.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7309772d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java
index 862efc2..94a611e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java
@@ -91,18 +91,6 @@ public class GridCacheVersionConflictContext<K, V> {
 
     /**
      * Force cache to apply new entry overwriting old (existing) entry.
-     * <p>
-     * Note that updates from remote data centers always have explicit TTL , while local
data center
-     * updates will only have explicit TTL in case {@link CacheEntry#timeToLive(long)} was
called
-     * before update. In the latter case new entry will pick TTL of the old (existing) entry,
even
-     * if it was set through update from remote data center. it means that depending on concurrent
-     * update timings new update might pick unexpected TTL. For example, consider that three
updates
-     * of the same key are performed: local update with explicit TTL (1) followed by another
local
-     * update without explicit TTL (2) and one remote update (3). In this case you might
expect that
-     * update (2) will pick TTL set during update (1). However, in case update (3) occurrs
between (1)
-     * and (2) and it overwrites (1) during conflict resolution, then update (2) will pick
TTL of
-     * update (3). To have predictable TTL in such cases you should either always set it
explicitly
-     * through {@code GridCacheEntry.timeToLive(long)} or use {@link #merge(Object, long)}.
      */
     public void useNew() {
         state = State.USE_NEW;


Mime
View raw message