Merge pull request #233 from servicetitan/upstream/PackedDescriptor_ref_readonly

Optimization: Avoid copying PackedFieldDescriptor struct

Author: alex-kulakov

Orm/Xtensive.Orm/Tuples/AccessorDelegates.cs

@@ -1,6 +1,6 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2009-2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alexis Kochetov
 // Created:    2009.09.17
 

Orm/Xtensive.Orm/Tuples/Packed/PackedFieldAccessor.cs

@@ -51,15 +51,18 @@ public void SetValue<T>(PackedTuple tuple, in PackedFieldDescriptor descriptor,
     public T GetValue<T>(PackedTuple tuple, in PackedFieldDescriptor descriptor, bool isNullable, out TupleFieldState fieldState)
     {
       var getter = (isNullable ? NullableGetter : Getter) as GetValueDelegate<T>;
-      if (getter!=null)
+      if (getter != null) {
         return getter.Invoke(tuple, descriptor, out fieldState);
-      var targetType = typeof (T);
+      }
+      var targetType = typeof(T);
 
       //Dirty hack of nullable enum reading
-      if (isNullable)
+      if (isNullable) {
         targetType = Nullable.GetUnderlyingType(targetType) ?? targetType;
-      if (targetType.IsEnum)
+      }
+      if (targetType.IsEnum) {
         return (T) Enum.ToObject(targetType, GetUntypedValue(tuple, descriptor, out fieldState));
+      }
       return (T) GetUntypedValue(tuple, descriptor, out fieldState);
     }
 
@@ -106,32 +109,30 @@ public override object GetUntypedValue(PackedTuple tuple, in PackedFieldDescript
     {
       var state = tuple.GetFieldState(descriptor);
       fieldState = state;
-      return state==TupleFieldState.Available ? tuple.Objects[descriptor.ObjectIndex] : null;
+      return state == TupleFieldState.Available ? tuple.Objects[descriptor.GetObjectIndex()] : null;
     }
 
     public override void SetUntypedValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, object value)
     {
-      tuple.Objects[descriptor.ObjectIndex] = value;
+      tuple.Objects[descriptor.GetObjectIndex()] = value;
       tuple.SetFieldState(descriptor, value != null ? TupleFieldState.Available : (TupleFieldState.Available | TupleFieldState.Null));
     }
 
     public override void CopyValue(PackedTuple source, in PackedFieldDescriptor sourceDescriptor,
       PackedTuple target, in PackedFieldDescriptor targetDescriptor)
     {
-      target.Objects[targetDescriptor.ObjectIndex] = source.Objects[sourceDescriptor.ObjectIndex];
+      target.Objects[targetDescriptor.GetObjectIndex()] = source.Objects[sourceDescriptor.GetObjectIndex()];
     }
 
     public override bool ValueEquals(PackedTuple left, in PackedFieldDescriptor leftDescriptor,
       PackedTuple right, in PackedFieldDescriptor rightDescriptor)
     {
-      var leftValue = left.Objects[leftDescriptor.ObjectIndex];
-      var rightValue = right.Objects[rightDescriptor.ObjectIndex];
-      return leftValue.Equals(rightValue);
+      return Equals(left.Objects[leftDescriptor.GetObjectIndex()], right.Objects[rightDescriptor.GetObjectIndex()]);
     }
 
     public override int GetValueHashCode(PackedTuple tuple, in PackedFieldDescriptor descriptor)
     {
-      return tuple.Objects[descriptor.ObjectIndex].GetHashCode();
+      return tuple.Objects[descriptor.GetObjectIndex()]?.GetHashCode() ?? 0;
     }
 
     public ObjectFieldAccessor()
@@ -167,14 +168,13 @@ internal abstract class ValueFieldAccessor<T> : ValueFieldAccessor
 
     public override object GetUntypedValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, out TupleFieldState fieldState)
     {
-      var state = tuple.GetFieldState(descriptor);
-      fieldState = state;
-      return state==TupleFieldState.Available ? (object) Load(tuple, descriptor) : null;
+      fieldState = tuple.GetFieldState(descriptor);
+      return fieldState == TupleFieldState.Available ? (object) Load(tuple, descriptor) : null;
     }
 
     public override void SetUntypedValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, object value)
     {
-      if (value!=null) {
+      if (value != null) {
         Store(tuple, descriptor, (T) value);
         tuple.SetFieldState(descriptor, TupleFieldState.Available);
       }
@@ -190,12 +190,8 @@ public override void CopyValue(PackedTuple source, in PackedFieldDescriptor sour
     }
 
     public override bool ValueEquals(PackedTuple left, in PackedFieldDescriptor leftDescriptor,
-      PackedTuple right, in PackedFieldDescriptor rightDescriptor)
-    {
-      var leftValue = Load(left, leftDescriptor);
-      var rightValue = Load(right, rightDescriptor);
-      return leftValue.Equals(rightValue);
-    }
+        PackedTuple right, in PackedFieldDescriptor rightDescriptor) =>
+      Load(left, leftDescriptor).Equals(Load(right, rightDescriptor));
 
     public override int GetValueHashCode(PackedTuple tuple, in PackedFieldDescriptor descriptor)
     {
@@ -204,16 +200,14 @@ public override int GetValueHashCode(PackedTuple tuple, in PackedFieldDescriptor
 
     private T GetValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, out TupleFieldState fieldState)
     {
-      var state = tuple.GetFieldState(descriptor);
-      fieldState = state;
-      return state==TupleFieldState.Available ? Load(tuple, descriptor) : DefaultValue;
+      fieldState = tuple.GetFieldState(descriptor);
+      return fieldState == TupleFieldState.Available ? Load(tuple, descriptor) : DefaultValue;
     }
 
     private T? GetNullableValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, out TupleFieldState fieldState)
     {
-      var state = tuple.GetFieldState(descriptor);
-      fieldState = state;
-      return state==TupleFieldState.Available ? Load(tuple, descriptor) : NullValue;
+      fieldState = tuple.GetFieldState(descriptor);
+      return fieldState == TupleFieldState.Available ? Load(tuple, descriptor) : NullValue;
     }
 
     private void SetValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, T value)
