Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1c2081d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1c2081d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1c2081d Branch: refs/heads/ignite-2324 Commit: c1c2081dfea07cb19dd4711c71b6cce249bd559d Parents: 0567703 09c1d5e Author: Denis Magda <[email protected]> Authored: Wed Jan 20 11:07:48 2016 +0300 Committer: Denis Magda <[email protected]> Committed: Wed Jan 20 11:07:48 2016 +0300 ---------------------------------------------------------------------- .../internal/GridEventConsumeHandler.java | 3 +- .../internal/GridMessageListenHandler.java | 6 +- .../internal/binary/BinaryClassDescriptor.java | 15 +- .../internal/binary/BinaryEnumObjectImpl.java | 3 +- .../ignite/internal/binary/BinaryUtils.java | 78 ++++ .../internal/direct/DirectMessageReader.java | 11 + .../internal/direct/DirectMessageWriter.java | 18 + .../direct/state/DirectMessageState.java | 10 + .../stream/v1/DirectByteBufferStreamImplV1.java | 10 + .../stream/v2/DirectByteBufferStreamImplV2.java | 10 + .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/DiscoveryCustomMessage.java | 9 - .../discovery/GridDiscoveryManager.java | 35 +- .../processors/cache/CacheObjectContext.java | 91 ++-- .../cache/DynamicCacheChangeBatch.java | 5 - .../processors/cache/GridCacheAdapter.java | 30 +- .../processors/cache/GridCacheContext.java | 33 ++ .../processors/cache/GridCacheProcessor.java | 42 +- .../binary/CacheObjectBinaryProcessorImpl.java | 33 +- .../dht/CacheDistributedGetFutureAdapter.java | 28 +- .../dht/GridClientPartitionTopology.java | 2 + .../dht/GridDhtPartitionTopologyImpl.java | 27 +- .../dht/GridPartitionedGetFuture.java | 241 ++++++----- .../dht/GridPartitionedSingleGetFuture.java | 229 ++++++---- .../dht/atomic/GridDhtAtomicCache.java | 26 ++ .../colocated/GridDhtColocatedLockFuture.java | 4 - .../dht/preloader/GridDhtPartitionDemander.java | 11 +- .../GridDhtPartitionsExchangeFuture.java | 8 +- .../distributed/near/GridNearGetFuture.java | 267 +++++++----- .../continuous/CacheContinuousQueryHandler.java | 36 +- .../cache/transactions/IgniteTxManager.java | 18 +- .../continuous/AbstractContinuousMessage.java | 10 +- .../continuous/GridContinuousHandler.java | 4 +- .../continuous/GridContinuousProcessor.java | 26 +- .../internal/processors/igfs/IgfsProcessor.java | 3 - .../platform/PlatformAbstractTarget.java | 28 +- .../platform/PlatformNoopProcessor.java | 5 + .../processors/platform/PlatformProcessor.java | 8 + .../platform/PlatformProcessorImpl.java | 5 + .../platform/cache/PlatformCache.java | 6 +- .../platform/compute/PlatformCompute.java | 132 +++++- .../dotnet/PlatformDotNetCacheStore.java | 33 +- .../platform/events/PlatformEvents.java | 16 +- .../platform/messaging/PlatformMessaging.java | 7 +- .../platform/services/PlatformServices.java | 14 +- .../ignite/internal/util/IgniteUtils.java | 3 + .../internal/util/nio/GridDirectParser.java | 52 ++- .../ignite/internal/util/nio/GridNioServer.java | 12 + .../ignite/lang/IgniteProductVersion.java | 18 + .../extensions/communication/MessageWriter.java | 9 +- .../communication/tcp/TcpCommunicationSpi.java | 9 +- .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 14 +- .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 48 ++- .../internal/TestRecordingCommunicationSpi.java | 157 +++++++ .../binary/BinaryMarshallerSelfTest.java | 44 +- ...idCacheConfigurationConsistencySelfTest.java | 58 +-- .../cache/GridCacheDeploymentSelfTest.java | 3 +- ...IgniteCacheGetCustomCollectionsSelfTest.java | 128 ++++++ ...gniteCacheLoadRebalanceEvictionSelfTest.java | 188 ++++++++ .../cache/IgniteCacheNearLockValueSelfTest.java | 62 +-- .../cache/IgniteCacheStoreCollectionTest.java | 12 + ...eDynamicCacheStartNoExchangeTimeoutTest.java | 7 + ...niteDynamicCacheStartStopConcurrentTest.java | 119 ++++++ ...ridCachePartitionNotLoadedEventSelfTest.java | 7 +- .../IgniteCacheAtomicNodeRestartTest.java | 2 + ...niteCacheClientNodeChangingTopologyTest.java | 4 +- .../distributed/IgniteCacheGetRestartTest.java | 280 ++++++++++++ .../IgniteCacheReadFromBackupTest.java | 427 +++++++++++++++++++ .../IgniteCacheSingleGetMessageTest.java | 88 +--- .../IgniteCrossCacheTxStoreSelfTest.java | 1 + .../GridCacheDhtPreloadMessageCountTest.java | 62 +-- .../near/GridCacheGetStoreErrorSelfTest.java | 9 +- .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- ...ContinuousQueryFailoverAbstractSelfTest.java | 80 ++++ .../CacheContinuousQueryLostPartitionTest.java | 256 +++++++++++ .../IgniteServiceDynamicCachesSelfTest.java | 183 ++++++++ .../platform/PlatformComputeBroadcastTask.java | 7 + .../platform/PlatformComputeEchoTask.java | 6 +- ...CommunicationRecoveryAckClosureSelfTest.java | 2 + .../ignite/testframework/GridTestUtils.java | 27 ++ .../IgniteCacheRestartTestSuite2.java | 3 + .../testsuites/IgniteCacheTestSuite4.java | 9 + .../testsuites/IgniteCacheTestSuite5.java | 2 + .../hadoop/fs/BasicHadoopFileSystemFactory.java | 19 +- .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 6 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 7 +- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 7 + ...niteCacheP2pUnmarshallingQueryErrorTest.java | 18 +- .../IgniteBinaryCacheQueryTestSuite.java | 2 + .../cpp/common/include/ignite/common/exports.h | 1 + .../cpp/common/include/ignite/common/java.h | 3 + .../platforms/cpp/common/project/vs/module.def | 3 +- modules/platforms/cpp/common/src/exports.cpp | 4 + modules/platforms/cpp/common/src/java.cpp | 20 + .../Apache.Ignite.Core.Tests.csproj | 1 + .../Binary/BinaryBuilderSelfTest.cs | 8 +- .../Cache/CacheAbstractTest.cs | 19 + .../Compute/CancellationTest.cs | 174 ++++++++ .../Compute/ComputeApiTest.cs | 2 +- .../Apache.Ignite.Core/Binary/IBinaryObject.cs | 8 + .../Common/IgniteFutureCancelledException.cs | 1 + .../dotnet/Apache.Ignite.Core/IIgnite.cs | 7 + .../Apache.Ignite.Core/Impl/Binary/Binary.cs | 3 + .../Impl/Binary/BinaryEnum.cs | 6 + .../Impl/Binary/BinaryObject.cs | 6 + .../Impl/Cache/Store/CacheStore.cs | 9 +- .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 6 + .../Apache.Ignite.Core/Impl/IgniteProxy.cs | 6 + .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 3 + .../Impl/Unmanaged/UnmanagedUtils.cs | 22 +- .../Services/ServicesExample.cs | 2 +- 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 ++ pom.xml | 1 + 123 files changed, 4669 insertions(+), 884 deletions(-) ----------------------------------------------------------------------
