ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [15/17] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-3478' into ignite-5932
Date Wed, 11 Oct 2017 10:43:13 GMT
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/52107670
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/52107670
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/52107670

Branch: refs/heads/ignite-5932
Commit: 521076700fde97118f35387a2e4bcfdcc29fd94b
Parents: 224f244 970cf47
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Oct 11 11:28:13 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Oct 11 11:28:13 2017 +0300

----------------------------------------------------------------------
 .../JettyRestProcessorAbstractSelfTest.java     |   4 +-
 .../ignite/internal/binary/BinaryMetadata.java  |   8 +-
 .../cache/IgniteCacheOffheapManager.java        |  65 ++++++--
 .../cache/IgniteCacheOffheapManagerImpl.java    |  32 +++-
 .../distributed/dht/GridDhtCacheEntry.java      |   5 +-
 .../persistence/GridCacheOffheapManager.java    |   7 +
 .../transactions/IgniteTxLocalAdapter.java      |  26 ++-
 .../cache/mvcc/CacheMvccTransactionsTest.java   | 163 +++++++++++++++----
 .../query/h2/opt/GridH2IndexBase.java           |  25 ++-
 9 files changed, 267 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/52107670/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
index 9e3d0fb,2c070fc..e498b5e
--- 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
@@@ -542,10 -549,11 +549,27 @@@ public interface IgniteCacheOffheapMana
  
          /**
           * @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.
+          * @param ver Version.
+          * @param mvccVer Mvcc version.
           * @return List of transactions to wait for.
           * @throws IgniteCheckedException If failed.
           */
@@@ -557,11 -565,26 +581,32 @@@
              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.
+          * @param key Key.
+          * @param mvccVer Mvcc version.
+          * @return List of transactions to wait for.
+          * @throws IgniteCheckedException If failed.
+          */
+         @Nullable GridLongList mvccRemove(
+             GridCacheContext cctx,
+             boolean primary,
+             KeyCacheObject key,
+             MvccCoordinatorVersion mvccVer) throws IgniteCheckedException;
+ 
+         /**
+          * @param cctx Cache context.
+          * @param key Key.
+          * @throws IgniteCheckedException If failed.
+          */
+         void mvccRemoveAll(GridCacheContext cctx, KeyCacheObject key) throws IgniteCheckedException;
  
          /**
           * @param cctx Cache context.

http://git-wip-us.apache.org/repos/asf/ignite/blob/52107670/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccTransactionsTest.java
----------------------------------------------------------------------


Mime
View raw message