Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into sql-store
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/965846ca Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/965846ca Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/965846ca Branch: refs/heads/sql-store Commit: 965846ca5fc391102fff60d19584001380373bdd Parents: 31bfc68 c77fc84 Author: Alexey Goncharuk <[email protected]> Authored: Wed Jan 20 18:02:37 2016 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Jan 20 18:02:37 2016 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 3 + .../configuration/CacheConfiguration.java | 2 +- .../internal/GridEventConsumeHandler.java | 3 +- .../internal/GridMessageListenHandler.java | 6 +- .../internal/binary/BinaryEnumObjectImpl.java | 3 +- .../internal/direct/DirectMessageWriter.java | 5 + .../stream/v1/DirectByteBufferStreamImplV1.java | 2 + .../stream/v2/DirectByteBufferStreamImplV2.java | 2 + .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/GridDiscoveryManager.java | 8 +- .../processors/cache/GridCacheMvccManager.java | 43 ++- .../distributed/GridCacheTxRecoveryFuture.java | 2 +- .../dht/CacheDistributedGetFutureAdapter.java | 2 +- .../cache/distributed/dht/GridDhtGetFuture.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../distributed/near/GridNearLockFuture.java | 2 +- ...arOptimisticSerializableTxPrepareFuture.java | 47 ++- .../GridNearPessimisticTxPrepareFuture.java | 6 +- .../near/GridNearTxFinishFuture.java | 29 +- .../continuous/CacheContinuousQueryEntry.java | 70 ++--- .../continuous/CacheContinuousQueryHandler.java | 36 +-- .../processors/cluster/ClusterProcessor.java | 37 ++- .../continuous/AbstractContinuousMessage.java | 5 +- .../continuous/GridContinuousHandler.java | 4 +- .../continuous/GridContinuousProcessor.java | 15 +- .../platform/PlatformNoopProcessor.java | 5 + .../processors/platform/PlatformProcessor.java | 8 + .../platform/PlatformProcessorImpl.java | 5 + .../processors/rest/GridRestProcessor.java | 3 + .../handlers/log/GridLogCommandHandler.java | 176 +++++++++++ .../rest/request/GridRestLogRequest.java | 10 +- .../service/GridServiceProcessor.java | 17 +- .../ignite/internal/util/IgniteUtils.java | 3 + .../util/future/GridCompoundFuture.java | 314 +++++-------------- .../util/future/GridCompoundIdentityFuture.java | 6 +- .../internal/util/future/GridFutureAdapter.java | 2 + .../ignite/internal/util/nio/GridNioServer.java | 12 + .../ignite/internal/visor/cache/VisorCache.java | 30 +- .../visor/cache/VisorCacheConfiguration.java | 4 +- .../cache/VisorCacheQueryConfiguration.java | 15 +- .../cache/VisorCacheQueryConfigurationV2.java | 47 +++ .../cache/VisorCacheStoreConfiguration.java | 13 +- .../cache/VisorCacheStoreConfigurationV2.java | 48 +++ .../internal/visor/cache/VisorCacheV2.java | 64 ++++ .../visor/node/VisorIgfsConfiguration.java | 32 +- .../visor/node/VisorNodeDataCollectorJob.java | 5 +- .../visor/node/VisorNodeDataCollectorTask.java | 2 +- .../ignite/lang/IgniteProductVersion.java | 18 ++ .../extensions/communication/MessageWriter.java | 9 +- .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 48 ++- ...ContinuousQueryFailoverAbstractSelfTest.java | 80 +++++ .../CacheContinuousQueryLostPartitionTest.java | 256 +++++++++++++++ .../handlers/log/GridLogCommandHandlerTest.java | 146 +++++++++ .../ignite/testframework/GridTestUtils.java | 7 +- .../testsuites/IgniteRestHandlerTestSuite.java | 4 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 2 - .../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 ++ .../Binary/BinaryBuilderSelfTest.cs | 8 +- .../Cache/CacheAbstractTest.cs | 91 ++++-- .../Apache.Ignite.Core/Binary/IBinaryObject.cs | 8 + .../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 + .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 6 + .../Apache.Ignite.Core/Impl/IgniteProxy.cs | 6 + .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 3 + .../Impl/Unmanaged/UnmanagedUtils.cs | 14 + .../commands/cache/VisorCacheCommand.scala | 10 +- 76 files changed, 1474 insertions(+), 462 deletions(-) ----------------------------------------------------------------------
