You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/09/29 10:20:05 UTC
ignite git commit: ignite-3601p
Repository: ignite
Updated Branches:
refs/heads/ignite-3601p fe6d2d019 -> c5708ba4d
ignite-3601p
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5708ba4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5708ba4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5708ba4
Branch: refs/heads/ignite-3601p
Commit: c5708ba4d998b4c5380aa2684d2190a8ac3a2059
Parents: fe6d2d0
Author: sboikov <sb...@gridgain.com>
Authored: Thu Sep 29 13:18:54 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Sep 29 13:18:54 2016 +0300
----------------------------------------------------------------------
.../cache/transactions/IgniteTxLocalAdapter.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5708ba4/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 c12e595..9e07f89 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
@@ -2420,13 +2420,14 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements Ig
else
old = retval ? entry.rawGetOrUnmarshal(false) : entry.rawGet();
+ final GridCacheOperation op = lockOnly ? NOOP : rmv ? DELETE :
+ entryProcessor != null ? TRANSFORM : old != null ? UPDATE : CREATE;
+
if (old != null && hasFilters && !filter(entry.context(), cacheKey, old, filter)) {
ret.set(cacheCtx, old, false, keepBinary);
if (!readCommitted()) {
- // Enlist failed filters as reads for non-read-committed mode,
- // so future ops will get the same values.
- txEntry = addEntry(READ,
+ txEntry = addEntry(optimistic() && serializable() ? op : READ,
old,
null,
null,
@@ -2455,9 +2456,6 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements Ig
break; // While.
}
- final GridCacheOperation op = lockOnly ? NOOP : rmv ? DELETE :
- entryProcessor != null ? TRANSFORM : old != null ? UPDATE : CREATE;
-
txEntry = addEntry(op,
cacheCtx.toCacheObject(val),
entryProcessor,