ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [14/16] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-5075' into ignite-5075-pds
Date Sun, 04 Jun 2017 07:50:16 GMT
Merge remote-tracking branch 'remotes/origin/ignite-5075' into ignite-5075-pds


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

Branch: refs/heads/ignite-5075-pds
Commit: 7a76845b6c386328c0231aefeda42d3b7c173ca7
Parents: 9f93d85 605377c
Author: sboikov <sboikov@gridgain.com>
Authored: Sun Jun 4 10:42:23 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Sun Jun 4 10:42:23 2017 +0300

----------------------------------------------------------------------
 .../cache/GridCacheConcurrentMap.java           |  7 +++-
 .../cache/GridCacheConcurrentMapImpl.java       | 34 +++++++++++-----
 .../cache/GridCacheLocalConcurrentMap.java      | 17 +++++---
 .../distributed/dht/GridDhtCacheAdapter.java    | 10 ++---
 .../distributed/dht/GridDhtLocalPartition.java  | 43 +++++++++++++-------
 .../distributed/near/GridNearCacheAdapter.java  |  4 +-
 .../near/GridNearSingleGetResponse.java         |  2 +-
 .../processors/cache/local/GridLocalCache.java  |  2 +-
 .../processors/cache/IgniteCacheGroupsTest.java | 36 ++++++++++++++--
 ...nuousQueryConcurrentPartitionUpdateTest.java |  6 +--
 10 files changed, 112 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7a76845b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index a506544,cba9477..882c15a
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@@ -983,11 -999,9 +996,11 @@@ public class GridDhtLocalPartition exte
                              true,
                              false);
  
 -                        if (cached instanceof GridDhtCacheEntry && ((GridDhtCacheEntry)cached).clearInternal(clearVer,
extras)) {
 +                        cctx.shared().database().checkpointReadLock();
 +
 +                        try {if (cached instanceof GridDhtCacheEntry && ((GridDhtCacheEntry)cached).clearInternal(clearVer,
extras)) {
                              if (rec) {
-                                 cctx.events().addEvent(cached.partition(),
+                                 hld.cctx.events().addEvent(cached.partition(),
                                      cached.key(),
                                      ctx.localNodeId(),
                                      (IgniteUuid)null,

http://git-wip-us.apache.org/repos/asf/ignite/blob/7a76845b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
----------------------------------------------------------------------


Mime
View raw message