Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B94B2200C01 for ; Thu, 19 Jan 2017 11:35:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B820D160B42; Thu, 19 Jan 2017 10:35:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1467E160B54 for ; Thu, 19 Jan 2017 11:35:14 +0100 (CET) Received: (qmail 97502 invoked by uid 500); 19 Jan 2017 10:35:14 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 97465 invoked by uid 99); 19 Jan 2017 10:35:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jan 2017 10:35:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 02A95DFA43; Thu, 19 Jan 2017 10:35:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: ptupitsyn@apache.org To: commits@ignite.apache.org Date: Thu, 19 Jan 2017 10:35:14 -0000 Message-Id: <54ec1dc4ed55406daf75528997ec5d9f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/8] ignite git commit: IGNITE-4045 .NET: Support DML API archived-at: Thu, 19 Jan 2017 10:35:16 -0000 http://git-wip-us.apache.org/repos/asf/ignite/blob/b7908d7a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs index 08789b6..ce9fcf6 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs @@ -157,8 +157,6 @@ { IgniteArgumentCheck.NotNull(configuration, "configuration"); - CopyLocalProperties(configuration); - using (var stream = IgniteManager.Memory.Allocate().GetStream()) { var marsh = new Marshaller(configuration.BinaryConfiguration); @@ -171,6 +169,8 @@ ReadCore(marsh.StartUnmarshal(stream)); } + + CopyLocalProperties(configuration); } ///

@@ -255,12 +255,37 @@ writer.WriteBoolean(false); // Binary config - var isCompactFooterSet = BinaryConfiguration != null && BinaryConfiguration.CompactFooterInternal != null; + if (BinaryConfiguration != null) + { + writer.WriteBoolean(true); - writer.WriteBoolean(isCompactFooterSet); + if (BinaryConfiguration.CompactFooterInternal != null) + { + writer.WriteBoolean(true); + writer.WriteBoolean(BinaryConfiguration.CompactFooter); + } + else + { + writer.WriteBoolean(false); + } + + // Send only descriptors with non-null EqualityComparer to preserve old behavior where + // remote nodes can have no BinaryConfiguration. + var types = writer.Marshaller.GetUserTypeDescriptors().Where(x => x.EqualityComparer != null).ToList(); + + writer.WriteInt(types.Count); - if (isCompactFooterSet) - writer.WriteBoolean(BinaryConfiguration.CompactFooter); + foreach (var type in types) + { + writer.WriteString(BinaryUtils.SimpleTypeName(type.TypeName)); + writer.WriteBoolean(type.IsEnum); + BinaryEqualityComparerSerializer.Write(writer, type.EqualityComparer); + } + } + else + { + writer.WriteBoolean(false); + } // User attributes var attrs = UserAttributes; @@ -361,7 +386,28 @@ if (r.ReadBoolean()) { BinaryConfiguration = BinaryConfiguration ?? new BinaryConfiguration(); - BinaryConfiguration.CompactFooter = r.ReadBoolean(); + + if (r.ReadBoolean()) + BinaryConfiguration.CompactFooter = r.ReadBoolean(); + + var typeCount = r.ReadInt(); + + if (typeCount > 0) + { + var types = new List(typeCount); + + for (var i = 0; i < typeCount; i++) + { + types.Add(new BinaryTypeConfiguration + { + TypeName = r.ReadString(), + IsEnum = r.ReadBoolean(), + EqualityComparer = BinaryEqualityComparerSerializer.Read(r) + }); + } + + BinaryConfiguration.TypeConfigurations = types; + } } // User attributes @@ -402,17 +448,15 @@ /// The binary reader. private void Read(BinaryReader binaryReader) { - var r = binaryReader; - - CopyLocalProperties(r.Marshaller.Ignite.Configuration); + ReadCore(binaryReader); - ReadCore(r); + CopyLocalProperties(binaryReader.Marshaller.Ignite.Configuration); // Misc - IgniteHome = r.ReadString(); + IgniteHome = binaryReader.ReadString(); - JvmInitialMemoryMb = (int) (r.ReadLong()/1024/2014); - JvmMaxMemoryMb = (int) (r.ReadLong()/1024/2014); + JvmInitialMemoryMb = (int) (binaryReader.ReadLong()/1024/2014); + JvmMaxMemoryMb = (int) (binaryReader.ReadLong()/1024/2014); // Local data (not from reader) JvmDllPath = Process.GetCurrentProcess().Modules.OfType() @@ -426,9 +470,16 @@ private void CopyLocalProperties(IgniteConfiguration cfg) { GridName = cfg.GridName; - BinaryConfiguration = cfg.BinaryConfiguration == null - ? null - : new BinaryConfiguration(cfg.BinaryConfiguration); + + if (BinaryConfiguration != null && cfg.BinaryConfiguration != null) + { + BinaryConfiguration.MergeTypes(cfg.BinaryConfiguration); + } + else if (cfg.BinaryConfiguration != null) + { + BinaryConfiguration = new BinaryConfiguration(cfg.BinaryConfiguration); + } + JvmClasspath = cfg.JvmClasspath; JvmOptions = cfg.JvmOptions; Assemblies = cfg.Assemblies; http://git-wip-us.apache.org/repos/asf/ignite/blob/b7908d7a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd index b35527d..d54a200 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd +++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd @@ -152,6 +152,20 @@ + + + + Equality comparer to compute hash codes and compare objects in IBinaryObject form. + + + + + + Assembly-qualified type name. + + + + @@ -297,6 +311,11 @@ Java field type name. + + + Indicates whether this field belongs to the cache key. + + http://git-wip-us.apache.org/repos/asf/ignite/blob/b7908d7a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs index 3d55acd..fa7cf6c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs @@ -81,7 +81,7 @@ namespace Apache.Ignite.Core.Impl.Binary throw new IgniteException("Type is not binary (add it to BinaryConfiguration): " + type.FullName); - return Builder0(null, BinaryFromDescriptor(desc), desc); + return Builder0(null, null, desc); } /** */ @@ -91,7 +91,7 @@ namespace Apache.Ignite.Core.Impl.Binary IBinaryTypeDescriptor desc = _marsh.GetDescriptor(typeName); - return Builder0(null, BinaryFromDescriptor(desc), desc); + return Builder0(null, null, desc); } /** */ @@ -182,30 +182,6 @@ namespace Apache.Ignite.Core.Impl.Binary } ///

