fixes

Author: asmyasnikov

table/options/models.go

@@ -447,7 +447,7 @@ func (ttl TimeToLiveSettings) WithColumnName(columnName string) TimeToLiveSettin
 	return ttl
 }
 
-func (ttl TimeToLiveSettings) WithExpireAfter(expireAfter time.Duration) TimeToLiveSettings {
+func (ttl TimeToLiveSettings) ExpireAfter(expireAfter time.Duration) TimeToLiveSettings {
 	ttl.ExpireAfterSeconds = uint32(expireAfter.Seconds())
 	return ttl
 }
@@ -457,11 +457,61 @@ func (ttl TimeToLiveSettings) WithMode(mode TimeToLiveMode) TimeToLiveSettings {
 	return ttl
 }
 
+func (ttl TimeToLiveSettings) ModeDate() TimeToLiveSettings {
+	ttl.Mode = TimeToLiveModeDateType
+	ttl.ColumnUnit = nil
+	return ttl
+}
+
+func (ttl TimeToLiveSettings) ModeSinceEpoch() TimeToLiveSettings {
+	ttl.Mode = TimeToLiveModeValueSinceUnixEpoch
+	if ttl.ColumnUnit == nil {
+		return ttl.ColumnUnitSeconds()
+	}
+	return ttl
+}
+
 func (ttl TimeToLiveSettings) WithColumnUnit(columnUnit TimeToLiveUnit) TimeToLiveSettings {
 	ttl.ColumnUnit = &columnUnit
 	return ttl
 }
 
+func (ttl TimeToLiveSettings) ColumnUnitSeconds() TimeToLiveSettings {
+	if ttl.Mode != TimeToLiveModeValueSinceUnixEpoch {
+		ttl.Mode = TimeToLiveModeValueSinceUnixEpoch
+	}
+	columnUnit := TimeToLiveUnitSeconds
+	ttl.ColumnUnit = &columnUnit
+	return ttl
+}
+
+func (ttl TimeToLiveSettings) ColumnUnitMilliseconds() TimeToLiveSettings {
+	if ttl.Mode != TimeToLiveModeValueSinceUnixEpoch {
+		ttl.Mode = TimeToLiveModeValueSinceUnixEpoch
+	}
+	columnUnit := TimeToLiveUnitMilliseconds
+	ttl.ColumnUnit = &columnUnit
+	return ttl
+}
+
+func (ttl TimeToLiveSettings) ColumnUnitMicroseconds() TimeToLiveSettings {
+	if ttl.Mode != TimeToLiveModeValueSinceUnixEpoch {
+		ttl.Mode = TimeToLiveModeValueSinceUnixEpoch
+	}
+	columnUnit := TimeToLiveUnitMicroseconds
+	ttl.ColumnUnit = &columnUnit
+	return ttl
+}
+
+func (ttl TimeToLiveSettings) ColumnUnitNanoseconds() TimeToLiveSettings {
+	if ttl.Mode != TimeToLiveModeValueSinceUnixEpoch {
+		ttl.Mode = TimeToLiveModeValueSinceUnixEpoch
+	}
+	columnUnit := TimeToLiveUnitNanoseconds
+	ttl.ColumnUnit = &columnUnit
+	return ttl
+}
+
 func (ttl *TimeToLiveSettings) ToYDB() *Ydb_Table.TtlSettings {
 	if ttl == nil {
 		return nil

table/options/models_test.go

@@ -1,9 +1,10 @@
 package options
 
 import (
-	"reflect"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestTimeToLiveSettingsFluentModifiers(t *testing.T) {
@@ -16,7 +17,49 @@ func TestTimeToLiveSettingsFluentModifiers(t *testing.T) {
 				WithColumnName("a").
 				WithColumnUnit(TimeToLiveUnitSeconds).
 				WithMode(TimeToLiveModeValueSinceUnixEpoch).
-				WithExpireAfter(time.Hour),
+				ExpireAfter(time.Hour),
+			expectedSettings: TimeToLiveSettings{
+				ColumnName:         "a",
+				Mode:               TimeToLiveModeValueSinceUnixEpoch,
+				ExpireAfterSeconds: uint32(time.Hour.Seconds()),
+				ColumnUnit: func() *TimeToLiveUnit {
+					u := TimeToLiveUnitSeconds
+					return &u
+				}(),
+			},
+		},
+		{
+			fluentSettings: TimeToLiveSettings{}.
+				WithColumnName("a").
+				ModeDate().
+				ExpireAfter(time.Hour),
+			expectedSettings: TimeToLiveSettings{
+				ColumnName:         "a",
+				Mode:               TimeToLiveModeDateType,
+				ExpireAfterSeconds: uint32(time.Hour.Seconds()),
+			},
+		},
+		{
+			fluentSettings: TimeToLiveSettings{}.
+				WithColumnName("a").
+				ModeSinceEpoch().
+				ColumnUnitSeconds().
+				ExpireAfter(time.Hour),
+			expectedSettings: TimeToLiveSettings{
+				ColumnName:         "a",
+				Mode:               TimeToLiveModeValueSinceUnixEpoch,
+				ExpireAfterSeconds: uint32(time.Hour.Seconds()),
+				ColumnUnit: func() *TimeToLiveUnit {
+					u := TimeToLiveUnitSeconds
+					return &u
+				}(),
+			},
+		},
+		{
+			fluentSettings: TimeToLiveSettings{}.
+				WithColumnName("a").
+				ColumnUnitSeconds().
+				ExpireAfter(time.Hour),
 			expectedSettings: TimeToLiveSettings{
 				ColumnName:         "a",
 				Mode:               TimeToLiveModeValueSinceUnixEpoch,
@@ -27,11 +70,54 @@ func TestTimeToLiveSettingsFluentModifiers(t *testing.T) {
 				}(),
 			},
 		},
+		{
+			fluentSettings: TimeToLiveSettings{}.
+				WithColumnName("a").
+				ColumnUnitMilliseconds().
+				ExpireAfter(time.Hour),
+			expectedSettings: TimeToLiveSettings{
+				ColumnName:         "a",
+				Mode:               TimeToLiveModeValueSinceUnixEpoch,
+				ExpireAfterSeconds: uint32(time.Hour.Seconds()),
+				ColumnUnit: func() *TimeToLiveUnit {
+					u := TimeToLiveUnitMilliseconds
+					return &u
+				}(),
+			},
+		},
+		{
+			fluentSettings: TimeToLiveSettings{}.
+				WithColumnName("a").
+				ColumnUnitMicroseconds().
+				ExpireAfter(time.Hour),
+			expectedSettings: TimeToLiveSettings{
+				ColumnName:         "a",
+				Mode:               TimeToLiveModeValueSinceUnixEpoch,
+				ExpireAfterSeconds: uint32(time.Hour.Seconds()),
+				ColumnUnit: func() *TimeToLiveUnit {
+					u := TimeToLiveUnitMicroseconds
+					return &u
+				}(),
+			},
+		},
+		{
+			fluentSettings: TimeToLiveSettings{}.
+				WithColumnName("a").
+				ColumnUnitNanoseconds().
+				ExpireAfter(time.Hour),
+			expectedSettings: TimeToLiveSettings{
+				ColumnName:         "a",
+				Mode:               TimeToLiveModeValueSinceUnixEpoch,
+				ExpireAfterSeconds: uint32(time.Hour.Seconds()),
+				ColumnUnit: func() *TimeToLiveUnit {
+					u := TimeToLiveUnitNanoseconds
+					return &u
+				}(),
+			},
+		},
 	} {
 		t.Run("", func(t *testing.T) {
-			if !reflect.DeepEqual(tt.fluentSettings, tt.expectedSettings) {
-				t.Errorf("unexpected ttl settings: %v, expectedSettings: %v", tt.fluentSettings, tt.expectedSettings)
-			}
+			require.Equal(t, tt.fluentSettings, tt.expectedSettings)
 		})
 	}
 }