@@ -224,37 +218,38 @@ private void SetValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, T
 
     private void SetNullableValue(PackedTuple tuple, in PackedFieldDescriptor descriptor, T? value)
     {
-      if (value!=null) {
+      if (value != null) {
         Store(tuple, descriptor, value.Value);
         tuple.SetFieldState(descriptor, TupleFieldState.Available);
       }
-      else
+      else {
         tuple.SetFieldState(descriptor, TupleFieldState.Available | TupleFieldState.Null);
+      }
     }
 
     private void Store(PackedTuple tuple, in PackedFieldDescriptor d, T value)
     {
-      var valueIndex = d.ValueIndex;
+      var valueIndex = d.GetValueIndex();
       if (Rank > 6) {
         Encode(value, tuple.Values, valueIndex);
         return;
       }
 
       var encoded = Encode(value);
       ref var block = ref tuple.Values[valueIndex];
-      var valueBitOffset = d.ValueBitOffset;
+      var valueBitOffset = d.GetValueBitOffset();
       var mask = ValueBitMask << valueBitOffset;
       block = (block & ~mask) | ((encoded << valueBitOffset) & mask);
     }
 
     private T Load(PackedTuple tuple, in PackedFieldDescriptor d)
     {
-      var valueIndex = d.ValueIndex;
+      var valueIndex = d.GetValueIndex();
       if (Rank > 6) {
         return Decode(tuple.Values, valueIndex);
       }
 
-      var encoded = (tuple.Values[valueIndex] >> d.ValueBitOffset) & ValueBitMask;
+      var encoded = (tuple.Values[valueIndex] >> d.GetValueBitOffset()) & ValueBitMask;
       return Decode(encoded);
     }
 
@@ -279,7 +274,7 @@ protected override long Encode(bool value)
 
     protected override bool Decode(long value)
     {
-      return value!=0;
+      return value != 0;
     }
 
     public BooleanFieldAccessor()
@@ -299,7 +294,7 @@ protected override long Encode(float value)
 
     protected override float Decode(long value)
     {
-      var intValue = unchecked ((int) value);
+      var intValue = unchecked((int) value);
       unsafe {
         return *(float*) &intValue;
       }
@@ -374,7 +369,7 @@ protected override long Encode(byte value)
 
     protected override byte Decode(long value)
     {
-      return unchecked ((byte) value);
+      return unchecked((byte) value);
     }
 
     public ByteFieldAccessor()
@@ -392,15 +387,15 @@ protected override long Encode(sbyte value)
 
     protected override sbyte Decode(long value)
     {
-      return unchecked ((sbyte) value);
+      return unchecked((sbyte) value);
     }
 
     public SByteFieldAccessor()
       : base(sizeof(sbyte) * 8, 8)
     {
     }
   }
-  
+
   internal sealed class ShortFieldAccessor : ValueFieldAccessor<short>
   {
     protected override long Encode(short value)
@@ -410,15 +405,15 @@ protected override long Encode(short value)
 
     protected override short Decode(long value)
     {
-      return unchecked ((short) value);
+      return unchecked((short) value);
     }
 
     public ShortFieldAccessor()
       : base(sizeof(short) * 8, 9)
     {
     }
   }
-  
+
   internal sealed class UShortFieldAccessor : ValueFieldAccessor<ushort>
   {
     protected override long Encode(ushort value)
@@ -428,15 +423,15 @@ protected override long Encode(ushort value)
 
     protected override ushort Decode(long value)
     {
-      return unchecked ((ushort) value);
+      return unchecked((ushort) value);
     }
 
     public UShortFieldAccessor()
       : base(sizeof(ushort) * 8, 10)
     {
     }
   }
-  
+
   internal sealed class IntFieldAccessor : ValueFieldAccessor<int>
   {
     protected override long Encode(int value)
@@ -446,15 +441,15 @@ protected override long Encode(int value)
 
     protected override int Decode(long value)
     {
-      return unchecked ((int) value);
+      return unchecked((int) value);
     }
 
     public IntFieldAccessor()
       : base(sizeof(int) * 8, 11)
     {
     }
   }
-  
+
   internal sealed class UIntFieldAccessor : ValueFieldAccessor<uint>
   {
     protected override long Encode(uint value)
@@ -464,15 +459,15 @@ protected override long Encode(uint value)
 
     protected override uint Decode(long value)
     {
-      return unchecked ((uint) value);
+      return unchecked((uint) value);
     }
 
     public UIntFieldAccessor()
       : base(sizeof(uint) * 8, 12)
     {
     }
   }
-  
+
   internal sealed class LongFieldAccessor : ValueFieldAccessor<long>
   {
     protected override long Encode(long value)
@@ -490,7 +485,7 @@ public LongFieldAccessor()
     {
     }
   }
-  
+
   internal sealed class ULongFieldAccessor : ValueFieldAccessor<ulong>
   {
     protected override long Encode(ulong value)
@@ -529,7 +524,7 @@ protected override void Encode(Guid value, long[] values, int offset)
 
     private static unsafe int GetSize()
     {
-      return sizeof (Guid);
+      return sizeof(Guid);
     }
 
     public GuidFieldAccessor()

Orm/Xtensive.Orm/Tuples/Packed/PackedFieldDescriptiorExtensions.cs

@@ -0,0 +1,20 @@
+// Copyright (C) 2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
+
+namespace Xtensive.Tuples.Packed
+{
+  internal static class PackedFieldDescriptorExtensions
+  {
+    private const int OffsetBitCount = 6;
+    private const int OffsetMask = (1 << OffsetBitCount) - 1;
+
+    public static PackedFieldAccessor GetAccessor(in this PackedFieldDescriptor descriptor) => PackedFieldAccessor.All[descriptor.AccessorIndex];
+    public static bool IsObjectField(in this PackedFieldDescriptor descriptor) => descriptor.GetAccessor().Rank < 0;
+    public static int GetObjectIndex(in this PackedFieldDescriptor descriptor) => descriptor.DataPosition;
+    public static int GetValueIndex(in this PackedFieldDescriptor descriptor) => descriptor.DataPosition >> OffsetBitCount;
+    public static int GetValueBitOffset(in this PackedFieldDescriptor descriptor) => descriptor.DataPosition & OffsetMask;
+    public static int GetStateIndex(in this PackedFieldDescriptor descriptor) => descriptor.StatePosition >> OffsetBitCount;
+    public static int GetStateBitOffset(in this PackedFieldDescriptor descriptor) => descriptor.StatePosition & OffsetMask;
+  }
+}

Orm/Xtensive.Orm/Tuples/Packed/PackedFieldDescriptor.cs

@@ -11,25 +11,10 @@ namespace Xtensive.Tuples.Packed
   [Serializable]
   internal struct PackedFieldDescriptor
   {
-    private const int OffsetBitCount = 6;
-    private const int OffsetMask = (1 << OffsetBitCount) - 1;
-
     internal int DataPosition;
     internal ushort StatePosition;
 
     [NonSerialized]
     internal byte AccessorIndex;
-
-    public PackedFieldAccessor Accessor => PackedFieldAccessor.All[AccessorIndex];
-
-    public bool IsObjectField => Accessor.Rank < 0;
-
-    public int ObjectIndex => DataPosition;
-
-    public int ValueIndex => DataPosition >> OffsetBitCount;
-    public int ValueBitOffset => DataPosition & OffsetMask;
-
-    public int StateIndex => StatePosition >> OffsetBitCount;
-    public int StateBitOffset => StatePosition & OffsetMask;
   }
-}
+}