Merge branch 'ignite-2.1' into ignite-2.1.2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa21a9b5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa21a9b5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa21a9b5 Branch: refs/heads/ignite-2.1 Commit: aa21a9b59ec0266b4fee16e02d2796e6e0d1a9b5 Parents: 9743fa3 f9f13cf Author: devozerov <[email protected]> Authored: Wed Jul 5 14:18:32 2017 +0300 Committer: devozerov <[email protected]> Committed: Wed Jul 5 14:18:32 2017 +0300 ---------------------------------------------------------------------- .../jdbc2/JdbcPreparedStatementSelfTest.java | 35 + .../jdbc/JdbcPreparedStatementSelfTest.java | 35 + .../thin/JdbcThinPreparedStatementSelfTest.java | 35 + .../PersistentStoreConfiguration.java | 39 +- .../org/apache/ignite/events/EventType.java | 12 + .../ignite/events/WalSegmentArchivedEvent.java | 62 + .../apache/ignite/internal/GridComponent.java | 4 +- .../ignite/internal/GridPluginComponent.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 33 +- .../internal/jdbc/JdbcPreparedStatement.java | 6 +- .../internal/jdbc/thin/JdbcThinConnection.java | 7 +- .../jdbc/thin/JdbcThinPreparedStatement.java | 2 - .../internal/jdbc2/JdbcPreparedStatement.java | 12 +- .../internal/managers/GridManagerAdapter.java | 2 +- .../internal/managers/discovery/DiscoCache.java | 17 +- .../discovery/DiscoveryLocalJoinData.java | 104 ++ .../discovery/GridDiscoveryManager.java | 128 +- .../pagemem/store/IgnitePageStoreManager.java | 3 +- .../internal/pagemem/wal/record/WALRecord.java | 11 +- .../processors/GridProcessorAdapter.java | 2 +- .../cache/CacheAffinitySharedManager.java | 67 +- .../processors/cache/CacheGroupContext.java | 4 +- .../processors/cache/CacheGroupData.java | 4 +- .../cache/ChangeGlobalStateMessage.java | 120 -- .../processors/cache/ClusterCachesInfo.java | 493 +++++-- .../internal/processors/cache/ClusterState.java | 38 - .../cache/DynamicCacheChangeRequest.java | 52 +- .../processors/cache/ExchangeActions.java | 37 +- .../processors/cache/GridCacheEventManager.java | 2 - .../cache/GridCacheEvictionManager.java | 1 - .../processors/cache/GridCacheIoManager.java | 13 +- .../processors/cache/GridCacheMvccManager.java | 9 +- .../GridCachePartitionExchangeManager.java | 423 +++--- .../processors/cache/GridCacheProcessor.java | 193 +-- .../cache/GridCacheSharedContext.java | 60 +- .../cache/GridCacheSharedManager.java | 6 - .../cache/GridCacheSharedManagerAdapter.java | 16 - .../processors/cache/PendingDiscoveryEvent.java | 61 + .../processors/cache/StateChangeRequest.java | 77 ++ .../binary/CacheObjectBinaryProcessorImpl.java | 4 +- .../distributed/GridCacheTxRecoveryFuture.java | 1 - .../distributed/dht/GridDhtCacheAdapter.java | 1 - .../cache/distributed/dht/GridDhtGetFuture.java | 1 - .../distributed/dht/GridDhtGetSingleFuture.java | 2 - .../dht/GridDhtPartitionTopologyImpl.java | 13 +- .../dht/GridDhtTopologyFutureAdapter.java | 2 +- .../dht/GridPartitionedSingleGetFuture.java | 3 - .../GridNearAtomicAbstractUpdateFuture.java | 1 - .../dht/preloader/GridDhtForceKeysFuture.java | 1 - .../dht/preloader/GridDhtPartitionDemander.java | 2 + .../GridDhtPartitionsExchangeFuture.java | 228 +++- .../preloader/GridDhtPartitionsFullMessage.java | 44 +- .../GridDhtPartitionsSingleMessage.java | 38 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearGetFuture.java | 2 - .../near/GridNearTxPrepareRequest.java | 1 - .../GridCacheDatabaseSharedManager.java | 111 +- .../persistence/GridCacheOffheapManager.java | 5 +- .../IgniteCacheDatabaseSharedManager.java | 74 +- .../persistence/IgniteCacheSnapshotManager.java | 20 +- .../persistence/file/FilePageStoreManager.java | 14 +- .../persistence/tree/io/TrackingPageIO.java | 12 +- .../wal/AbstractWalRecordsIterator.java | 289 ++++ .../cache/persistence/wal/FileInput.java | 16 +- .../cache/persistence/wal/FileWALPointer.java | 4 +- .../wal/FileWriteAheadLogManager.java | 594 ++++---- .../cache/persistence/wal/RecordSerializer.java | 5 + .../persistence/wal/SegmentArchiveResult.java | 61 + .../persistence/wal/SegmentEofException.java | 3 +- .../wal/reader/IgniteWalIteratorFactory.java | 102 ++ .../wal/reader/StandaloneGridKernalContext.java | 499 +++++++ ...ndaloneIgniteCacheDatabaseSharedManager.java | 30 + .../reader/StandaloneWalRecordsIterator.java | 258 ++++ .../wal/serializer/RecordV1Serializer.java | 45 +- .../query/GridCacheDistributedQueryManager.java | 4 +- .../store/GridCacheStoreManagerAdapter.java | 1 - .../cache/version/GridCacheVersionManager.java | 6 - .../cacheobject/IgniteCacheObjectProcessor.java | 5 - .../IgniteCacheObjectProcessorImpl.java | 5 - .../cluster/ChangeGlobalStateFinishMessage.java | 86 ++ .../cluster/ChangeGlobalStateMessage.java | 140 ++ .../processors/cluster/ClusterProcessor.java | 3 +- .../cluster/DiscoveryDataClusterState.java | 157 +++ .../cluster/GridClusterStateProcessor.java | 1129 ++++++--------- .../cluster/IgniteChangeGlobalStateSupport.java | 3 +- .../datastructures/DataStructuresProcessor.java | 6 +- .../datastructures/GridCacheAtomicLongImpl.java | 2 +- .../GridCacheAtomicReferenceImpl.java | 2 +- .../GridCacheAtomicSequenceImpl.java | 2 +- .../GridCacheAtomicStampedImpl.java | 2 +- .../GridCacheCountDownLatchImpl.java | 2 +- .../datastructures/GridCacheLockImpl.java | 4 +- .../datastructures/GridCacheQueueAdapter.java | 1 - .../datastructures/GridCacheSemaphoreImpl.java | 2 +- .../datastructures/GridCacheSetImpl.java | 1 - .../internal/processors/igfs/IgfsImpl.java | 2 - .../internal/processors/igfs/IgfsProcessor.java | 2 +- .../utils/PlatformConfigurationUtils.java | 8 +- .../processors/query/GridQueryProcessor.java | 4 +- .../processors/rest/GridRestProcessor.java | 2 +- .../cluster/GridChangeStateCommandHandler.java | 2 +- .../service/GridServiceProcessor.java | 6 +- .../processors/task/GridTaskProcessor.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 10 +- .../internal/TestRecordingCommunicationSpi.java | 10 + ...GridManagerLocalMessageListenerSelfTest.java | 4 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 24 - .../cache/IgniteActiveClusterTest.java | 182 --- .../IgniteClusterActivateDeactivateTest.java | 1284 ++++++++++++++++++ ...erActivateDeactivateTestWithPersistence.java | 197 +++ .../IgniteDaemonNodeMarshallerCacheTest.java | 10 - .../IgniteSemaphoreAbstractSelfTest.java | 17 +- ...IgnitePersistentStoreDataStructuresTest.java | 2 + .../wal/IgniteWalHistoryReservationsTest.java | 2 +- .../db/wal/reader/IgniteWalReaderTest.java | 385 ++++++ .../db/wal/reader/MockWalIteratorFactory.java | 114 ++ .../pagemem/NoOpPageStoreManager.java | 12 +- .../persistence/pagemem/NoOpWALManager.java | 23 +- .../AbstractNodeJoinTemplate.java | 149 +- .../IgniteChangeGlobalStateAbstractTest.java | 65 +- .../IgniteChangeGlobalStateCacheTest.java | 2 +- ...IgniteChangeGlobalStateDataStreamerTest.java | 5 +- ...gniteChangeGlobalStateDataStructureTest.java | 6 +- .../IgniteChangeGlobalStateFailOverTest.java | 26 +- .../IgniteChangeGlobalStateTest.java | 158 +-- .../IgniteStandByClusterTest.java | 17 +- .../join/JoinActiveNodeToActiveCluster.java | 62 +- ...ctiveNodeToActiveClusterWithPersistence.java | 17 + .../IgniteStandByClientReconnectTest.java | 13 +- ...eStandByClientReconnectToNewClusterTest.java | 13 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../junits/common/GridCommonAbstractTest.java | 3 + .../ignite/testsuites/IgnitePdsTestSuite2.java | 9 +- .../testsuites/IgniteStandByClusterSuite.java | 5 +- .../processors/hadoop/HadoopProcessor.java | 4 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 3 +- .../Cache/CacheConfigurationTest.cs | 21 + .../Apache.Ignite.Core.Tests/EventsTest.cs | 19 +- .../Cache/Configuration/CacheConfiguration.cs | 75 +- .../Apache.Ignite.Core/IgniteConfiguration.cs | 7 +- .../Impl/Events/RemoteListenEventFilter.cs | 3 + 143 files changed, 6651 insertions(+), 2631 deletions(-) ----------------------------------------------------------------------
