rename DateTimeZone to DateTimeOffset.

dotnet · Aug 19, 2018 · e0d66b0 · e0d66b0
1 parent bc530e9
commit e0d66b0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/src/Microsoft.ML.Core/Data/ColumnType.cs b/src/Microsoft.ML.Core/Data/ColumnType.cs
@@ -156,10 +156,10 @@ public bool IsDateTimeZone
         {
             get
             {
-                if (!(this is DateTimeZoneType))
+                if (!(this is DateTimeOffsetType))
                     return false;
-                // DateTimeZoneType is a singleton.
-                Contracts.Assert(this == DateTimeZoneType.Instance);
+                // DateTimeOffsetType is a singleton.
+                Contracts.Assert(this == DateTimeOffsetType.Instance);
                 return true;
             }
         }
@@ -319,7 +319,7 @@ public static PrimitiveType FromKind(DataKind kind)
             if (kind == DataKind.DT)
                 return DateTimeType.Instance;
             if (kind == DataKind.DZ)
-                return DateTimeZoneType.Instance;
+                return DateTimeOffsetType.Instance;
             return NumberType.FromKind(kind);
         }
     }
@@ -623,20 +623,20 @@ public override string ToString()
         }
     }
 
-    public sealed class DateTimeZoneType : PrimitiveType
+    public sealed class DateTimeOffsetType : PrimitiveType
     {
-        private static volatile DateTimeZoneType _instance;
-        public static DateTimeZoneType Instance
+        private static volatile DateTimeOffsetType _instance;
+        public static DateTimeOffsetType Instance
         {
             get
             {
                 if (_instance == null)
-                    Interlocked.CompareExchange(ref _instance, new DateTimeZoneType(), null);
+                    Interlocked.CompareExchange(ref _instance, new DateTimeOffsetType(), null);
                 return _instance;
             }
         }
 
-        private DateTimeZoneType()
+        private DateTimeOffsetType()
             : base(typeof(DateTimeOffset), DataKind.DZ)
         {
         }
@@ -645,7 +645,7 @@ public override bool Equals(ColumnType other)
         {
             if (other == this)
                 return true;
-            Contracts.Assert(!(other is DateTimeZoneType));
+            Contracts.Assert(!(other is DateTimeOffsetType));
             return false;
         }
 

diff --git a/src/Microsoft.ML.Data/DataLoadSave/Binary/CodecFactory.cs b/src/Microsoft.ML.Data/DataLoadSave/Binary/CodecFactory.cs
@@ -58,7 +58,7 @@ public CodecFactory(IHostEnvironment env, MemoryStreamPool memPool = null)
             RegisterSimpleCodec(new DvTextCodec(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.

diff --git a/src/Microsoft.ML.Data/DataLoadSave/Binary/Codecs.cs b/src/Microsoft.ML.Data/DataLoadSave/Binary/Codecs.cs
@@ -666,12 +666,12 @@ public override void Get(ref DateTime value)
             }
         }
 
-        private sealed class DateTimeZoneCodec : SimpleCodec<DateTimeOffset>
+        private sealed class DateTimeOffsetCodec : SimpleCodec<DateTimeOffset>
         {
             private readonly MadeObjectPool<long[]> _longBufferPool;
 
-            public DateTimeZoneCodec(CodecFactory factory)
-                : base(factory, DateTimeZoneType.Instance)
+            public DateTimeOffsetCodec(CodecFactory factory)
+                : base(factory, DateTimeOffsetType.Instance)
             {
                 _longBufferPool = new MadeObjectPool<long[]>(() => null);
             }
@@ -691,7 +691,7 @@ private sealed class Writer : ValueWriterBase<DateTimeOffset>
                 private List<long> _offsets;
                 private List<long> _ticks;
 
-                public Writer(DateTimeZoneCodec codec, Stream stream)
+                public Writer(DateTimeOffsetCodec codec, Stream stream)
                     : base(codec.Factory, stream)
                 {
                     _offsets = new List<long>();
@@ -725,15 +725,15 @@ public override long GetCommitLengthEstimate()
 
             private sealed class Reader : ValueReaderBase<DateTimeOffset>
             {
-                private readonly DateTimeZoneCodec _codec;
+                private readonly DateTimeOffsetCodec _codec;
 
                 private readonly int _entries;
                 private long[] _offsets;
                 private long[] _ticks;
                 private int _index;
                 private bool _disposed;
 
-                public Reader(DateTimeZoneCodec codec, Stream stream, int items)
+                public Reader(DateTimeOffsetCodec codec, Stream stream, int items)
                     : base(codec.Factory, stream)
                 {
                     _codec = codec;

diff --git a/src/Microsoft.ML.Parquet/ParquetLoader.cs b/src/Microsoft.ML.Parquet/ParquetLoader.cs
@@ -358,7 +358,7 @@ private ColumnType ConvertFieldType(DataType parquetType)
                 case DataType.Decimal:
                     return NumberType.R8;
                 case DataType.DateTimeOffset:
-                    return DateTimeZoneType.Instance;
+                    return DateTimeOffsetType.Instance;
                 case DataType.Interval:
                     return TimeSpanType.Instance;
                 default: