You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by gv...@apache.org on 2018/12/11 11:20:04 UTC
ignite git commit: IGNITE-10472: MVCC: EntryProcessor resource
injection. This closes #5622.
Repository: ignite
Updated Branches:
refs/heads/master f80981ac4 -> 7633e18f1
IGNITE-10472: MVCC: EntryProcessor resource injection. This closes #5622.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7633e18f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7633e18f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7633e18f
Branch: refs/heads/master
Commit: 7633e18f1b8b6fce9aaf780c428193f91a019008
Parents: f80981a
Author: Andrey V. Mashenkov <an...@gmail.com>
Authored: Tue Dec 11 14:19:54 2018 +0300
Committer: Igor Seliverstov <gv...@gmail.com>
Committed: Tue Dec 11 14:19:54 2018 +0300
----------------------------------------------------------------------
.../processors/cache/IgniteCacheOffheapManagerImpl.java | 2 ++
.../processors/cache/IgniteCacheMvccTxInvokeTest.java | 7 -------
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7633e18f/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 ad589d3..1113597 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
@@ -1990,6 +1990,8 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager
assert res == ResultType.PREV_NULL;
if (entryProc != null) {
+ entryProc = EntryProcessorResourceInjectorProxy.wrap(cctx.kernalContext(), entryProc);
+
CacheInvokeEntry.Operation op = applyEntryProcessor(cctx, key, ver, entryProc, invokeArgs, updateRow, oldRow);
if (op == CacheInvokeEntry.Operation.NONE) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/7633e18f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMvccTxInvokeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMvccTxInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMvccTxInvokeTest.java
index 7029605..6ed5698 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMvccTxInvokeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMvccTxInvokeTest.java
@@ -47,11 +47,4 @@ public class IgniteCacheMvccTxInvokeTest extends IgniteCacheInvokeAbstractTest {
@Override protected NearCacheConfiguration nearConfiguration() {
return null;
}
-
- /** {@inheritDoc} */
- @Override public void testInvokeAllAppliedOnceOnBinaryTypeRegistration() {
- fail("https://issues.apache.org/jira/browse/IGNITE-10472");
-
- super.testInvokeAllAppliedOnceOnBinaryTypeRegistration();
- }
}
\ No newline at end of file