Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3a6bc565 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a6bc565 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a6bc565 Branch: refs/heads/ignite-1093-2 Commit: 3a6bc565c301bf44b2a35440be2ce023ef648f9f Parents: e97b581 f8aafe4 Author: Anton Vinogradov <[email protected]> Authored: Tue Sep 8 10:25:54 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Tue Sep 8 10:25:54 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 13 +- .../messaging/MessagingPingPongExample.java | 6 +- .../CacheClientPortableQueryExample.java | 3 - .../messaging/MessagingPingPongExample.java | 2 +- .../examples/MessagingExamplesSelfTest.java | 3 +- .../examples/MessagingExamplesSelfTest.java | 3 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../ignite/internal/MarshallerContextImpl.java | 31 +-- .../distributed/dht/GridDhtLocalPartition.java | 51 ++++- .../dht/GridPartitionedGetFuture.java | 14 +- .../distributed/near/GridNearGetFuture.java | 13 ++ .../query/GridCacheDistributedQueryFuture.java | 5 +- .../query/GridCacheDistributedQueryManager.java | 9 +- .../cache/query/GridCacheQueryManager.java | 177 +++++---------- .../cache/query/GridCacheQueryRequest.java | 59 ++++- .../visor/cache/VisorCacheStartTask.java | 6 +- .../messages/TcpDiscoveryClientAckResponse.java | 2 +- .../cache/GridCacheIncrementTransformTest.java | 2 +- .../IgniteCacheP2pUnmarshallingErrorTest.java | 5 - .../IgniteDaemonNodeMarshallerCacheTest.java | 10 + .../IgniteCacheNodeJoinAbstractTest.java | 42 ++++ .../main/cpp/common/project/vs/common.vcxproj | 10 +- .../platform/src/main/cpp/common/src/java.cpp | 2 +- .../Apache.Ignite.Core/Cluster/IClusterGroup.cs | 2 +- .../Impl/Common/DelegateTypeDescriptor.cs | 17 +- .../Apache.Ignite.Core/Impl/Common/Future.cs | 1 + .../Impl/Common/IFutureConverter.cs | 2 + .../Impl/Common/IFutureInternal.cs | 1 + .../Impl/Compute/ComputeImpl.cs | 2 +- .../Impl/Compute/ComputeJobHolder.cs | 6 + .../Apache.Ignite.Core/Impl/IgniteManager.cs | 2 +- .../Impl/Memory/IPlatformMemory.cs | 3 + .../Impl/Memory/PlatformMemory.cs | 1 + .../Impl/Memory/PlatformMemoryManager.cs | 2 + .../Impl/Memory/PlatformMemoryPool.cs | 1 + .../Impl/Memory/PlatformMemoryStream.cs | 1 + .../Impl/Memory/PlatformMemoryUtils.cs | 1 + .../Impl/Memory/PlatformRawMemory.cs | 1 + .../Impl/Portable/Io/PortableAbstractStream.cs | 1 - .../Properties/AssemblyInfo.cs | 3 +- .../platform/src/main/dotnet/Apache.Ignite.sln | 10 + .../dotnet/Apache.Ignite/Apache.Ignite.csproj | 76 +++++++ .../src/main/dotnet/Apache.Ignite/App.config | 56 +++++ .../Config/AppSettingsConfigurator.cs | 113 ++++++++++ .../Apache.Ignite/Config/ArgsConfigurator.cs | 164 ++++++++++++++ .../Apache.Ignite/Config/ConfigValueParser.cs | 42 ++++ .../Apache.Ignite/Config/IConfigurator.cs | 34 +++ .../main/dotnet/Apache.Ignite/IgniteRunner.cs | 171 ++++++++++++++ .../Apache.Ignite/Properties/AssemblyInfo.cs | 35 +++ .../Apache.Ignite/Service/IgniteService.cs | 219 ++++++++++++++++++ .../Apache.Ignite/Service/NativeMethods.cs | 57 +++++ .../Apache.Ignite/Service/ServiceDescription.cs | 32 +++ .../Apache.Ignite.Core.Tests.csproj | 5 +- .../Cache/CacheForkedTest.cs | 1 - .../Forked/ForkedPortableClosureTaskTest.cs | 3 - .../Compute/Forked/ForkedResourceTaskTest.cs | 2 +- .../Forked/ForkedSerializableClosureTaskTest.cs | 2 +- .../Compute/Forked/ForkedTaskAdapterTest.cs | 3 - .../Config/Apache.Ignite.exe.config.test | 41 ++++ .../Config/Ignite.exe.config.test | 41 ---- .../native-client-test-cache-portables.xml | 226 ------------------- .../Config/native-client-test-cache.xml | 30 --- .../Apache.Ignite.Core.Tests/ExecutableTest.cs | 39 ++-- .../IgniteStartStopTest.cs | 28 --- .../Apache.Ignite.Core.Tests/LoadDllTest.cs | 2 +- .../Process/IgniteProcess.cs | 33 +-- .../Properties/AssemblyInfo.cs | 2 +- .../Apache.Ignite.Core.Tests/TestUtils.cs | 2 +- parent/pom.xml | 1 + 69 files changed, 1405 insertions(+), 582 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3a6bc565/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ----------------------------------------------------------------------