- /// Create empty binary object from descriptor. - ///

- /// Descriptor. - /// Empty binary object. - private BinaryObject BinaryFromDescriptor(IBinaryTypeDescriptor desc) - { - const int len = BinaryObjectHeader.Size; - - var flags = desc.UserType ? BinaryObjectHeader.Flag.UserType : BinaryObjectHeader.Flag.None; - - if (_marsh.CompactFooter && desc.UserType) - flags |= BinaryObjectHeader.Flag.CompactFooter; - - var hdr = new BinaryObjectHeader(desc.TypeId, 0, len, 0, len, flags); - - using (var stream = new BinaryHeapStream(len)) - { - BinaryObjectHeader.Write(hdr, stream, 0); - - return new BinaryObject(_marsh, stream.InternalArray, 0, hdr); - } - } - - ///

/// Internal builder creation routine. ///

/// Parent builder. http://git-wip-us.apache.org/repos/asf/ignite/blob/b7908d7a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs new file mode 100644 index 0000000..aa4795e --- /dev/null +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs @@ -0,0 +1,99 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace Apache.Ignite.Core.Impl.Binary +{ + using System; + using System.Collections.Generic; + using System.Linq; + using Apache.Ignite.Core.Binary; + + ///

+ /// Reads and writes . + ///

