# i-695 merge sp-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8428193f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8428193f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8428193f Branch: refs/heads/ignite-695 Commit: 8428193ff273dfec1cf159819157e9179de0e2af Parents: 393be92 addc91b Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Jun 10 16:49:35 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Jun 10 16:49:35 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 42 +- .../client/memcache/MemcacheRestExample.java | 32 +- .../java/org/apache/ignite/IgniteCache.java | 41 +- .../apache/ignite/internal/IgniteKernal.java | 30 +- .../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 +- .../discovery/DiscoveryCustomMessage.java | 6 + .../discovery/GridDiscoveryManager.java | 60 +- .../managers/indexing/GridIndexingManager.java | 4 - .../affinity/GridAffinityAssignment.java | 12 + .../affinity/GridAffinityAssignmentCache.java | 9 +- .../affinity/GridAffinityProcessor.java | 23 +- .../cache/DynamicCacheChangeBatch.java | 19 +- .../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 | 38 +- .../dht/atomic/GridDhtAtomicCache.java | 22 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +- .../dht/preloader/GridDhtForceKeysFuture.java | 40 +- .../GridDhtPartitionsExchangeFuture.java | 64 ++- .../transactions/IgniteTxLocalAdapter.java | 28 + .../cache/transactions/IgniteTxManager.java | 3 - .../continuous/AbstractContinuousMessage.java | 9 + .../continuous/GridContinuousProcessor.java | 2 + .../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/GridNioDelimitedBuffer.java | 2 +- .../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 +- .../visor/node/VisorNodeDataCollectorTask.java | 9 +- .../node/VisorNodeDataCollectorTaskResult.java | 17 +- .../node/VisorNodeSuppressedErrorsTask.java | 12 +- .../internal/visor/query/VisorQueryJob.java | 11 +- .../internal/visor/query/VisorQueryTask.java | 3 +- .../visor/util/VisorExceptionWrapper.java | 81 +++ .../internal/visor/util/VisorTaskUtils.java | 6 +- .../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 | 16 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 158 +----- .../RoundRobinGlobalLoadBalancer.java | 2 +- ...acheReadOnlyTransactionalClientSelfTest.java | 327 +++++++++++ .../cache/GridCacheAbstractFullApiSelfTest.java | 83 +++ .../GridCacheExAbstractFullApiSelfTest.java | 103 ---- .../IgniteCountDownLatchAbstractSelfTest.java | 102 ++++ .../GridCacheExColocatedFullApiSelfTest.java | 33 -- .../near/GridCacheExNearFullApiSelfTest.java | 39 -- .../GridCacheExReplicatedFullApiSelfTest.java | 33 -- .../IgniteCacheClientNearCacheExpiryTest.java | 103 ++++ .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../local/GridCacheExLocalFullApiSelfTest.java | 30 - .../continuous/GridEventConsumeSelfTest.java | 7 +- .../DataStreamerMultiThreadedSelfTest.java | 59 +- .../DataStreamerMultinodeCreateCacheTest.java | 97 ++++ .../nio/GridNioDelimitedBufferSelfTest.java | 112 ++++ .../util/nio/GridNioDelimitedBufferTest.java | 112 ---- .../internal/util/nio/GridNioSelfTest.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../IgniteMessagingWithClientTest.java | 2 + .../GridTcpCommunicationSpiAbstractTest.java | 4 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 2 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../discovery/AbstractDiscoverySelfTest.java | 13 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 25 + .../stream/socket/SocketStreamerSelfTest.java | 29 +- .../testframework/GridSpiTestContext.java | 10 + .../ignite/testframework/GridTestUtils.java | 2 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../IgniteCacheFullApiSelfTestSuite.java | 6 - .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite4.java | 2 + .../testsuites/IgniteStreamSelfTestSuite.java | 39 ++ .../testsuites/IgniteStreamTestSuite.java | 39 -- .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- .../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 + .../cache/GridCacheOffheapIndexGetSelfTest.java | 62 ++- 124 files changed, 2973 insertions(+), 1934 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8428193f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java index 0754a5a,5fa3283..8ceb7e7 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java @@@ -130,16 -130,10 +130,10 @@@ public class IgniteCacheFullApiSelfTest suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedNearDisabledAtomicOffHeapTieredMultiNodeFullApiSelfTest.class); - // Private cache API. - suite.addTestSuite(GridCacheExLocalFullApiSelfTest.class); - suite.addTestSuite(GridCacheExReplicatedFullApiSelfTest.class); - suite.addTestSuite(GridCacheExNearFullApiSelfTest.class); - suite.addTestSuite(GridCacheExColocatedFullApiSelfTest.class); - -// Multithreaded // TODO: GG-708 -// suite.addTestSuite(GridCacheLocalFullApiMultithreadedSelfTest.class); -// suite.addTestSuite(GridCacheReplicatedFullApiMultithreadedSelfTest.class); -// suite.addTestSuite(GridCachePartitionedFullApiMultithreadedSelfTest.class); + // Multithreaded + suite.addTestSuite(GridCacheLocalFullApiMultithreadedSelfTest.class); + suite.addTestSuite(GridCacheReplicatedFullApiMultithreadedSelfTest.class); + suite.addTestSuite(GridCachePartitionedFullApiMultithreadedSelfTest.class); return suite; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8428193f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8428193f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ----------------------------------------------------------------------
