Merge branch 'sprint-2' into ignite-217
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52704a73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52704a73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52704a73 Branch: refs/heads/ignite-sql-tests Commit: 52704a7393d36108f733f7ffcb50fd4f5eb373d4 Parents: 09dd499 4e57996 Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu Feb 26 12:28:50 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu Feb 26 12:28:50 2015 +0300 ---------------------------------------------------------------------- .../ComputeFibonacciContinuationExample.java | 17 +- .../datagrid/CacheContinuousQueryExample.java | 6 +- .../IgniteCountDownLatchExample.java | 3 +- .../MessagingPingPongListenActorExample.java | 3 +- .../examples/ScalarContinuationExample.scala | 20 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 10 +- .../internal/client/ClientStartNodeTask.java | 5 +- .../processors/rest/RestProcessorTest.java | 8 +- .../processors/rest/TestBinaryClient.java | 1 - .../processors/rest/TestMemcacheClient.java | 13 +- .../protocols/tcp/TcpRestParserSelfTest.java | 2 +- .../ignite/codegen/MessageCodeGenerator.java | 28 +- .../java/org/apache/ignite/IgniteCache.java | 69 + .../java/org/apache/ignite/IgniteCluster.java | 3 +- .../apache/ignite/IgniteSystemProperties.java | 5 + .../ignite/cache/IgniteEntryProcessor.java | 28 + .../CacheRendezvousAffinityFunction.java | 1 + .../cache/store/jdbc/CacheJdbcPojoStore.java | 28 +- .../ignite/cluster/ClusterNodeLocalMap.java | 60 - .../ignite/events/DiscoveryCustomEvent.java | 56 + .../org/apache/ignite/events/EventType.java | 12 + .../IgfsByteDelimiterRecordResolver.java | 1 + .../ignite/internal/ClusterMetricsSnapshot.java | 9 +- .../internal/GridEventConsumeHandler.java | 1 + .../ignite/internal/GridKernalContext.java | 8 + .../ignite/internal/GridKernalContextImpl.java | 11 + .../internal/GridMessageListenHandler.java | 1 + .../apache/ignite/internal/IgniteKernal.java | 6 + .../cluster/ClusterNodeLocalMapImpl.java | 27 +- .../cluster/IgniteClusterAsyncImpl.java | 3 +- .../internal/cluster/IgniteClusterImpl.java | 4 +- .../igfs/common/IgfsControlResponse.java | 1 + .../internal/igfs/common/IgfsMarshaller.java | 1 + .../internal/managers/GridManagerAdapter.java | 5 + .../discovery/GridDiscoveryManager.java | 78 +- .../affinity/GridAffinityMessage.java | 1 + .../processors/cache/GridCacheEntryInfo.java | 5 +- .../processors/cache/GridCacheMapEntry.java | 562 ++-- .../processors/cache/GridCacheSwapManager.java | 4 +- .../processors/cache/GridCacheUtils.java | 4 + .../processors/cache/IgniteCacheProxy.java | 63 + .../GridDistributedTxRemoteAdapter.java | 66 +- .../dht/atomic/GridDhtAtomicCache.java | 44 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 84 +- .../distributed/near/GridNearAtomicCache.java | 3 - .../query/GridCacheDistributedQueryManager.java | 4 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../continuous/CacheContinuousQueryEntry.java | 1 + .../continuous/CacheContinuousQueryHandler.java | 1 + .../cache/transactions/IgniteTxAdapter.java | 58 +- .../cache/transactions/IgniteTxEntry.java | 17 +- .../transactions/IgniteTxLocalAdapter.java | 48 +- .../version/GridCacheRawVersionedEntry.java | 1 + .../cache/version/GridCacheVersion.java | 3 +- .../GridCacheVersionConflictContext.java | 35 +- .../cache/version/GridCacheVersionEx.java | 2 +- .../processors/clock/GridClockMessage.java | 1 + .../dataload/GridDataLoaderProcessor.java | 2 +- .../datastructures/DataStructuresProcessor.java | 2 +- .../dr/GridDrDataLoadCacheUpdater.java | 6 +- .../processors/igfs/IgfsDataManager.java | 4 +- .../internal/processors/igfs/IgfsImpl.java | 6 +- .../processors/igfs/IgfsOutputStreamImpl.java | 4 +- .../internal/processors/igfs/IgfsServer.java | 1 + .../internal/processors/job/GridJobWorker.java | 2 +- .../processors/rest/GridRestResponse.java | 1 + .../message/GridClientAbstractMessage.java | 1 + .../message/GridClientHandshakeRequest.java | 1 + .../cache/GridCacheQueryCommandHandler.java | 7 +- .../protocols/tcp/GridMemcachedMessage.java | 3 +- .../rest/protocols/tcp/GridTcpRestParser.java | 10 +- .../processors/task/GridTaskWorker.java | 4 +- .../internal/util/IgniteExceptionRegistry.java | 259 ++ .../ignite/internal/util/IgniteUtils.java | 2569 ++++++++---------- .../nio/GridConnectionBytesVerifyFilter.java | 1 + .../util/nio/GridTcpCommunicationClient.java | 1 + .../apache/ignite/internal/util/typedef/X.java | 3 +- .../VisorComputeToggleMonitoringTask.java | 4 +- .../visor/node/VisorNodeDataCollectorJob.java | 4 +- .../node/VisorNodeEventsCollectorTask.java | 3 +- .../visor/query/VisorQueryCleanupTask.java | 4 +- .../visor/query/VisorQueryNextPageTask.java | 6 +- .../internal/visor/query/VisorQueryTask.java | 4 +- .../internal/visor/util/VisorTaskUtils.java | 45 +- .../ignite/lang/IgniteProductVersion.java | 1 + .../org/apache/ignite/mxbean/IgniteMXBean.java | 6 + .../org/apache/ignite/spi/IgniteSpiAdapter.java | 15 + .../org/apache/ignite/spi/IgniteSpiContext.java | 8 + .../ignite/spi/IgniteSpiThreadFactory.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 54 +- .../ignite/spi/discovery/DiscoverySpi.java | 7 + .../spi/discovery/DiscoverySpiListener.java | 11 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 7 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 136 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 3 + .../tcp/internal/TcpDiscoveryNode.java | 1 + .../TcpDiscoveryMulticastIpFinder.java | 1 + .../messages/TcpDiscoveryAuthFailedMessage.java | 1 + .../TcpDiscoveryCustomEventMessage.java | 66 + .../messages/TcpDiscoveryHeartbeatMessage.java | 1 + .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../core/src/main/resources/ignite.properties | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 43 + .../internal/GridEventStorageSelfTest.java | 3 +- .../GridJobMasterLeaveAwareSelfTest.java | 24 +- .../internal/GridMultipleJobsSelfTest.java | 2 +- .../ignite/internal/GridNodeLocalSelfTest.java | 4 +- .../GridTaskContinuousMapperSelfTest.java | 3 +- .../GridTaskExecutionContextSelfTest.java | 2 +- .../GridCheckpointManagerAbstractSelfTest.java | 20 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 101 +- .../GridCacheConcurrentTxMultiNodeTest.java | 13 +- .../cache/GridCachePutAllFailoverSelfTest.java | 5 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 33 +- ...cheAtomicReferenceMultiNodeAbstractTest.java | 12 +- .../GridCacheMultiNodeDataStructureTest.java | 3 +- ...dCacheSequenceMultiNodeAbstractSelfTest.java | 2 +- ...titionedAtomicSequenceMultiThreadedTest.java | 16 +- ...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +- .../GridCacheAbstractJobExecutionTest.java | 2 +- .../distributed/GridCacheEventAbstractTest.java | 4 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 6 +- .../dht/GridCacheDhtMultiBackupTest.java | 2 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 3 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 2 +- .../near/IgniteCacheNearReadCommittedTest.java | 3 + .../GridCacheRandomEvictionPolicySelfTest.java | 2 +- .../IgniteCacheLoaderWriterAbstractTest.java | 47 + .../closure/GridClosureProcessorSelfTest.java | 14 +- .../processors/igfs/IgfsAbstractSelfTest.java | 5 +- .../igfs/IgfsDataManagerSelfTest.java | 1 + .../processors/igfs/IgfsProcessorSelfTest.java | 3 +- .../streamer/GridStreamerEvictionSelfTest.java | 2 +- .../streamer/GridStreamerSelfTest.java | 2 +- .../util/IgniteExceptionRegistrySelfTest.java | 89 + .../internal/util/IgniteUtilsSelfTest.java | 6 +- .../internal/util/nio/GridRoundTripTest.java | 1 + .../offheap/GridOffHeapMapAbstractSelfTest.java | 1 + .../cache/GridCacheDataStructuresLoadTest.java | 36 +- .../loadtests/cache/GridCacheLoadTest.java | 6 +- .../loadtests/cache/GridCacheSwapLoadTest.java | 5 +- .../loadtests/colocation/GridTestMain.java | 3 +- .../communication/GridIoManagerBenchmark.java | 3 +- .../GridMultiSplitsRedeployLoadTest.java | 5 +- .../loadtests/discovery/GridGcTimeoutTest.java | 3 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 16 +- .../job/GridJobExecutionSingleNodeLoadTest.java | 2 +- .../mapper/GridContinuousMapperLoadTest1.java | 3 +- .../loadtests/mapper/GridNodeStartup.java | 3 +- .../mergesort/GridMergeSortLoadTest.java | 3 +- .../streamer/GridStreamerIndexLoadTest.java | 4 +- .../swap/GridSwapEvictAllBenchmark.java | 3 +- .../marshaller/GridMarshallerAbstractTest.java | 6 +- ...idSessionFutureWaitJobAttributeSelfTest.java | 3 +- .../GridSessionSetTaskAttributeSelfTest.java | 3 +- ...GridSessionTaskWaitJobAttributeSelfTest.java | 3 +- .../discovery/AbstractDiscoverySelfTest.java | 7 +- .../roundrobin/GridRoundRobinTestUtils.java | 6 +- .../file/GridFileSwapSpaceSpiSelfTest.java | 1 + .../index/GridStreamerIndexSelfTest.java | 17 +- .../window/GridStreamerWindowSelfTest.java | 3 +- .../testframework/GridSpiTestContext.java | 6 + .../junits/GridTestKernalContext.java | 2 + .../cache/GridAbstractCacheStoreSelfTest.java | 3 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- .../testsuites/IgniteUtilSelfTestSuite.java | 1 + .../tests/p2p/GridP2PAwareTestUserResource.java | 5 +- .../tests/p2p/GridTestMessageListener.java | 4 +- modules/hadoop/pom.xml | 10 - .../client/hadoop/GridHadoopClientProtocol.java | 3 +- .../internal/igfs/hadoop/IgfsHadoopWrapper.java | 2 +- .../hadoop/GridHadoopDefaultJobInfo.java | 5 +- .../processors/hadoop/GridHadoopSetup.java | 3 +- .../GridHadoopDefaultMapReducePlanner.java | 3 +- .../shuffle/GridHadoopShuffleMessage.java | 1 + .../taskexecutor/GridHadoopExecutorService.java | 2 +- .../hadoop/v2/GridHadoopSplitWrapper.java | 3 +- .../hadoop/GridHadoopGroupingTest.java | 10 +- .../hadoop/GridHadoopJobTrackerSelfTest.java | 2 +- .../hadoop/GridHadoopSortingTest.java | 9 +- .../processors/hadoop/GridHadoopStartup.java | 2 +- .../ignite/loadtests/igfs/IgfsNodeStartup.java | 3 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 2 +- .../GridCacheCrossCacheQuerySelfTestNewApi.java | 2 +- .../http/jetty/GridJettyRestHandler.java | 1 + .../p2p/GridP2PUserVersionChangeSelfTest.java | 4 +- ...gniteProjectionStartStopRestartSelfTest.java | 3 +- 187 files changed, 3172 insertions(+), 2373 deletions(-) ----------------------------------------------------------------------
