Nullable Timespan

aloneguid · Mar 19, 2024 · 17ce00a · 17ce00a
1 parent d8febde
commit 17ce00a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/src/Parquet.Test/Serialisation/ParquetSerializerTest.cs b/src/Parquet.Test/Serialisation/ParquetSerializerTest.cs
@@ -90,6 +90,23 @@ public async Task Atomics_Simplest_Serde() {
 
             await Compare(data);
         }
+
+        class TimespanRecord {
+            public TimeSpan TimeSpan { get; set; }
+
+            public TimeSpan? NullableTimeSpan { get; set; }
+        }
+
+        [Fact]
+        public async Task TimeSpan_Simplest_Serde() {
+
+            var data = Enumerable.Range(0, 1_000).Select(i => new TimespanRecord {
+                TimeSpan = TimeSpan.Parse("6:12:14:45"),
+                NullableTimeSpan = null,
+            }).ToList();
+
+            await Compare(data);
+        }
 
         [Fact]
         public async Task Atomics_Simplest_Serde_Dict() {

diff --git a/src/Parquet.Test/Serialisation/SchemaReflectorTest.cs b/src/Parquet.Test/Serialisation/SchemaReflectorTest.cs
@@ -324,6 +324,8 @@ class DatesPoco {
             public DateTime? NullableTimestampDate { get; set; }
 
             public TimeSpan DefaultTime { get; set; }
+
+            public TimeSpan? NullableTimeSpan { get; set; }
 
             [ParquetMicroSecondsTime]
             public TimeSpan MicroTime { get; set; }
@@ -395,6 +397,16 @@ public void Type_TimeSpan_Default() {
             Assert.True(df is TimeSpanDataField);
             Assert.Equal(TimeSpanFormat.MilliSeconds, ((TimeSpanDataField)df).TimeSpanFormat);
         }
+
+        [Fact]
+        public void Type_TimeSpan_Nullable() {
+            ParquetSchema s = typeof(DatesPoco).GetParquetSchema(true);
+
+            DataField df = s.FindDataField(nameof(DatesPoco.NullableTimeSpan));
+            Assert.True(df is TimeSpanDataField);
+            Assert.True(df.IsNullable);
+            Assert.Equal(TimeSpanFormat.MilliSeconds, ((TimeSpanDataField)df).TimeSpanFormat);
+        }
 
         [Fact]
         public void Type_TimeSpan_Micros() {

diff --git a/src/Parquet/Serialization/TypeExtensions.cs b/src/Parquet/Serialization/TypeExtensions.cs
@@ -139,7 +139,7 @@ private static Field ConstructDataField(string name, string propertyName, Type t
                     member?.MicroSecondsTimeAttribute == null
                         ? TimeSpanFormat.MilliSeconds
                         : TimeSpanFormat.MicroSeconds,
-                    isNullable, null, propertyName);
+                    t == typeof(TimeSpan?), null, propertyName);
 #if NET6_0_OR_GREATER
             } else if(t == typeof(TimeOnly) || t == typeof(TimeOnly?)) {
                 r = new TimeOnlyDataField(name,