You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/04/10 14:14:10 UTC
[34/34] incubator-ignite git commit: Merge branches 'ignite-698' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-698
Merge branches 'ignite-698' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-698
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f05339d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f05339d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f05339d
Branch: refs/heads/ignite-698
Commit: 2f05339d29f4a0cf7cea23fcb191c20ce565ce84
Parents: 80ab23a 5be8db7
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Apr 10 13:59:00 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Apr 10 13:59:00 2015 +0300
----------------------------------------------------------------------
.../examples/MessagingExamplesSelfTest.java | 2 +-
.../java8/examples/BasicExamplesSelfTest.java | 3 +
.../java8/examples/CacheExamplesSelfTest.java | 4 +
.../examples/CheckpointExamplesSelfTest.java | 3 +
.../examples/ClusterGroupExampleSelfTest.java | 3 +-
.../examples/ContinuationExamplesSelfTest.java | 3 +
.../ContinuousMapperExamplesSelfTest.java | 4 +-
.../DeploymentExamplesMultiNodeSelfTest.java | 2 +
.../examples/DeploymentExamplesSelfTest.java | 2 +
.../HibernateL2CacheExampleSelfTest.java | 3 +
.../java8/examples/IgfsExamplesSelfTest.java | 3 +
.../examples/LifecycleExamplesSelfTest.java | 3 +
.../MemcacheRestExamplesMultiNodeSelfTest.java | 2 +
.../examples/MemcacheRestExamplesSelfTest.java | 2 +
.../examples/MessagingExamplesSelfTest.java | 4 +-
.../examples/MonteCarloExamplesSelfTest.java | 3 +
.../examples/SpringBeanExamplesSelfTest.java | 3 +
.../java8/examples/TaskExamplesSelfTest.java | 2 +
.../client/ClientReconnectionSelfTest.java | 67 +++---
.../ignite/codegen/MessageCodeGenerator.java | 1 -
.../java/org/apache/ignite/IgniteCache.java | 18 ++
.../configuration/CacheConfiguration.java | 68 ++++--
.../configuration/IgniteConfiguration.java | 19 --
.../internal/cluster/ClusterGroupAdapter.java | 150 ++++++++++--
.../discovery/GridDiscoveryManager.java | 26 +-
.../processors/cache/CacheMetricsImpl.java | 7 +-
.../processors/cache/CacheMetricsSnapshot.java | 223 +++++++++++++++++-
.../processors/cache/GridCacheContext.java | 58 ++++-
.../cache/GridCacheEvictionManager.java | 6 +-
.../cache/GridCacheExplicitLockSpan.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 6 +-
.../processors/cache/GridCacheMvcc.java | 2 +-
.../cache/GridCacheMvccCandidate.java | 50 +++-
.../processors/cache/GridCacheMvccManager.java | 44 +++-
.../processors/cache/GridCacheProcessor.java | 52 ++--
.../processors/cache/IgniteCacheProxy.java | 26 ++
.../distributed/GridDistributedCacheEntry.java | 12 +-
.../distributed/dht/GridDhtCacheEntry.java | 36 ++-
.../distributed/dht/GridDhtLockFuture.java | 18 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 14 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 22 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 2 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 30 ++-
.../distributed/dht/GridDhtTxPrepareFuture.java | 28 ++-
.../dht/colocated/GridDhtColocatedCache.java | 32 ++-
.../colocated/GridDhtColocatedLockFuture.java | 46 +++-
.../GridDhtPartitionsExchangeFuture.java | 39 ++-
.../distributed/near/GridNearCacheEntry.java | 10 +-
.../distributed/near/GridNearLockFuture.java | 13 +-
.../near/GridNearTxFinishFuture.java | 8 +-
.../cache/distributed/near/GridNearTxLocal.java | 7 +
.../near/GridNearTxPrepareFuture.java | 122 ++++++----
.../near/GridNearTxPrepareRequest.java | 64 +++--
.../cache/transactions/IgniteTxAdapter.java | 3 +-
.../cache/transactions/IgniteTxHandler.java | 120 +++++++---
.../transactions/IgniteTxLocalAdapter.java | 76 +++---
.../cache/transactions/IgniteTxManager.java | 7 +
.../internal/processors/igfs/IgfsAsyncImpl.java | 4 +-
.../ignite/internal/processors/igfs/IgfsEx.java | 4 +-
.../processors/igfs/IgfsFileWorker.java | 180 --------------
.../processors/igfs/IgfsFileWorkerBatch.java | 225 +++++++-----------
.../processors/igfs/IgfsFileWorkerTask.java | 32 ---
.../internal/processors/igfs/IgfsImpl.java | 150 +++++++-----
.../internal/processors/igfs/IgfsProcessor.java | 2 +-
.../internal/util/future/GridFutureAdapter.java | 20 +-
.../ignite/internal/util/worker/GridWorker.java | 6 +-
.../cache/VisorCacheQueryConfiguration.java | 9 -
.../spi/discovery/DiscoveryMetricsProvider.java | 10 +
.../discovery/tcp/TcpClientDiscoverySpi.java | 35 ++-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 45 +++-
.../tcp/internal/TcpDiscoveryNode.java | 76 +++++-
.../messages/TcpDiscoveryHeartbeatMessage.java | 65 +++++
.../GridCacheAffinityBackupsSelfTest.java | 15 +-
.../ignite/internal/GridProjectionSelfTest.java | 82 +++++++
.../ignite/internal/GridStartStopSelfTest.java | 8 +-
.../CacheMetricsForClusterGroupSelfTest.java | 236 +++++++++++++++++++
.../cache/GridCacheBasicApiAbstractTest.java | 4 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 42 ++--
.../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +-
.../cache/GridCacheReloadSelfTest.java | 3 +-
.../GridCacheReturnValueTransferSelfTest.java | 15 +-
.../IgniteTxMultiThreadedAbstractTest.java | 5 +-
...GridCacheQueueMultiNodeAbstractSelfTest.java | 5 +-
.../GridCacheSetAbstractSelfTest.java | 10 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 6 +-
.../distributed/GridCacheEventAbstractTest.java | 16 +-
.../GridCacheNodeFailureAbstractTest.java | 15 +-
.../dht/IgniteCacheLockFailoverSelfTest.java | 156 ++++++++++++
.../dht/IgniteCacheMultiTxLockSelfTest.java | 219 +++++++++++++++++
...licatedNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
.../continuous/GridEventConsumeSelfTest.java | 7 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 24 +-
.../tostring/GridToStringBuilderSelfTest.java | 5 +-
.../GridP2PMissedResourceCacheSizeSelfTest.java | 2 +-
.../tcp/TcpClientDiscoverySelfTest.java | 5 +-
.../testframework/junits/GridAbstractTest.java | 6 +-
.../junits/common/GridCommonAbstractTest.java | 13 +-
.../junits/spi/GridSpiAbstractTest.java | 6 +
.../IgniteCacheMetricsSelfTestSuite.java | 4 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +
.../IgniteSpiDiscoverySelfTestSuite.java | 2 +
...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 2 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 10 +-
.../processors/cache/GridCacheSwapSelfTest.java | 5 +-
...CacheOffheapTieredMultithreadedSelfTest.java | 4 +-
...hePartitionedQueryMultiThreadedSelfTest.java | 2 +-
.../cache/IgniteCacheQueryIndexSelfTest.java | 3 +-
.../IgniteCachePartitionedQuerySelfTest.java | 5 +-
.../IgniteCacheReplicatedQuerySelfTest.java | 18 +-
.../IgniteCacheQuerySelfTestSuite.java | 1 +
.../processors/cache/GridCacheJtaSelfTest.java | 6 +-
.../p2p/GridP2PUserVersionChangeSelfTest.java | 8 +-
113 files changed, 2527 insertions(+), 909 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f05339d/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------