ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [36/36] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-6149
Date Fri, 08 Sep 2017 12:36:08 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-6149

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91bbb7cd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91bbb7cd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91bbb7cd

Branch: refs/heads/ignite-6149
Commit: 91bbb7cd24f38a38e2e65fc3ebf5637572b11b25
Parents: 1626130 b4c5d0a
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Sep 8 15:34:52 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Sep 8 15:34:52 2017 +0300

----------------------------------------------------------------------
 .../configuration/MemoryConfiguration.java      |   4 +-
 .../processors/cache/GridCacheLockCallback.java |  51 +++++++
 .../processors/cache/GridCacheMvccCallback.java |  51 -------
 .../processors/cache/GridCacheMvccFuture.java   |  37 -----
 .../processors/cache/GridCacheMvccManager.java  |  46 +++---
 .../cache/GridCacheVersionedFuture.java         |  37 +++++
 .../distributed/dht/GridDhtLockFuture.java      |   6 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   2 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   6 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   2 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   6 +-
 .../distributed/near/GridNearLockFuture.java    |   6 +-
 ...arOptimisticSerializableTxPrepareFuture.java |   2 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   2 +-
 .../GridNearPessimisticTxPrepareFuture.java     |   2 +-
 .../near/GridNearTransactionalCache.java        |   2 +-
 .../cache/distributed/near/GridNearTxLocal.java |   4 +-
 .../near/GridNearTxPrepareFutureAdapter.java    |   4 +-
 .../processors/cache/local/GridLocalCache.java  |   5 +-
 .../cache/local/GridLocalLockFuture.java        |   4 +-
 .../GridCacheDatabaseSharedManager.java         |  88 +++++++++--
 .../IgniteCacheDatabaseSharedManager.java       |  11 ++
 .../cache/persistence/file/FilePageStore.java   |   2 +-
 .../cache/transactions/IgniteTxHandler.java     |   4 +-
 .../cache/transactions/IgniteTxManager.java     |   6 +-
 .../ignite/internal/util/IgniteUtils.java       |  41 ++++++
 ...faultPageSizeBackwardsCompatibilityTest.java | 147 +++++++++++++++++++
 .../ignite/testsuites/IgnitePdsTestSuite.java   |   3 +
 28 files changed, 421 insertions(+), 160 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/91bbb7cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/91bbb7cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/91bbb7cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/91bbb7cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/91bbb7cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/91bbb7cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/91bbb7cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/91bbb7cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index e8893af,ea002f6..ddc5826
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@@ -49,7 -49,7 +49,7 @@@ import static org.apache.ignite.interna
   * Common code for tx prepare in optimistic and pessimistic modes.
   */
  public abstract class GridNearTxPrepareFutureAdapter extends
-     GridCacheCompoundFuture<Object, IgniteInternalTx> implements GridCacheMvccFuture<IgniteInternalTx>
{
 -    GridCacheCompoundFuture<GridNearTxPrepareResponse, IgniteInternalTx> implements
GridCacheVersionedFuture<IgniteInternalTx> {
++    GridCacheCompoundFuture<Object, IgniteInternalTx> implements GridCacheVersionedFuture<IgniteInternalTx>
{
      /** Logger reference. */
      protected static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/91bbb7cd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------


Mime
View raw message