ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [04/10] incubator-ignite git commit: # ignite-297 merge
Date Wed, 18 Feb 2015 19:20:43 GMT
# ignite-297 merge


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

Branch: refs/heads/sprint-2
Commit: a2f6acd0a5fe8c1c3aecbcfed4153921b92f5f43
Parents: 7e8e0b0 786690c
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Feb 18 17:14:00 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Feb 18 17:14:00 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      | 16 ++--
 .../processors/cache/GridCacheContext.java      |  4 +-
 .../processors/cache/GridCacheEntryEx.java      | 16 ++--
 .../processors/cache/GridCacheMapEntry.java     | 58 ++++++-------
 .../processors/cache/GridCacheProjectionEx.java |  8 +-
 .../cache/GridCacheProjectionImpl.java          | 16 ++--
 .../processors/cache/GridCacheProxyImpl.java    | 16 ++--
 .../cache/GridCacheUpdateAtomicResult.java      | 29 +++----
 .../processors/cache/GridCacheUtils.java        | 32 ++++---
 .../GridDistributedTxRemoteAdapter.java         | 19 ++---
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  4 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  2 +-
 .../dht/atomic/GridDhtAtomicCache.java          | 88 +++++++++++---------
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   | 12 +--
 .../distributed/near/GridNearAtomicCache.java   | 18 ++--
 .../processors/cache/dr/GridCacheDrInfo.java    |  5 +-
 .../cache/transactions/IgniteTxEntry.java       | 56 ++++++-------
 .../transactions/IgniteTxLocalAdapter.java      | 30 +++----
 .../cache/version/GridCacheVersion.java         |  4 +-
 .../cache/version/GridCacheVersionEx.java       |  2 +-
 .../dataload/IgniteDataLoaderImpl.java          |  3 +-
 .../dr/GridDrDataLoadCacheUpdater.java          |  4 +-
 .../ignite/internal/util/IgniteUtils.java       |  2 +-
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |  2 +-
 .../processors/cache/GridCacheTestEntryEx.java  |  8 +-
 25 files changed, 237 insertions(+), 217 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2f6acd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2f6acd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2f6acd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2f6acd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2f6acd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2f6acd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2f6acd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 458648f,eeae603..ee31c38
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@@ -640,8 -640,13 +640,8 @@@ public class GridNearAtomicCache<K, V> 
      }
  
      /** {@inheritDoc} */
-     @Override public void removeAllDr(Map<? extends K, GridCacheVersion> drMap) throws
IgniteCheckedException {
-         dht.removeAllDr(drMap);
 -    @Override public IgniteInternalFuture<?> removeAllAsync(IgnitePredicate<Cache.Entry<K,
V>>[] filter) {
 -        return dht.removeAllAsync(keySet(filter));
 -    }
 -
 -    /** {@inheritDoc} */
+     @Override public void removeAllConflict(Map<? extends K, GridCacheVersion> drMap)
throws IgniteCheckedException {
+         dht.removeAllConflict(drMap);
      }
  
      /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2f6acd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a2f6acd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------


Mime
View raw message