Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fce2e31f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fce2e31f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fce2e31f Branch: refs/heads/ignite-3478 Commit: fce2e31f0fd2f4f6a9944422e40408a0c65cfe90 Parents: 08be731 86bd544 Author: sboikov <[email protected]> Authored: Mon Sep 4 11:13:50 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Sep 4 11:13:50 2017 +0300 ---------------------------------------------------------------------- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 4 + .../thin/JdbcThinComplexDmlDdlSelfTest.java | 486 +++++++++++++++++++ .../configuration/MemoryConfiguration.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 21 +- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../internal/jdbc/thin/JdbcThinConnection.java | 6 +- .../jdbc/thin/JdbcThinDatabaseMetadata.java | 1 - .../internal/jdbc/thin/JdbcThinStatement.java | 2 +- .../discovery/GridDiscoveryManager.java | 49 +- .../GridCacheDatabaseSharedManager.java | 39 +- .../apache/ignite/internal/util/typedef/X.java | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 16 +- ...pClientDiscoveryMarshallerCheckSelfTest.java | 84 +++- .../cpp/odbc-test/src/queries_test.cpp | 51 ++ modules/platforms/cpp/odbc/src/statement.cpp | 32 +- .../Binary/BinarySelfTest.cs | 7 +- .../Cache/CacheAbstractTest.cs | 50 +- .../Apache.Ignite.Core.csproj | 2 + .../Configuration/MemoryPolicyConfiguration.cs | 4 +- .../Impl/Binary/BinaryObjectBuilder.cs | 132 ++--- .../Impl/Binary/BinaryObjectSchemaSerializer.cs | 12 +- .../Impl/Binary/BinaryProcessor.cs | 2 +- .../Impl/Binary/BinaryReader.cs | 110 ++--- .../Impl/Binary/BinarySystemHandlers.cs | 157 ++---- .../Impl/Binary/BinaryTypeId.cs | 228 +++++++++ .../Impl/Binary/BinaryUtils.cs | 155 +----- .../Impl/Binary/BinaryWriter.cs | 161 +++--- .../Impl/Binary/BinaryWriterExtensions.cs | 4 +- .../Impl/Binary/Marshaller.cs | 32 +- .../Impl/Binary/Metadata/BinaryType.cs | 62 +-- .../Impl/Cache/CacheAffinityImpl.cs | 2 +- .../Impl/Cache/CacheEntryFilterHolder.cs | 2 +- .../Impl/Cache/CacheEntryProcessorHolder.cs | 4 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 2 +- .../Impl/Cache/Store/CacheStoreInternal.cs | 14 +- .../Impl/Cluster/ClusterGroupImpl.cs | 2 +- .../Impl/Compute/Closure/ComputeActionJob.cs | 4 +- .../Impl/Compute/Closure/ComputeFuncJob.cs | 6 +- .../Impl/Compute/Closure/ComputeOutFuncJob.cs | 4 +- .../Closure/ComputeReducingClosureTask.cs | 2 +- .../Compute/Closure/IComputeResourceInjector.cs | 2 +- .../Impl/Compute/ComputeFunc.cs | 2 +- .../Impl/Compute/ComputeJob.cs | 2 +- .../Impl/Compute/ComputeJobHolder.cs | 21 +- .../Impl/Compute/ComputeOutFunc.cs | 2 +- .../Impl/Deployment/PeerAssemblyResolver.cs | 13 +- .../Impl/Deployment/PeerLoadingExtensions.cs | 4 +- .../Impl/Deployment/PeerLoadingObjectHolder.cs | 4 +- .../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 8 +- .../Apache.Ignite.Core/Impl/IIgniteInternal.cs | 69 +++ .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 13 +- .../Impl/Messaging/MessageListenerHolder.cs | 4 +- .../Impl/PlatformTargetAdapter.cs | 13 +- .../Impl/Resource/ResourceProcessor.cs | 2 +- .../Impl/Resource/ResourceTypeDescriptor.cs | 2 +- modules/platforms/dotnet/README.md | 2 +- 56 files changed, 1467 insertions(+), 658 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fce2e31f/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ----------------------------------------------------------------------
