merge DvDateTime et. al.

Author: codemzs

src/Microsoft.ML.Data/Data/Conversion.cs

@@ -14,7 +14,7 @@
 
 namespace Microsoft.ML.Runtime.Data.Conversion
 {
-    using BL = Boolean;;
+    using BL = Boolean;
     using DT = DateTime;
     using DZ = DateTimeOffset;
     using R4 = Single;

src/Microsoft.ML.Data/DataLoadSave/Binary/CodecFactory.cs

@@ -52,18 +52,21 @@ public CodecFactory(IHostEnvironment env, MemoryStreamPool memPool = null)
             RegisterSimpleCodec(new UnsafeTypeCodec<uint>(this));
             RegisterSimpleCodec(new UnsafeTypeCodec<long>(this));
             RegisterSimpleCodec(new UnsafeTypeCodec<ulong>(this));
-            RegisterSimpleCodec(new UnsafeTypeCodec<Single>(this));
-            RegisterSimpleCodec(new UnsafeTypeCodec<Double>(this));
-            RegisterSimpleCodec(new UnsafeTypeCodec<DvTimeSpan>(this));
-            RegisterSimpleCodec(new DvTextCodec(this));
+            RegisterSimpleCodec(new UnsafeTypeCodec<float>(this));
+            RegisterSimpleCodec(new UnsafeTypeCodec<double>(this));
+            RegisterSimpleCodec(new UnsafeTypeCodec<TimeSpan>(this));
+            RegisterSimpleCodec(new TextCodec(this));
             RegisterSimpleCodec(new BoolCodec(this));
             RegisterSimpleCodec(new DateTimeCodec(this));
-            RegisterSimpleCodec(new DateTimeZoneCodec(this));
+            RegisterSimpleCodec(new DateTimeOffsetCodec(this));
             RegisterSimpleCodec(new UnsafeTypeCodec<UInt128>(this));
 
-            // Register the old boolean reading codec.
-            var oldBool = new OldBoolCodec(this);
-            RegisterOtherCodec("DvBool", oldBool.GetCodec);
+            // Register the old type system reading codec.
+            RegisterOtherCodec("DvBool", new OldBoolCodec(this).GetCodec);
+            RegisterOtherCodec("DvDateTimeZone", new DateTimeOffsetCodec(this).GetCodec);
+            RegisterOtherCodec("DvDateTime", new DateTimeCodec(this).GetCodec);
+            RegisterOtherCodec("DvTimeSpan", new UnsafeTypeCodec<TimeSpan>(this).GetCodec);
+
             RegisterOtherCodec("VBuffer", GetVBufferCodec);
             RegisterOtherCodec("Key", GetKeyCodec);
         }

src/Microsoft.ML.Data/DataLoadSave/Binary/Codecs.cs

@@ -305,7 +305,7 @@ public override void Read(T[] values, int index, int count)
             }
         }
 
-        private sealed class DvTextCodec : SimpleCodec<ReadOnlyMemory<char>>
+        private sealed class TextCodec : SimpleCodec<ReadOnlyMemory<char>>
         {
             private const int LengthMask = unchecked((int)0x7FFFFFFF);
 
@@ -319,7 +319,7 @@ public override string LoadName
             // int[entries]: The non-decreasing end-boundary character index array, with high bit set for "missing" values.
             // string: The UTF-8 encoded string, with the standard LEB128 byte-length preceeding it.
 
-            public DvTextCodec(CodecFactory factory)
+            public TextCodec(CodecFactory factory)
                 : base(factory, TextType.Instance)
             {
             }
@@ -339,7 +339,7 @@ private sealed class Writer : ValueWriterBase<ReadOnlyMemory<char>>
                 private StringBuilder _builder;
                 private List<int> _boundaries;
 
-                public Writer(DvTextCodec codec, Stream stream)
+                public Writer(TextCodec codec, Stream stream)
                     : base(codec.Factory, stream)
                 {
                     _builder = new StringBuilder();
@@ -379,7 +379,7 @@ private sealed class Reader : ValueReaderBase<ReadOnlyMemory<char>>
                 private int _index;
                 private string _text;
 
-                public Reader(DvTextCodec codec, Stream stream, int items)
+                public Reader(TextCodec codec, Stream stream, int items)
                     : base(codec.Factory, stream)
                 {
                     _entries = Reader.ReadInt32();
@@ -753,7 +753,6 @@ public Reader(DateTimeOffsetCodec codec, Stream stream, int items)
                     Utils.EnsureSize(ref _ticks, _entries, false);
                     for (int i = 0; i < _entries; i++)
                         _ticks[i] = Reader.ReadInt64();
-                        
                 }
 
                 public override void MoveNext()