use UnixMilli() / UnixMicro() to avoid UnixNano limits

... when we are not needing nanosecond accuracy anyhow.

Author: Ginger-Panda

expr/builtins/cast.go

@@ -144,8 +144,7 @@ func toIntEval(ctx expr.EvalContext, vals []value.Value) (value.Value, bool) {
 
 	switch val := vals[0].(type) {
 	case value.TimeValue:
-		iv := val.Val().UnixNano() / 1e6 // Milliseconds
-		return value.NewIntValue(iv), true
+		return value.NewIntValue(val.Int()), true
 	case value.NumberValue:
 		return value.NewIntValue(val.Int()), true
 	case value.IntValue:

expr/builtins/time.go

@@ -523,16 +523,16 @@ func timeTruncEvalTwo(ctx expr.EvalContext, args []value.Value) (value.Value, bo
 	switch itemT := args[0].(type) {
 	case value.TimeValue:
 		// Get full Unix timestamps w/ microseconds and milliseconds.
-		microTs = itemT.Time().In(time.UTC).UnixNano() / 1e3
+		microTs = itemT.Time().In(time.UTC).UnixMicro()
 		milliTs = itemT.Int()
 	default:
 		// If not a TimeValue, convert to a TimeValue and get Unix w/ milliseconds.
 		t, ok := value.ValueToTime(args[0])
 		if !ok || t.IsZero() {
 			return value.NewStringValue(""), false
 		}
-		microTs = t.UnixNano() / 1e3
-		milliTs = microTs / 1e3
+		microTs = t.UnixMicro()
+		milliTs = t.UnixMilli()
 	}
 
 	// Look at the seconds argument to determine the truncation.

value/value.go

@@ -927,11 +927,11 @@ func (m TimeValue) Err() bool                    { return false }
 func (m TimeValue) Type() ValueType              { return TimeType }
 func (m TimeValue) Value() any                   { return m.v }
 func (m TimeValue) Val() time.Time               { return m.v }
+func (m TimeValue) Time() time.Time              { return m.v }
 func (m TimeValue) MarshalJSON() ([]byte, error) { return json.Marshal(m.v) }
 func (m TimeValue) ToString() string             { return strconv.FormatInt(m.Int(), 10) }
-func (m TimeValue) Float() float64               { return float64(m.v.In(time.UTC).UnixNano() / 1e6) }
-func (m TimeValue) Int() int64                   { return m.v.In(time.UTC).UnixNano() / 1e6 }
-func (m TimeValue) Time() time.Time              { return m.v }
+func (m TimeValue) Float() float64               { return float64(m.Int()) }
+func (m TimeValue) Int() int64                   { return m.v.In(time.UTC).UnixMilli() }
 
 func NewErrorValue(v error) ErrorValue {
 	return ErrorValue{v: v}