You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/27 13:14:45 UTC
ignite git commit: IGNITE-3477 - Fixing read committed tx
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master 00c0f322d -> 73940a3b5
IGNITE-3477 - Fixing read committed tx
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/73940a3b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73940a3b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73940a3b
Branch: refs/heads/ignite-3477-master
Commit: 73940a3b5d704f20ac44a644569fb3ee230427a5
Parents: 00c0f32
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Mar 27 16:14:35 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Mar 27 16:14:35 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/IgniteCacheOffheapManagerImpl.java | 3 ++-
.../processors/cache/distributed/near/GridNearTxLocal.java | 4 ++--
...micPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/73940a3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 08f7c5f..156911b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -1103,7 +1103,8 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
try {
CacheDataRow oldRow = dataTree.remove(new SearchRow(key));
- finishRemove(key, oldRow);
+ if (oldRow != null)
+ finishRemove(key, oldRow);
}
finally {
busyLock.leaveBusy();
http://git-wip-us.apache.org/repos/asf/ignite/blob/73940a3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 3f63074..750a99d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -2159,9 +2159,9 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements AutoClosea
val = entry.innerGet(
null,
this,
+ /*read-through*/false,
/*metrics*/true,
- /*event*/true,
- /*temporary*/false,
+ /*event*/!skipVals,
CU.subjectId(this, cctx),
null,
resolveTaskName(),
http://git-wip-us.apache.org/repos/asf/ignite/blob/73940a3b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java
index 3aa161e..0bfdfea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAto
public class GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiJvmFullApiSelfTest
extends GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest {
/** {@inheritDoc} */
- protected boolean isMultiJvm() {
+ @Override protected boolean isMultiJvm() {
return true;
}