Merge branches 'ignite-1.7.3' and 'ignite-comm-opts2' of https://github.com/gridgain/apache-ignite into ignite-comm-opts2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d45c638c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d45c638c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d45c638c Branch: refs/heads/ignite-comm-balance Commit: d45c638cd2b73c95cb32e528e5b65f350634787f Parents: 35ea9ea d45383b Author: Yakov Zhdanov <[email protected]> Authored: Wed Oct 12 16:08:52 2016 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Wed Oct 12 16:08:52 2016 +0300 ---------------------------------------------------------------------- .../client/ClientReconnectionSelfTest.java | 4 +- .../client/router/TcpSslRouterSelfTest.java | 7 +- .../client/suite/IgniteClientTestSuite.java | 71 +-- .../TcpDiscoveryCloudIpFinderSelfTest.java | 6 +- .../ignite/testsuites/IgniteCloudTestSuite.java | 5 +- .../internal/binary/BinaryClassDescriptor.java | 16 +- .../internal/binary/BinaryEnumObjectImpl.java | 5 + .../ignite/internal/binary/BinaryObjectEx.java | 8 + .../internal/binary/BinaryObjectImpl.java | 7 + .../binary/BinaryObjectOffheapImpl.java | 7 + .../ignite/internal/binary/BinaryUtils.java | 5 +- .../internal/binary/BinaryWriterExImpl.java | 6 +- .../binary/builder/BinaryObjectBuilderImpl.java | 11 +- .../logger/platform/PlatformLogger.java | 223 ++++++++++ .../processors/cache/GridCacheAdapter.java | 7 + .../processors/cache/GridCacheUtils.java | 5 + .../distributed/near/GridNearCacheAdapter.java | 7 + .../query/GridCacheQueryMetricsAdapter.java | 12 +- .../platform/PlatformAbstractBootstrap.java | 18 +- .../platform/PlatformConfigurationEx.java | 6 + .../platform/PlatformNoopProcessor.java | 10 + .../processors/platform/PlatformProcessor.java | 16 + .../platform/PlatformProcessorImpl.java | 56 +++ .../callback/PlatformCallbackGateway.java | 45 ++ .../callback/PlatformCallbackUtils.java | 20 + .../cpp/PlatformCppConfigurationEx.java | 6 + .../dotnet/PlatformDotNetBootstrap.java | 9 + .../PlatformDotNetConfigurationClosure.java | 11 +- .../dotnet/PlatformDotNetConfigurationEx.java | 12 +- .../ignite/internal/util/IgniteUtils.java | 23 +- .../cache/VisorCacheResetQueryMetricsTask.java | 69 +++ ...ridCacheStoreManagerDeserializationTest.java | 1 + .../cache/GridCacheUtilsSelfTest.java | 64 ++- ...calCacheStoreManagerDeserializationTest.java | 2 +- ...niteCacheExpireAndUpdateConsistencyTest.java | 7 + .../GridCacheBinaryObjectsAbstractSelfTest.java | 37 ++ .../ignite/testframework/IgniteTestSuite.java | 203 +++++++-- .../testframework/junits/GridAbstractTest.java | 31 +- .../apache/ignite/testsuites/IgniteIgnore.java | 2 +- modules/ignored-tests/pom.xml | 134 +++++- .../testsuites/IgniteIgnoredTestSuite.java | 12 + .../CacheAbstractQueryMetricsSelfTest.java | 6 +- ...titionedCacheJtaLookupClassNameSelfTest.java | 4 +- .../ignite/testsuites/IgniteJtaTestSuite.java | 3 +- .../cpp/jni/include/ignite/jni/exports.h | 2 + .../platforms/cpp/jni/include/ignite/jni/java.h | 13 + modules/platforms/cpp/jni/project/vs/module.def | 3 +- modules/platforms/cpp/jni/src/exports.cpp | 12 +- modules/platforms/cpp/jni/src/java.cpp | 72 +++- .../Apache.Ignite.Core.Tests.NuGet.csproj | 28 +- .../Log4NetTest.cs | 87 ++++ .../Apache.Ignite.Core.Tests.NuGet/NLogTest.cs | 82 ++++ .../packages.config | 15 +- .../Apache.Ignite.Core.Tests.csproj | 30 +- .../Binary/BinaryStringTest.cs | 26 +- .../Config/Log/custom-log.xml | 50 +++ .../Config/Log/dotnet-log4j.xml | 143 ++++++ .../IgniteConfigurationSerializerTest.cs | 31 +- .../Log/CustomLoggerTest.cs | 430 +++++++++++++++++++ .../Log/DefaultLoggerTest.cs | 114 +++++ .../Log/Log4NetLoggerTest.cs | 188 ++++++++ .../Log/NLogLoggerTest.cs | 166 +++++++ .../ProjectFilesTest.cs | 37 +- .../Apache.Ignite.Core.Tests/TestUtils.cs | 26 ++ .../Apache.Ignite.Core.Tests/packages.config | 24 ++ .../Apache.Ignite.Core.csproj | 6 +- .../Cache/Configuration/CacheConfiguration.cs | 19 +- .../Cache/Configuration/QueryEntity.cs | 25 +- .../Cache/Configuration/QueryField.cs | 19 +- .../Apache.Ignite.Core/Common/JavaException.cs | 1 + .../dotnet/Apache.Ignite.Core/IIgnite.cs | 8 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 91 ++++ .../IgniteConfigurationSection.xsd | 12 + .../dotnet/Apache.Ignite.Core/Ignition.cs | 39 +- .../Apache.Ignite.Core/Impl/Binary/JavaTypes.cs | 29 +- .../Apache.Ignite.Core/Impl/Common/Logger.cs | 37 -- .../Impl/Compute/ComputeFunc.cs | 5 +- .../Impl/Compute/ComputeJob.cs | 10 +- .../Impl/Compute/ComputeOutFunc.cs | 5 +- .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 9 + .../Apache.Ignite.Core/Impl/IgniteManager.cs | 6 +- .../Apache.Ignite.Core/Impl/IgniteProxy.cs | 7 + .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 26 +- .../Apache.Ignite.Core/Impl/Log/JavaLogger.cs | 110 +++++ .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 7 + .../Impl/Unmanaged/UnmanagedCallbackHandlers.cs | 3 + .../Impl/Unmanaged/UnmanagedCallbacks.cs | 77 +++- .../Impl/Unmanaged/UnmanagedUtils.cs | 27 +- .../Apache.Ignite.Core/Log/CategoryLogger.cs | 82 ++++ .../dotnet/Apache.Ignite.Core/Log/ILogger.cs | 51 +++ .../dotnet/Apache.Ignite.Core/Log/LogLevel.cs | 53 +++ .../Apache.Ignite.Core/Log/LoggerExtensions.cs | 320 ++++++++++++++ .../Apache.Ignite.Log4Net.csproj | 76 ++++ .../Apache.Ignite.Log4Net.nuspec | 50 +++ .../Apache.Ignite.Log4Net.snk | Bin 0 -> 596 bytes .../IgniteLog4NetLogger.cs | 123 ++++++ .../Properties/AssemblyInfo.cs | 40 ++ .../Apache.Ignite.Log4Net/packages.config | 20 + .../Apache.Ignite.NLog.csproj | 74 ++++ .../Apache.Ignite.NLog.nuspec | 50 +++ .../Apache.Ignite.NLog/Apache.Ignite.NLog.snk | Bin 0 -> 596 bytes .../Apache.Ignite.NLog/IgniteNLogLogger.cs | 125 ++++++ .../Properties/AssemblyInfo.cs | 40 ++ .../dotnet/Apache.Ignite.NLog/packages.config | 4 + modules/platforms/dotnet/Apache.Ignite.sln | 28 ++ .../p2p/GridP2PUserVersionChangeSelfTest.java | 7 +- .../testsuites/IgniteResourceSelfTestSuite.java | 11 +- .../testsuites/IgniteSpringTestSuite.java | 15 +- .../frontend/controllers/caches-controller.js | 14 + 109 files changed, 4294 insertions(+), 265 deletions(-) ----------------------------------------------------------------------
