Merge master into ignite-3477
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4538818a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4538818a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4538818a Branch: refs/heads/ignite-gg-11810-1 Commit: 4538818a36143a66dd4aaa3b9b4f819bce271545 Parents: ca373d7 7b711a3 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Tue Jan 17 13:48:22 2017 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Jan 17 13:48:22 2017 +0300 ---------------------------------------------------------------------- .../utils/PlatformConfigurationUtils.java | 128 +++++++- .../hadoop/impl/v2/HadoopV2TaskContext.java | 7 - .../Apache.Ignite.Core.Tests.csproj | 3 + .../Binary/BinaryBuilderSelfTest.cs | 159 ++++++---- .../BinaryBuilderSelfTestArrayIdentity.cs | 34 +++ .../Binary/BinaryEqualityComparerTest.cs | 279 +++++++++++++++++ .../Binary/IO/BinaryStreamsTest.cs | 19 ++ .../Cache/CacheConfigurationTest.cs | 5 +- .../Cache/Query/CacheDmlQueriesTest.cs | 296 +++++++++++++++++++ .../IgniteConfigurationSerializerTest.cs | 46 ++- .../IgniteConfigurationTest.cs | 28 ++ .../Apache.Ignite.Core.csproj | 5 + .../Binary/BinaryArrayEqualityComparer.cs | 149 ++++++++++ .../Binary/BinaryConfiguration.cs | 24 ++ .../Binary/BinaryTypeConfiguration.cs | 14 + .../Cache/Configuration/QueryEntity.cs | 33 ++- .../Cache/Configuration/QueryField.cs | 6 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 85 ++++-- .../IgniteConfigurationSection.xsd | 19 ++ .../Apache.Ignite.Core/Impl/Binary/Binary.cs | 28 +- .../Binary/BinaryEqualityComparerSerializer.cs | 99 +++++++ .../Impl/Binary/BinaryFieldEqualityComparer.cs | 138 +++++++++ .../Impl/Binary/BinaryFullTypeDescriptor.cs | 21 +- .../Impl/Binary/BinaryObject.cs | 31 +- .../Impl/Binary/BinaryObjectBuilder.cs | 62 +++- .../Impl/Binary/BinaryObjectHeader.cs | 21 +- .../Impl/Binary/BinaryObjectSchemaHolder.cs | 22 ++ .../Binary/BinarySurrogateTypeDescriptor.cs | 6 + .../Impl/Binary/BinarySystemHandlers.cs | 6 +- .../Impl/Binary/BinaryWriter.cs | 11 +- .../Impl/Binary/DateTimeHolder.cs | 35 ++- .../Impl/Binary/IBinaryEqualityComparer.cs | 53 ++++ .../Impl/Binary/IBinaryTypeDescriptor.cs | 5 + .../Impl/Binary/Io/BinaryHeapStream.cs | 9 + .../Impl/Binary/Io/BinaryStreamBase.cs | 13 + .../Impl/Binary/Io/IBinaryStream.cs | 11 +- .../Impl/Binary/Io/IBinaryStreamProcessor.cs | 36 +++ .../Impl/Binary/Marshaller.cs | 22 +- .../Impl/Binary/SerializableObjectHolder.cs | 16 + .../Common/IgniteConfigurationXmlSerializer.cs | 5 +- .../Impl/Memory/PlatformMemoryStream.cs | 16 + 41 files changed, 1845 insertions(+), 160 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4538818a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java index 8202e4a,c0fde97..33571ad --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java @@@ -17,20 -17,15 +17,26 @@@ package org.apache.ignite.internal.processors.platform.utils; +import java.lang.management.ManagementFactory; +import java.net.InetSocketAddress; +import java.util.ArrayList; +import java.util.Collection; ++import java.util.Set; ++import java.util.HashSet; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.cache.configuration.Factory; +import javax.cache.expiry.ExpiryPolicy; + import org.apache.ignite.binary.BinaryArrayIdentityResolver; + import org.apache.ignite.binary.BinaryFieldIdentityResolver; + import org.apache.ignite.binary.BinaryIdentityResolver; import org.apache.ignite.binary.BinaryRawReader; import org.apache.ignite.binary.BinaryRawWriter; + import org.apache.ignite.binary.BinaryTypeConfiguration; import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheRebalanceMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; http://git-wip-us.apache.org/repos/asf/ignite/blob/4538818a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java index 8b8a728,5229590..c698ee3 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java @@@ -42,11 -42,10 +42,10 @@@ import org.apache.hadoop.util.Reflectio import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.hadoop.io.PartiallyRawComparator; import org.apache.ignite.hadoop.io.TextPartiallyRawComparator; - import org.apache.ignite.internal.processors.hadoop.HadoopClassLoader; import org.apache.ignite.internal.processors.hadoop.HadoopCommonUtils; import org.apache.ignite.internal.processors.hadoop.HadoopExternalSplit; -import org.apache.ignite.internal.processors.hadoop.HadoopInputSplit; -import org.apache.ignite.internal.processors.hadoop.HadoopJob; +import org.apache.ignite.hadoop.HadoopInputSplit; +import org.apache.ignite.internal.processors.hadoop.HadoopJobEx; import org.apache.ignite.internal.processors.hadoop.HadoopJobId; import org.apache.ignite.internal.processors.hadoop.HadoopJobProperty; import org.apache.ignite.internal.processors.hadoop.HadoopPartitioner;