Merge remote-tracking branch 'remotes/origin/master' into ignite-3057
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f5bbb93 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f5bbb93 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f5bbb93 Branch: refs/heads/ignite-3057 Commit: 8f5bbb9375aba1f20edbd67d345def6be16d4ebe Parents: 87a1480 923b531 Author: sboikov <[email protected]> Authored: Wed Apr 27 13:05:56 2016 +0300 Committer: sboikov <[email protected]> Committed: Wed Apr 27 13:05:56 2016 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 2 + .../ignite/internal/IgniteEventsImpl.java | 11 +- .../ignite/internal/IgniteMessagingImpl.java | 7 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../ignite/internal/binary/BinaryContext.java | 4 + .../internal/binary/GridBinaryMarshaller.java | 3 + .../continuous/CacheContinuousQueryManager.java | 1 + .../continuous/GridContinuousProcessor.java | 29 +- .../platform/PlatformContextImpl.java | 1 - .../PlatformDefaultJavaObjectFactory.java | 62 ++++ .../platform/PlatformJavaObjectFactoryEx.java | 36 +++ .../PlatformJavaObjectFactoryProxy.java | 192 +++++++++++ .../PlatformJavaObjectSingletonFactory.java | 48 +++ .../platform/PlatformNoopProcessor.java | 10 + .../processors/platform/PlatformProcessor.java | 19 ++ .../platform/PlatformProcessorImpl.java | 41 ++- .../query/PlatformContinuousQueryImpl.java | 50 ++- .../utils/PlatformConfigurationUtils.java | 93 +++++- .../platform/utils/PlatformUtils.java | 69 ++++ .../ignite/internal/util/IgniteUtils.java | 5 +- .../platform/PlatformJavaObjectFactory.java | 36 +++ .../ignite/spi/IgniteNodeValidationResult.java | 8 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 250 ++++++++------ .../tcp/internal/TcpDiscoveryNode.java | 2 +- .../messages/TcpDiscoveryAbstractMessage.java | 4 +- .../TcpDiscoveryCustomEventMessage.java | 13 +- .../TcpDiscoveryJoinRequestMessage.java | 16 +- .../TcpDiscoveryStatusCheckMessage.java | 18 +- .../platform/PlatformCacheEntryEventFilter.java | 193 +++++++++++ .../PlatformCacheEntryEventFilterFactory.java | 59 ++++ ...latformDefaultJavaObjectFactorySelfTest.java | 185 +++++++++++ .../PlatformJavaObjectFactoryProxySelfTest.java | 220 +++++++++++++ .../platform/PlatformStartIgniteTask.java | 1 + .../ignite/platform/PlatformStopIgniteTask.java | 1 + .../platform/javaobject/TestJavaObject.java | 271 ++++++++++++++++ .../javaobject/TestJavaObjectNoDefaultCtor.java | 49 +++ .../TestJavaObjectNoDefaultCtorFactory.java | 68 ++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../testsuites/IgnitePlatformsTestSuite.java | 41 +++ .../common/include/ignite/common/concurrent.h | 176 ++++++++-- .../cpp/common/include/ignite/common/exports.h | 2 + .../cpp/common/include/ignite/common/java.h | 5 + .../platforms/cpp/common/project/vs/module.def | 2 + modules/platforms/cpp/common/src/concurrent.cpp | 13 +- modules/platforms/cpp/common/src/exports.cpp | 8 + modules/platforms/cpp/common/src/java.cpp | 30 ++ .../cpp/core-test/src/concurrent_test.cpp | 93 ++++++ .../Apache.Ignite.Core.Tests.csproj | 2 + .../Cache/CacheConfigurationTest.cs | 49 +++ .../Cache/CacheNearTest.cs | 188 +++++++++++ .../Cache/Query/CacheLinqTest.cs | 2 - .../Continuous/ContinuousQueryJavaFilterTest.cs | 323 +++++++++++++++++++ .../Apache.Ignite.Core.Tests/EventsTest.cs | 4 +- .../dotnet/Apache.Ignite.Core.Tests/app.config | 4 + .../Apache.Ignite.Core.csproj | 16 +- .../Cache/Configuration/CacheConfiguration.cs | 15 + .../Configuration/NearCacheConfiguration.cs | 75 +++++ .../Cache/Eviction/EvictionPolicyBase.cs | 126 ++++++++ .../Cache/Eviction/FifoEvictionPolicy.cs | 39 +++ .../Cache/Eviction/IEvictionPolicy.cs | 32 ++ .../Cache/Eviction/LruEvictionPolicy.cs | 39 +++ .../Continuous/ContinuousQueryExtensions.cs | 42 +++ .../Apache.Ignite.Core/Events/CacheEvent.cs | 9 +- .../dotnet/Apache.Ignite.Core/IIgnite.cs | 42 +++ .../Impl/Binary/BinaryUtils.cs | 3 + .../Impl/Binary/Marshaller.cs | 2 + .../Cache/Event/JavaCacheEntryEventFilter.cs | 49 +++ .../Continuous/ContinuousQueryHandleImpl.cs | 17 +- .../Common/PlatformJavaObjectFactoryProxy.cs | 106 ++++++ .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 62 ++++ .../Apache.Ignite.Core/Impl/IgniteProxy.cs | 25 ++ .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 6 + .../Impl/Unmanaged/UnmanagedUtils.cs | 32 ++ .../Apache.Ignite.Core/Interop/JavaObject.cs | 80 +++++ .../ignite/schema/generator/CodeGenerator.java | 30 +- .../ignite/schema/generator/XmlGenerator.java | 2 +- 76 files changed, 3681 insertions(+), 191 deletions(-) ----------------------------------------------------------------------
