Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-961
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eef697e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eef697e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eef697e8 Branch: refs/heads/ignite-961 Commit: eef697e810e3555945070132f6a0671be4ad0da2 Parents: d36b5be 14bb076 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Jun 9 11:40:38 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Jun 9 11:40:38 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 42 +- .../java/org/apache/ignite/IgniteCache.java | 16 + .../configuration/CacheConfiguration.java | 13 +- .../apache/ignite/internal/IgniteKernal.java | 28 +- .../ignite/internal/IgniteNodeAttributes.java | 5 +- .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../internal/MarshallerContextAdapter.java | 36 +- .../internal/managers/GridManagerAdapter.java | 9 + .../checkpoint/GridCheckpointManager.java | 52 +- .../managers/communication/GridIoManager.java | 117 ++-- .../discovery/GridDiscoveryManager.java | 28 +- .../affinity/GridAffinityProcessor.java | 23 +- .../cache/DynamicCacheDescriptor.java | 17 + .../processors/cache/GridCacheAdapter.java | 21 +- .../processors/cache/GridCacheContext.java | 13 + .../GridCachePartitionExchangeManager.java | 26 +- .../processors/cache/GridCacheProcessor.java | 37 +- .../processors/cache/GridCacheProxyImpl.java | 14 +- .../processors/cache/GridCacheTtlManager.java | 9 +- .../processors/cache/IgniteCacheProxy.java | 23 + .../processors/cache/IgniteInternalCache.java | 11 +- .../dht/GridClientPartitionTopology.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 8 +- .../dht/atomic/GridDhtAtomicCache.java | 22 +- .../dht/preloader/GridDhtForceKeysFuture.java | 40 +- .../GridDhtPartitionsExchangeFuture.java | 69 ++- .../dht/preloader/GridDhtPreloader.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 28 + .../cache/transactions/IgniteTxManager.java | 3 - .../datastreamer/DataStreamerImpl.java | 92 ++- .../datastructures/DataStructuresProcessor.java | 107 +++- .../processors/hadoop/HadoopTaskContext.java | 14 +- .../processors/igfs/IgfsMetaManager.java | 2 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 2 +- .../service/GridServiceProcessor.java | 4 +- .../timeout/GridSpiTimeoutObject.java | 73 +++ .../timeout/GridTimeoutProcessor.java | 105 +++- .../IgniteTxRollbackCheckedException.java | 9 + .../util/nio/GridCommunicationClient.java | 30 +- .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../util/nio/GridTcpCommunicationClient.java | 554 ------------------- .../util/nio/GridTcpNioCommunicationClient.java | 8 - .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../VisorCacheConfigurationCollectorJob.java | 6 +- .../internal/visor/cache/VisorCacheMetrics.java | 19 +- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../cache/VisorCacheStoreConfiguration.java | 5 +- .../internal/visor/query/VisorQueryJob.java | 2 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 33 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 10 + .../ignite/spi/IgniteSpiTimeoutObject.java | 44 ++ .../spi/checkpoint/noop/NoopCheckpointSpi.java | 3 +- .../communication/tcp/TcpCommunicationSpi.java | 438 ++++----------- .../tcp/TcpCommunicationSpiMBean.java | 2 - .../ignite/spi/discovery/tcp/ClientImpl.java | 3 - .../ignite/spi/discovery/tcp/ServerImpl.java | 10 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 156 +----- ...acheReadOnlyTransactionalClientSelfTest.java | 327 +++++++++++ .../cache/GridCacheAbstractFullApiSelfTest.java | 83 +++ .../GridCacheExAbstractFullApiSelfTest.java | 103 ---- ...niteDynamicCacheWithConfigStartSelfTest.java | 97 ++++ .../IgniteCountDownLatchAbstractSelfTest.java | 102 ++++ .../GridCacheExColocatedFullApiSelfTest.java | 33 -- .../near/GridCacheExNearFullApiSelfTest.java | 39 -- .../GridCacheExReplicatedFullApiSelfTest.java | 33 -- .../IgniteCacheClientNearCacheExpiryTest.java | 103 ++++ .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../local/GridCacheExLocalFullApiSelfTest.java | 30 - .../DataStreamerMultiThreadedSelfTest.java | 59 +- .../DataStreamerMultinodeCreateCacheTest.java | 97 ++++ .../igfs/IgfsClientCacheSelfTest.java | 9 +- .../internal/util/nio/GridNioSelfTest.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../IgniteMessagingWithClientTest.java | 166 ++++++ .../GridTcpCommunicationSpiAbstractTest.java | 4 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 2 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../discovery/AbstractDiscoverySelfTest.java | 13 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 25 + .../testframework/GridSpiTestContext.java | 10 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../IgniteCacheFullApiSelfTestSuite.java | 6 - .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 3 + .../fs/IgniteHadoopFileSystemCounterWriter.java | 14 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 70 +-- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 2 +- .../processors/hadoop/HadoopDefaultJobInfo.java | 2 +- .../internal/processors/hadoop/HadoopUtils.java | 282 +++++++++- .../hadoop/SecondaryFileSystemProvider.java | 4 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 20 +- .../processors/hadoop/v2/HadoopV2Job.java | 31 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 26 +- .../hadoop/v2/HadoopV2TaskContext.java | 48 +- .../hadoop/HadoopClientProtocolSelfTest.java | 6 +- .../hadoop/HadoopAbstractSelfTest.java | 14 +- .../hadoop/HadoopCommandLineTest.java | 14 +- .../processors/hadoop/HadoopMapReduceTest.java | 176 +++++- .../hadoop/HadoopTaskExecutionSelfTest.java | 2 +- .../hadoop/HadoopTasksAllVersionsTest.java | 15 +- .../processors/hadoop/HadoopTasksV1Test.java | 5 +- .../processors/hadoop/HadoopTasksV2Test.java | 5 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 12 + ...acheConfigurationPrimitiveTypesSelfTest.java | 104 ++++ .../IgniteCacheWithIndexingTestSuite.java | 2 + .../commands/cache/VisorCacheScanCommand.scala | 2 +- 108 files changed, 2948 insertions(+), 1747 deletions(-) ----------------------------------------------------------------------
