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 2014/12/16 16:12:20 UTC
[17/18] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1' into ignite-41
Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-41
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e85a9385
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e85a9385
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e85a9385
Branch: refs/heads/ignite-41
Commit: e85a9385ccfef3ac2343fab79f7edf340e798b2e
Parents: c2a5132 03c17b8
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 16 09:29:57 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 16 09:29:57 2014 +0300
----------------------------------------------------------------------
.../GridClientAbstractMultiNodeSelfTest.java | 9 +-
.../client/suite/GridClientTestSuite.java | 4 -
.../java/org/apache/ignite/IgniteCompute.java | 75 ++++++------
.../org/apache/ignite/IgniteTransactions.java | 20 +++-
.../grid/cache/GridCacheConfiguration.java | 115 ++-----------------
.../gridgain/grid/cache/GridCacheTxMetrics.java | 45 --------
.../grid/cache/GridCacheTxMetricsAdapter.java | 108 -----------------
.../gridgain/grid/cache/IgniteTxMetrics.java | 45 ++++++++
.../grid/cache/IgniteTxMetricsAdapter.java | 107 +++++++++++++++++
.../processors/cache/GridCacheAdapter.java | 108 +++--------------
.../processors/cache/GridCacheAttributes.java | 40 -------
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../GridCachePartitionExchangeManager.java | 23 ++--
.../processors/cache/GridCacheProcessor.java | 16 ---
.../cache/GridCacheSharedContext.java | 14 ++-
.../processors/cache/GridCacheStoreManager.java | 11 +-
.../processors/cache/GridCacheTxAdapter.java | 36 +++++-
.../kernal/processors/cache/GridCacheTxEx.java | 8 +-
.../processors/cache/GridCacheTxHandler.java | 10 +-
.../cache/GridCacheTxLocalAdapter.java | 31 ++---
.../processors/cache/GridCacheTxManager.java | 20 +++-
.../distributed/dht/GridDhtCacheEntryImpl.java | 2 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 2 +
.../distributed/dht/GridDhtTxFinishFuture.java | 1 -
.../distributed/dht/GridDhtTxLocalAdapter.java | 29 ++---
.../colocated/GridDhtColocatedLockFuture.java | 2 +-
.../preloader/GridDhtPartitionDemandPool.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 6 +-
.../distributed/near/GridNearLockFuture.java | 2 +-
.../distributed/near/GridNearLockRequest.java | 25 ++++
.../cache/distributed/near/GridNearTxLocal.java | 15 ++-
.../near/GridNearTxPrepareFuture.java | 38 +++++-
.../processors/cache/local/GridLocalTx.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 101 ++++++++++++++--
.../handlers/cache/GridCacheCommandHandler.java | 1 -
.../visor/cache/VisorCacheDgcConfiguration.java | 4 -
.../ipc/shmem/GridIpcSharedMemorySpace.java | 1 -
.../tcp/GridCacheDhtLockBackupSelfTest.java | 7 --
.../GridDeploymentMessageCountSelfTest.java | 2 +-
.../GridCacheAbstractFailoverSelfTest.java | 2 -
.../cache/GridCacheAbstractMetricsSelfTest.java | 9 +-
.../GridCacheAbstractProjectionSelfTest.java | 4 +-
.../GridCacheAbstractRemoveFailureTest.java | 9 --
.../GridCacheGroupLockAbstractSelfTest.java | 49 +++-----
.../GridCacheGroupLockFailoverSelfTest.java | 3 -
...HeapMultiThreadedUpdateAbstractSelfTest.java | 2 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 3 -
.../GridCacheReferenceCleanupSelfTest.java | 3 +-
...cheTransactionalAbstractMetricsSelfTest.java | 32 ++++--
.../GridCacheTxSingleThreadedAbstractTest.java | 4 +-
...dCacheQueueMultiNodeConsistencySelfTest.java | 1 -
...dCachePartitionedQueueMultiNodeSelfTest.java | 1 -
...dCacheMultithreadedFailoverAbstractTest.java | 5 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 1 -
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 2 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 17 +--
...ockPartitionedMultiNodeAbstractSelfTest.java | 1 -
.../near/GridCacheNearMultiNodeSelfTest.java | 9 +-
.../near/GridCacheNearOneNodeSelfTest.java | 23 ++--
...titionedExplicitLockNodeFailureSelfTest.java | 1 -
...idCachePartitionedMultiNodeLockSelfTest.java | 1 -
...GridCachePartitionedNodeFailureSelfTest.java | 1 -
.../GridCachePartitionedNodeRestartTest.java | 1 -
...ePartitionedOptimisticTxNodeRestartTest.java | 1 -
.../GridCachePartitionedTxSalvageSelfTest.java | 2 -
.../near/GridCachePutArrayValueSelfTest.java | 2 -
.../GridCacheReplicatedPreloadSelfTest.java | 3 +-
.../GridCacheDistributedEvictionsSelfTest.java | 1 -
.../eviction/GridCacheEvictionAbstractTest.java | 2 +-
.../GridCacheEvictionFilterSelfTest.java | 2 +-
.../GridCacheEvictionTouchSelfTest.java | 4 +-
.../GridCacheLruNearEvictionPolicySelfTest.java | 2 +-
.../GridCacheRandomEvictionPolicySelfTest.java | 2 +-
...ridCacheContinuousQueryAbstractSelfTest.java | 1 -
.../GridDataLoaderProcessorSelfTest.java | 5 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 2 +-
.../GridCacheDataStructuresSelfTestSuite.java | 6 +-
.../GridCacheEvictionSelfTestSuite.java | 2 +-
.../GridCacheMetricsSelfTestSuite.java | 4 +-
.../bamboo/GridCacheFailoverTestSuite.java | 4 -
.../bamboo/GridDataGridTestSuite.java | 6 +-
.../testsuites/GridCacheQuerySelfTestSuite.java | 10 +-
.../cache/jta/GridCacheJtaManager.java | 1 +
83 files changed, 610 insertions(+), 727 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e85a9385/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e85a9385/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e85a9385/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e85a9385/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------