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 2017/10/11 10:43:14 UTC
[16/17] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-3478' into ignite-5932
Merge remote-tracking branch 'remotes/origin/ignite-3478' into ignite-5932
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
# modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca82daa9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca82daa9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca82daa9
Branch: refs/heads/ignite-5932
Commit: ca82daa9d6f39a62dc432d120be6dece8ad40219
Parents: 5210767
Author: sboikov <sb...@gridgain.com>
Authored: Wed Oct 11 11:28:19 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Oct 11 11:28:19 2017 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheOffheapManager.java | 22 --------------------
1 file changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ca82daa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
index e498b5e..2c070fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
@@ -549,22 +549,6 @@ public interface IgniteCacheOffheapManager {
/**
* @param cctx Cache context.
- * @param key Key.
- * @param val Value.
- * @param ver Version.
- * @param mvccVer Mvcc version.
- * @return {@code True} if new value was inserted.
- * @throws IgniteCheckedException If failed.
- */
- boolean mvccInitialValue(
- GridCacheContext cctx,
- KeyCacheObject key,
- @Nullable CacheObject val,
- GridCacheVersion ver,
- MvccCoordinatorVersion mvccVer) throws IgniteCheckedException;
-
- /**
- * @param cctx Cache context.
* @param primary {@code True} if update is executed on primary node.
* @param key Key.
* @param val Value.
@@ -581,12 +565,6 @@ public interface IgniteCacheOffheapManager {
GridCacheVersion ver,
MvccCoordinatorVersion mvccVer) throws IgniteCheckedException;
- @Nullable GridLongList mvccRemove(
- GridCacheContext cctx,
- boolean primary,
- KeyCacheObject key,
- MvccCoordinatorVersion mvccVer) throws IgniteCheckedException;
-
/**
* @param cctx Cache context.
* @param primary {@code True} if update is executed on primary node.