Merge branch 'master' into ignite-2236
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d8e304d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d8e304d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d8e304d Branch: refs/heads/ignite-2236 Commit: 7d8e304d9014869cd71e4470d5faeea9a6c1523a Parents: 0ca561a d881417 Author: vozerov-gridgain <[email protected]> Authored: Mon Jan 18 11:24:24 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Mon Jan 18 11:24:24 2016 +0300 ---------------------------------------------------------------------- assembly/release-fabric-base.xml | 1 + .../org/apache/ignite/IgniteTransactions.java | 4 +- .../org/apache/ignite/igfs/IgfsUserContext.java | 16 +- .../igfs/secondary/IgfsSecondaryFileSystem.java | 14 - .../apache/ignite/internal/GridComponent.java | 5 +- .../ignite/internal/GridUpdateNotifier.java | 454 ----- .../apache/ignite/internal/IgniteKernal.java | 248 +-- .../ignite/internal/IgniteVersionUtils.java | 4 +- .../ignite/internal/MarshallerContextImpl.java | 86 +- .../ignite/internal/binary/BinaryUtils.java | 78 + .../internal/cluster/ClusterGroupAdapter.java | 10 +- .../internal/direct/DirectMessageReader.java | 11 + .../internal/direct/DirectMessageWriter.java | 13 + .../direct/state/DirectMessageState.java | 10 + .../stream/v1/DirectByteBufferStreamImplV1.java | 8 + .../stream/v2/DirectByteBufferStreamImplV2.java | 8 + .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/DiscoveryCustomMessage.java | 9 - .../discovery/GridDiscoveryManager.java | 58 +- .../loadbalancer/GridLoadBalancerManager.java | 8 +- .../cache/CacheEntrySerializablePredicate.java | 3 +- .../cache/CacheInvokeDirectResult.java | 4 +- .../processors/cache/CacheObjectContext.java | 91 +- .../cache/DynamicCacheChangeBatch.java | 5 - .../processors/cache/GridCacheAdapter.java | 14 +- .../processors/cache/GridCacheContext.java | 3 +- .../cache/GridCacheEvictionManager.java | 5 +- .../processors/cache/GridCacheIoManager.java | 28 +- .../processors/cache/GridCacheIterator.java | 4 +- .../processors/cache/GridCacheKeySet.java | 2 +- .../GridCachePartitionExchangeManager.java | 12 +- .../processors/cache/GridCacheProcessor.java | 103 +- .../processors/cache/GridCacheReturn.java | 2 + .../processors/cache/GridCacheSwapManager.java | 7 +- .../processors/cache/GridCacheUtils.java | 92 - .../cache/GridCacheValueCollection.java | 5 +- .../processors/cache/IgniteCacheProxy.java | 6 +- .../binary/CacheObjectBinaryProcessorImpl.java | 33 +- .../GridDistributedLockResponse.java | 2 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java | 2 +- .../GridDistributedTxPrepareResponse.java | 4 +- .../dht/GridClientPartitionTopology.java | 3 +- .../dht/GridDhtAffinityAssignmentResponse.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 44 +- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 3 +- .../dht/GridDhtTransactionalCacheAdapter.java | 3 +- .../distributed/dht/GridDhtTxFinishRequest.java | 90 +- .../dht/GridDhtTxFinishResponse.java | 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 1 + .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 5 +- .../dht/GridDhtTxPrepareRequest.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 21 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 21 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 22 +- .../atomic/GridNearAtomicUpdateResponse.java | 4 +- .../dht/preloader/GridDhtForceKeysFuture.java | 8 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionDemandMessage.java | 6 +- .../dht/preloader/GridDhtPartitionDemander.java | 11 +- .../GridDhtPartitionSupplyMessageV2.java | 6 +- .../GridDhtPartitionsExchangeFuture.java | 8 +- .../preloader/GridDhtPartitionsFullMessage.java | 2 +- .../GridDhtPartitionsSingleMessage.java | 4 +- .../distributed/near/GridNearCacheAdapter.java | 11 +- .../distributed/near/GridNearGetResponse.java | 4 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +- .../near/GridNearSingleGetResponse.java | 2 +- .../near/GridNearTxFinishFuture.java | 432 +++-- .../near/GridNearTxFinishRequest.java | 5 + .../near/GridNearTxFinishResponse.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 2 +- .../near/GridNearTxPrepareResponse.java | 4 +- .../local/atomic/GridLocalAtomicCache.java | 17 +- .../cache/query/GridCacheQueryRequest.java | 16 +- .../cache/query/GridCacheQueryResponse.java | 18 +- .../continuous/CacheContinuousQueryEntry.java | 70 +- .../cache/transactions/IgniteInternalTx.java | 6 + .../cache/transactions/IgniteTxAdapter.java | 23 +- .../cache/transactions/IgniteTxEntry.java | 11 +- .../cache/transactions/IgniteTxHandler.java | 26 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 20 + .../processors/cluster/ClusterProcessor.java | 174 ++ .../processors/cluster/GridUpdateNotifier.java | 457 +++++ .../continuous/AbstractContinuousMessage.java | 5 - .../continuous/GridContinuousProcessor.java | 13 +- .../datastreamer/DataStreamerRequest.java | 1 + .../datastructures/DataStructuresProcessor.java | 11 +- .../GridCacheAtomicStampedImpl.java | 5 +- .../processors/hadoop/HadoopPayloadAware.java | 28 + .../processors/igfs/IgfsAckMessage.java | 4 +- .../ignite/internal/processors/igfs/IgfsEx.java | 13 - .../internal/processors/igfs/IgfsImpl.java | 16 +- .../internal/processors/igfs/IgfsPaths.java | 62 +- .../internal/processors/igfs/IgfsProcessor.java | 8 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 11 - .../dotnet/PlatformDotNetCacheStore.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 6 +- .../top/GridTopologyCommandHandler.java | 3 +- .../org/apache/ignite/internal/util/F0.java | 325 +++- .../internal/util/GridExecutionStatistics.java | 4 +- .../ignite/internal/util/GridStringBuilder.java | 19 + .../ignite/internal/util/IgniteUtils.java | 14 +- .../ignite/internal/util/lang/GridFunc.java | 1764 ++++++++++++++---- .../ignite/internal/util/lang/GridTuple3.java | 1 + .../ignite/internal/util/lang/GridTuple4.java | 1 + .../ignite/internal/util/lang/GridTuple5.java | 1 + .../ignite/internal/util/lang/GridTuple6.java | 1 + .../ignite/internal/util/lang/GridTupleV.java | 1 + .../internal/util/nio/GridDirectParser.java | 52 +- .../visor/node/VisorIgfsConfiguration.java | 43 - .../java/org/apache/ignite/lang/IgniteUuid.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 9 +- .../ignite/spi/discovery/DiscoverySpi.java | 2 + .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 14 +- .../memory/MemoryEventStorageSpi.java | 1 - .../ignite/stream/socket/SocketStreamer.java | 3 +- .../internal/GridUpdateNotifierSelfTest.java | 137 -- ...UpdateNotifierPerClusterSettingSelfTest.java | 130 ++ .../binary/BinaryMarshallerSelfTest.java | 44 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 13 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../cache/GridCacheDeploymentSelfTest.java | 3 +- .../cache/GridCacheLuceneQueryIndexTest.java | 4 +- .../processors/cache/GridCacheStopSelfTest.java | 2 +- ...IgniteCacheGetCustomCollectionsSelfTest.java | 128 ++ ...gniteCacheLoadRebalanceEvictionSelfTest.java | 188 ++ .../cache/IgniteDynamicCacheStartSelfTest.java | 30 +- ...niteDynamicCacheStartStopConcurrentTest.java | 119 ++ ...eMarshallerCacheConcurrentReadWriteTest.java | 189 ++ .../IgniteClientDataStructuresAbstractTest.java | 3 + .../distributed/GridCacheEventAbstractTest.java | 2 +- .../dht/GridCacheTxNodeFailureSelfTest.java | 13 +- .../IgniteCacheCommitDelayTxRecoveryTest.java | 376 ++++ .../IgniteCachePutRetryAbstractSelfTest.java | 36 +- ...gniteCachePutRetryTransactionalSelfTest.java | 21 + .../cluster/GridUpdateNotifierSelfTest.java | 140 ++ .../continuous/GridEventConsumeSelfTest.java | 3 + .../processors/igfs/IgfsAbstractSelfTest.java | 8 +- .../igfs/IgfsExUniversalFileSystemAdapter.java | 11 +- .../igfs/UniversalFileSystemAdapter.java | 5 +- .../IpcSharedMemoryCrashDetectionSelfTest.java | 16 +- .../internal/util/nio/GridNioSelfTest.java | 11 +- .../ignite/lang/GridBasicPerformanceTest.java | 10 +- .../ignite/lang/GridFuncPerformanceTest.java | 102 + .../ignite/loadtest/GridLoadTestStatistics.java | 2 +- .../platform/PlatformComputeEchoTask.java | 6 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 1 - ...CommunicationRecoveryAckClosureSelfTest.java | 19 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 + .../startup/GridRandomCommandLineLoader.java | 4 +- .../ignite/testframework/GridTestUtils.java | 27 + .../junits/common/GridCommonAbstractTest.java | 34 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../testsuites/IgniteCacheTestSuite4.java | 7 + .../testsuites/IgniteCacheTestSuite5.java | 2 + .../IgniteCacheTxRecoverySelfTestSuite.java | 3 + .../testsuites/IgniteKernalSelfTestSuite.java | 4 +- .../hadoop/fs/BasicHadoopFileSystemFactory.java | 209 +++ .../fs/CachingHadoopFileSystemFactory.java | 86 + .../hadoop/fs/HadoopFileSystemFactory.java | 52 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 264 +-- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 144 +- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 115 +- .../processors/hadoop/HadoopClassLoader.java | 689 +++++-- .../hadoop/SecondaryFileSystemProvider.java | 139 -- .../hadoop/fs/HadoopFileSystemCacheUtils.java | 8 +- .../hadoop/fs/HadoopLazyConcurrentMap.java | 5 +- .../hadoop/v2/HadoopNativeCodeLoader.java | 74 - .../ignite/igfs/Hadoop1DualAbstractTest.java | 14 +- .../igfs/HadoopFIleSystemFactorySelfTest.java | 326 ++++ ...oopFileSystemUniversalFileSystemAdapter.java | 53 +- ...oopSecondaryFileSystemConfigurationTest.java | 27 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 71 +- .../hadoop/HadoopAbstractWordCountTest.java | 46 +- .../hadoop/HadoopClassLoaderTest.java | 101 +- .../hadoop/HadoopMapReduceEmbeddedSelfTest.java | 2 +- .../processors/hadoop/HadoopMapReduceTest.java | 15 +- .../hadoop/HadoopSnappyFullMapReduceTest.java | 28 + .../processors/hadoop/HadoopSnappyTest.java | 102 + .../processors/hadoop/HadoopTasksV2Test.java | 2 +- .../hadoop/deps/CircularWIthHadoop.java | 32 + .../hadoop/deps/CircularWithoutHadoop.java | 27 + .../processors/hadoop/deps/WithCast.java | 41 + .../hadoop/deps/WithClassAnnotation.java | 28 + .../hadoop/deps/WithConstructorInvocation.java | 31 + .../processors/hadoop/deps/WithExtends.java | 27 + .../processors/hadoop/deps/WithField.java | 29 + .../processors/hadoop/deps/WithImplements.java | 36 + .../hadoop/deps/WithIndirectField.java | 27 + .../processors/hadoop/deps/WithInitializer.java | 33 + .../processors/hadoop/deps/WithInnerClass.java | 31 + .../hadoop/deps/WithLocalVariable.java | 38 + .../hadoop/deps/WithMethodAnnotation.java | 32 + .../hadoop/deps/WithMethodArgument.java | 31 + .../hadoop/deps/WithMethodCheckedException.java | 31 + .../hadoop/deps/WithMethodInvocation.java | 31 + .../hadoop/deps/WithMethodReturnType.java | 31 + .../hadoop/deps/WithMethodRuntimeException.java | 31 + .../processors/hadoop/deps/WithOuterClass.java | 38 + .../hadoop/deps/WithParameterAnnotation.java | 31 + .../processors/hadoop/deps/WithStaticField.java | 29 + .../hadoop/deps/WithStaticInitializer.java | 34 + .../processors/hadoop/deps/Without.java | 25 + .../hadoop/examples/HadoopWordCount1Reduce.java | 1 + .../hadoop/examples/HadoopWordCount2.java | 18 +- .../examples/HadoopWordCount2Reducer.java | 1 + .../testsuites/IgniteHadoopTestSuite.java | 24 +- .../query/h2/opt/GridH2TreeIndex.java | 4 +- modules/storm/README.txt | 37 + modules/storm/licenses/apache-2.0.txt | 202 ++ modules/storm/pom.xml | 104 ++ .../ignite/stream/storm/StormStreamer.java | 304 +++ .../ignite/stream/storm/package-info.java | 22 + .../storm/IgniteStormStreamerSelfTestSuite.java | 38 + .../storm/StormIgniteStreamerSelfTest.java | 184 ++ .../ignite/stream/storm/TestStormSpout.java | 141 ++ .../storm/src/test/resources/example-ignite.xml | 71 + .../yardstick/cache/IgniteGetTxBenchmark.java | 30 + .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 69 +- pom.xml | 1 + 225 files changed, 9255 insertions(+), 2688 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7d8e304d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7d8e304d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7d8e304d/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ----------------------------------------------------------------------
