You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2015/10/02 11:29:22 UTC
[18/50] ignite git commit: Merge remote-tracking branch
'remotes/apache-main/ignite-1.4' into ignite-801
Merge remote-tracking branch 'remotes/apache-main/ignite-1.4' into ignite-801
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2960c3d0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2960c3d0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2960c3d0
Branch: refs/heads/ignite-801
Commit: 2960c3d0a77928f49cece1c75ae63b2cf69a9e65
Parents: 4a24229 7752aa9
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Sep 28 12:52:35 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Sep 28 12:52:35 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 2 +
assembly/dependencies-fabric.xml | 2 +-
assembly/release-fabric.xml | 10 +-
examples/schema-import/pom-standalone.xml | 90 ++++
examples/schema-import/pom.xml | 23 +-
.../org/apache/ignite/IgniteAtomicLong.java | 2 +-
.../apache/ignite/cache/CacheAtomicityMode.java | 17 +-
.../configuration/CacheConfiguration.java | 15 +
.../apache/ignite/internal/IgniteKernal.java | 11 +-
.../discovery/GridDiscoveryManager.java | 2 +-
.../cache/DynamicCacheDescriptor.java | 10 +-
.../processors/cache/GridCacheAdapter.java | 8 +-
.../processors/cache/GridCacheContext.java | 6 +-
.../cache/GridCacheEvictionManager.java | 6 +-
.../cache/GridCacheEvictionResponse.java | 2 +-
.../processors/cache/GridCacheIoManager.java | 47 ++-
.../processors/cache/GridCacheMapEntry.java | 51 +--
.../processors/cache/GridCacheMessage.java | 7 +
.../processors/cache/GridCacheMvccManager.java | 34 +-
.../GridCachePartitionExchangeManager.java | 47 ++-
.../processors/cache/GridCacheProcessor.java | 56 ++-
.../cache/GridCacheSwapEntryImpl.java | 31 +-
.../processors/cache/GridCacheSwapManager.java | 80 ++--
.../processors/cache/IgniteCacheProxy.java | 4 +-
.../GridDistributedLockResponse.java | 6 +-
.../GridDistributedTxPrepareResponse.java | 6 +-
.../distributed/dht/GridDhtTopologyFuture.java | 6 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 12 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 16 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 2 +
.../atomic/GridNearAtomicUpdateResponse.java | 11 +-
.../colocated/GridDhtColocatedLockFuture.java | 44 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 2 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 6 +-
.../GridDhtPartitionsExchangeFuture.java | 19 +-
.../distributed/near/GridNearGetResponse.java | 6 +-
.../distributed/near/GridNearLockFuture.java | 26 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 20 +-
.../near/GridNearTxFinishResponse.java | 6 +-
.../query/GridCacheDistributedQueryFuture.java | 27 +-
.../cache/query/GridCacheLocalQueryFuture.java | 5 +
.../cache/query/GridCacheQueryAdapter.java | 170 +++++---
.../query/GridCacheQueryFutureAdapter.java | 11 +-
.../cache/query/GridCacheQueryManager.java | 30 +-
.../cache/query/GridCacheQueryResponse.java | 6 +-
.../continuous/CacheContinuousQueryHandler.java | 12 +-
.../continuous/CacheContinuousQueryManager.java | 66 ++-
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../continuous/GridContinuousProcessor.java | 3 +-
.../datastreamer/DataStreamerImpl.java | 2 -
.../ignite/internal/util/GridSpinBusyLock.java | 10 +
.../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +-
.../communication/tcp/TcpCommunicationSpi.java | 7 +-
.../discovery/DiscoverySpiCustomMessage.java | 12 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 410 +++++++++++++------
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 94 ++---
.../messages/TcpDiscoveryDiscardMessage.java | 15 +-
.../TcpDiscoveryNodeAddFinishedMessage.java | 2 +-
.../messages/TcpDiscoveryNodeAddedMessage.java | 19 +-
.../GridCacheAbstractRemoveFailureTest.java | 6 +-
.../IgniteCacheEntryListenerAbstractTest.java | 65 ++-
.../IgniteCacheEntryProcessorNodeJoinTest.java | 24 +-
.../distributed/CacheAffinityEarlyTest.java | 168 ++++++++
.../IgniteCachePutRetryAbstractSelfTest.java | 33 ++
...GridCacheValueConsistencyAtomicSelfTest.java | 2 +-
.../GridCacheSwapScanQueryAbstractSelfTest.java | 118 +++---
...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 ++++++
.../loadtests/hashmap/GridCacheTestContext.java | 4 +-
...lientDiscoverySpiFailureTimeoutSelfTest.java | 139 ++++++-
.../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 +++++++++++++-
.../ignite/testframework/GridTestUtils.java | 14 +-
.../testsuites/IgniteCacheTestSuite4.java | 2 +
.../processors/query/h2/IgniteH2Indexing.java | 19 +-
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 54 ++-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 11 +-
.../query/h2/opt/GridH2RowDescriptor.java | 5 +
.../processors/query/h2/opt/GridH2Table.java | 10 +-
.../cache/CacheIndexStreamerTest.java | 154 +++++++
...CacheScanPartitionQueryFallbackSelfTest.java | 224 +++-------
.../processors/cache/GridCacheSwapSelfTest.java | 4 +-
.../IgniteCacheQueryNodeRestartSelfTest2.java | 2 -
.../IgniteCacheQuerySelfTestSuite.java | 4 +-
.../IgniteCacheWithIndexingTestSuite.java | 2 +
.../Apache.Ignite.Core/Impl/IgniteManager.cs | 2 -
.../ignite/visor/commands/VisorConsole.scala | 37 +-
modules/yardstick/config/ignite-base-config.xml | 2 +-
pom.xml | 20 +-
93 files changed, 2431 insertions(+), 871 deletions(-)
----------------------------------------------------------------------