+ internal static class BinaryEqualityComparerSerializer + { + ///

+ /// SwapSpace type. + ///

+ private enum Type : byte + { + None = 0, + Array = 1, + Field = 2 + } + + ///

+ /// Writes an instance. + ///

+ public static void Write(IBinaryRawWriter writer, IBinaryEqualityComparer comparer) + { + if (comparer == null) + { + writer.WriteByte((byte) Type.None); + return; + } + + var arrCmp = comparer as BinaryArrayEqualityComparer; + + if (arrCmp != null) + { + writer.WriteByte((byte) Type.Array); + return; + } + + var fieldCmp = (BinaryFieldEqualityComparer) comparer; + + writer.WriteByte((byte) Type.Field); + + fieldCmp.Validate(); + + writer.WriteInt(fieldCmp.FieldNames.Count); + + foreach (var field in fieldCmp.FieldNames) + writer.WriteString(field); + } + + ///

+ /// Reads an instance. + ///

+ /// The reader. + /// + public static IEqualityComparer Read(IBinaryRawReader reader) + { + var type = (Type) reader.ReadByte(); + + switch (type) + { + case Type.None: + return null; + + case Type.Array: + return new BinaryArrayEqualityComparer(); + + case Type.Field: + return new BinaryFieldEqualityComparer + { + FieldNames = Enumerable.Range(0, reader.ReadInt()).Select(x => reader.ReadString()).ToArray() + }; + + default: + throw new ArgumentOutOfRangeException(); + } + } + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/b7908d7a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryFieldEqualityComparer.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryFieldEqualityComparer.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryFieldEqualityComparer.cs new file mode 100644 index 0000000..433657a --- /dev/null +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryFieldEqualityComparer.cs @@ -0,0 +1,138 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace Apache.Ignite.Core.Impl.Binary +{ + using System; + using System.Collections.Generic; + using System.Diagnostics; + using System.IO; + using Apache.Ignite.Core.Binary; + using Apache.Ignite.Core.Common; + using Apache.Ignite.Core.Impl.Binary.IO; + using Apache.Ignite.Core.Impl.Common; + + ///

+ /// Uses a set of binary object fields to calculate hash code and check equality. + /// Not implemented for now, will be done as part of IGNITE-4397. + ///

+ internal class BinaryFieldEqualityComparer : IEqualityComparer, IBinaryEqualityComparer + { + ///

+ /// Initializes a new instance of the class. + ///

+ public BinaryFieldEqualityComparer() + { + // No-op. + } + + ///

+ /// Initializes a new instance of the class. + ///

+ /// The field names for comparison. + public BinaryFieldEqualityComparer(params string[] fieldNames) + { + IgniteArgumentCheck.NotNullOrEmpty(fieldNames, "fieldNames"); + + FieldNames = fieldNames; + } + + ///

+ /// Gets or sets the field names to be used for equality comparison. + ///

+ public ICollection FieldNames { get; set; } + + ///

+ /// Determines whether the specified objects are equal. + ///

+ /// The first object to compare. + /// The second object to compare. + /// + /// true if the specified objects are equal; otherwise, false. + /// + public bool Equals(IBinaryObject x, IBinaryObject y) + { + throw new NotSupportedException(GetType() + "is not intended for direct usage."); + } + + ///

+ /// Returns a hash code for this instance. + ///

+ /// The object. + /// + /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. + /// + public int GetHashCode(IBinaryObject obj) + { + throw new NotSupportedException(GetType() + "is not intended for direct usage."); + } + + /** */ + int IBinaryEqualityComparer.GetHashCode(IBinaryStream stream, int startPos, int length, + BinaryObjectSchemaHolder schema, int schemaId, Marshaller marshaller, IBinaryTypeDescriptor desc) + { + Debug.Assert(stream != null); + Debug.Assert(startPos >= 0); + Debug.Assert(length >= 0); + Debug.Assert(schema != null); + Debug.Assert(marshaller != null); + Debug.Assert(desc != null); + + Validate(); + + stream.Flush(); + + // Preserve stream position. + var pos = stream.Position; + + var reader = marshaller.StartUnmarshal(stream, BinaryMode.ForceBinary); + var fields = schema.GetFullSchema(schemaId); + + int hash = 0; + + foreach (var fieldName in FieldNames) + { + int fieldId = BinaryUtils.FieldId(desc.TypeId, fieldName, desc.NameMapper, desc.IdMapper); + int fieldHash = 0; // Null (missing) field hash code is 0. + int fieldPos; + + if (fields.TryGetValue(fieldId, out fieldPos)) + { + stream.Seek(startPos + fieldPos - BinaryObjectHeader.Size, SeekOrigin.Begin); + var fieldVal = reader.Deserialize