@@ -216,6 +216,11 @@ func (d Duration) NanoOnly() bool {
 	return d.Months() == 0 && d.Nanoseconds() != 0
 }
 
+// IsMixed returns true if this duration has a combination of month and nanosecond components.
+func (d Duration) IsMixed() bool {
+	return d.Months() != 0 && d.Nanoseconds() != 0
+}
+
 func (d Duration) Months() int64      { return d.months }
 func (d Duration) Nanoseconds() int64 { return d.nsecs }
 
package values

import (
	"strconv"
	"strings"
	"time"
	"unicode/utf8"

	"github.com/influxdata/flux/ast"
	"github.com/influxdata/flux/codes"
	"github.com/influxdata/flux/internal/errors"
	"github.com/influxdata/flux/internal/parser"
)

type Time int64

// Duration is a vector representing the duration unit components.
type Duration struct {
	// months is the number of months for the duration.
	// This must be a positive value.
	months int64

	// nsecs is the number of nanoseconds for the duration.
	// This must be a positive value.
	nsecs int64

	// negative indicates this duration is a negative value.
	negative bool
}

const (
	fixedWidthTimeFmt = "2006-01-02T15:04:05.000000000Z"
)

func ConvertTime(t time.Time) Time {
	return Time(t.UnixNano())
}

// ConvertDurationNsecs takes a time.Duration and converts it into a Duration with nanoseconds.
func ConvertDurationNsecs(v time.Duration) Duration {
	negative := false
	if v < 0 {
		negative, v = true, -v
	}
	return Duration{
		negative: negative,
		nsecs:    int64(v),
	}
}

// ConvertDurationMonths takes a time.Duration and converts it into a Duration with months.
func ConvertDurationMonths(v time.Duration) Duration {
	negative := false
	if v < 0 {
		negative, v = true, -v
	}
	return Duration{
		months:   int64(v),
		negative: negative,
	}
}

// MakeDuration takes nanoseconds and months as int64 and negative as a bool to construct a Duration
// with mixed units
func MakeDuration(nsecs int64, months int64, negative bool) Duration {
	return Duration{
		months:   months,
		nsecs:    nsecs,
		negative: negative,
	}
}

func (t Time) Round(d Duration) Time {
	if !d.IsPositive() {
		return t
	}
	r := t.Remainder(d)
	if lessThanHalf(r, d) {
		return t - Time(r.Duration())
	}
	return t + Time(d.Duration()-r.Duration())
}

func (t Time) Add(d Duration) Time {
	newT := t
	if d.months > 0 {
		// Determine if the number of months is positive or negative.
		months := d.months
		if d.negative {
			months = -months
		}

		// Retrieve the current date and increment the values
		// based on the number of months.
		ts := t.Time()
		year, month, day := ts.Date()
		year += int(months / 12)
		month += time.Month(months % 12)
		// If the month overflowed or underflowed, adjust the year
		// accordingly. Because we add the modulo for the months,
		// the year will only adjust by one.
		if month > 12 {
			year += 1
			month -= 12
		} else if month <= 0 {
			year -= 1
			month += 12
		}

		// Normalize the day if we are past the end of the month.
		lastDayOfMonth := lastDayOfMonths[month]
		if month == time.February && isLeapYear(year) {
			lastDayOfMonth++
		}

		if day > lastDayOfMonth {
			day = lastDayOfMonth
		}

		// Retrieve the original time and construct a date
		// with the new year, month, and day.
		hour, min, sec := ts.Clock()
		nsec := ts.Nanosecond()
		ts = time.Date(year, month, day, hour, min, sec, nsec, time.UTC)

		// Convert it back to our own Time implementation.
		newT = ConvertTime(ts)
	}

	// Add the number of nanoseconds to the time.
	nsecs := d.nsecs
	if d.negative {
		nsecs = -nsecs
	}
	return newT + Time(nsecs)
}

// Sub takes another time and returns a duration giving the duration
// between the two times. A positive duration indicates that the receiver
// occurs after the other time.
func (t Time) Sub(other Time) Duration {
	return ConvertDurationNsecs(time.Duration(t - other))
}

// Remainder divides t by d and returns the remainder.
func (t Time) Remainder(d Duration) (r Duration) {
	return ConvertDurationNsecs(time.Duration(t) % d.Duration())
}

// lessThanHalf reports whether x+x < y but avoids overflow,
// assuming x and y are both positive (Duration is signed).
func lessThanHalf(x, y Duration) bool {
	xnsecs, ynsecs := x.Duration(), y.Duration()
	return uint64(xnsecs)+uint64(xnsecs) < uint64(ynsecs)
}

func (t Time) String() string {
	return t.Time().Format(fixedWidthTimeFmt)
}

func ParseTime(s string) (Time, error) {
	t, err := time.Parse(fixedWidthTimeFmt, s)
	if err != nil {
		return 0, err
	}
	return ConvertTime(t), nil
}

func (t Time) Time() time.Time {
	return time.Unix(0, int64(t)).UTC()
}

// Mul will multiply the Duration by a scalar.
// This multiplies each component of the vector.
func (d Duration) Mul(scale int) Duration {
	// If the duration is zero, do nothing.
	// This prevents a zero value from becoming negative
	// which is not possible.
	if d.IsZero() {
		return d
	}
	if scale < 0 {
		scale = -scale
		d.negative = !d.negative
	}
	d.months *= int64(scale)
	d.nsecs *= int64(scale)
	return d
}

// IsPositive returns true if this is a positive number.
// It returns false if the number is zero.
func (d Duration) IsPositive() bool {
	return !d.negative && !d.IsZero()
}

// IsNegative returns true if this is a negative number.
// It returns false if the number is zero.
func (d Duration) IsNegative() bool {
	return d.negative
}

// IsZero returns true if this is a zero duration.
func (d Duration) IsZero() bool {
	return d.months == 0 && d.nsecs == 0
}

// MonthsOnly returns true if this duration does not have a
// nanosecond component.
func (d Duration) MonthsOnly() bool {
	return d.Months() != 0 && d.Nanoseconds() == 0
}

// NanoOnly returns true if this duration does not have a month component.
func (d Duration) NanoOnly() bool {
	return d.Months() == 0 && d.Nanoseconds() != 0
}

func (d Duration) Months() int64      { return d.months }
func (d Duration) Nanoseconds() int64 { return d.nsecs }

// Normalize will normalize the duration within the interval.
// It will ensure that the output duration is the smallest positive
// duration that is the equivalent of the current duration.
func (d Duration) Normalize(interval Duration) Duration {
	if d.MonthsOnly() && interval.MonthsOnly() {
		r := d.Months() % interval.Months()
		switch {
		case d.IsNegative() && interval.IsNegative():
			return Duration{
				months: -r + interval.Months(),
			}
		case d.IsNegative() && interval.IsPositive():
			return Duration{
				months: -r + interval.Months(),
			}
		case d.IsPositive() && interval.IsNegative():
			return Duration{
				months: r,
			}
		case d.IsPositive() && interval.IsPositive():
			return Duration{
				months: r,
			}
		}
	}
	offset, every := int64(d.Duration()), int64(interval.Duration())
	if offset < 0 {
		offset += every * ((offset / -every) + 1)
	} else if offset > every {
		offset -= every * (offset / every)
	}
	return ConvertDurationNsecs(time.Duration(offset))
}

// Equal returns true if the two durations are equal.
func (d Duration) Equal(other Duration) bool {
	return d.negative == other.negative &&
		d.months == other.months &&
		d.nsecs == other.nsecs
}

// Duration will return the nanosecond equivalent
// of this duration. It will assume that all months are
// the same length.
//
// It is recommended not to use this method unless
// it is absolutely needed. This method will lose
// any precision that is present in the Duration
// and it should only be used for interfacing with
// outside code that is not month-aware.
func (d Duration) Duration() time.Duration {
	months := int64(0)
	if d.months > 0 {
		const nsecsPerMonth = 365.25 * 24 * float64(time.Hour) / 12
		months = int64(float64(d.months) * nsecsPerMonth)
	}
	dur := d.nsecs + months
	if d.negative {
		dur = -dur
	}
	return time.Duration(dur)
}

// AsValues will reconstruct the duration as a set of values.
// All of the components will be positive numbers.
func (d Duration) AsValues() []ast.Duration {
	if d.IsZero() {
		return nil
	}

	var values []ast.Duration
	if d.months > 0 {
		if years := d.months / 12; years > 0 {
			values = append(values, ast.Duration{
				Magnitude: years,
				Unit:      ast.YearUnit,
			})
		}
		if months := d.months % 12; months > 0 {
			values = append(values, ast.Duration{
				Magnitude: months,
				Unit:      ast.MonthUnit,
			})
		}
	}

	if d.nsecs > 0 {
		nsecs := d.nsecs % 1000
		d.nsecs /= 1000
		usecs := d.nsecs % 1000
		d.nsecs /= 1000
		msecs := d.nsecs % 1000
		d.nsecs /= 1000
		secs := d.nsecs % 60
		d.nsecs /= 60
		mins := d.nsecs % 60
		d.nsecs /= 60
		hours := d.nsecs % 24
		d.nsecs /= 24
		days := d.nsecs % 7
		d.nsecs /= 7
		weeks := d.nsecs

		if weeks > 0 {
			values = append(values, ast.Duration{
				Magnitude: weeks,
				Unit:      ast.WeekUnit,
			})
		}
		if days > 0 {
			values = append(values, ast.Duration{
				Magnitude: days,
				Unit:      ast.DayUnit,
			})
		}
		if hours > 0 {
			values = append(values, ast.Duration{
				Magnitude: hours,
				Unit:      ast.HourUnit,
			})
		}
		if mins > 0 {
			values = append(values, ast.Duration{
				Magnitude: mins,
				Unit:      ast.MinuteUnit,
			})
		}
		if secs > 0 {
			values = append(values, ast.Duration{
				Magnitude: secs,
				Unit:      ast.SecondUnit,
			})
		}
		if msecs > 0 {
			values = append(values, ast.Duration{
				Magnitude: msecs,
				Unit:      ast.MillisecondUnit,
			})
		}
		if usecs > 0 {
			values = append(values, ast.Duration{
				Magnitude: usecs,
				Unit:      ast.MicrosecondUnit,
			})
		}
		if nsecs > 0 {
			values = append(values, ast.Duration{
				Magnitude: nsecs,
				Unit:      ast.NanosecondUnit,
			})
		}
	}
	return values
}

func (d Duration) String() string {
	values := d.AsValues()
	if len(values) == 0 {
		return "0ns"
	}

	var buf []byte
	writeInt := func(sb *strings.Builder, v int64, unit string) {
		buf = strconv.AppendInt(buf, v, 10)
		sb.Grow(len(buf) + len(unit))
		sb.Write(buf)
		sb.WriteString(unit)
		buf = buf[:0]
	}
	var sb strings.Builder
	if d.IsNegative() {
		sb.WriteByte('-')
	}
	for _, v := range values {
		writeInt(&sb, v.Magnitude, v.Unit)
	}
	return sb.String()
}

func (d Duration) MarshalText() ([]byte, error) {
	return []byte(d.String()), nil
}

func (d *Duration) UnmarshalText(data []byte) error {
	dur, err := ParseDuration(string(data))
	if err != nil {
		return err
	}
	*d = dur
	return nil
}

func ParseDuration(s string) (Duration, error) {
	dur, err := parseSignedDuration(s)
	if err != nil {
		return Duration{}, err
	}
	return FromDurationValues(dur)
}

// parseSignedDuration will convert a string into a possibly negative DurationLiteral.
func parseSignedDuration(lit string) ([]ast.Duration, error) {
	r, s := utf8.DecodeRuneInString(lit)
	if r == '-' {
		d, err := parser.ParseDuration(lit[s:])
		if err != nil {
			return nil, err
		}
		for i := range d {
			d[i].Magnitude = -d[i].Magnitude
		}
		return d, nil
	}
	return parser.ParseDuration(lit)
}

// FromDurationValues creates a duration value from the duration values.
func FromDurationValues(dur []ast.Duration) (d Duration, err error) {
	if len(dur) == 0 {
		return d, nil
	}

	// Determine if this duration is negative. Every other value
	// must be consistent with this.
	d.negative = dur[0].Magnitude < 0
	for _, du := range dur {
		mag, unit := du.Magnitude, du.Unit
		if (mag >= 0 && d.negative) || (mag < 0 && !d.negative) {
			return Duration{}, errors.New(codes.Invalid, "duration magnitudes must be the same sign")
		}

		if d.negative {
			mag = -mag
		}

		switch unit {
		case "y":
			mag *= 12
			fallthrough
		case "mo":
			d.months += mag
		case "w":
			mag *= 7
			fallthrough
		case "d":
			mag *= 24
			fallthrough
		case "h":
			mag *= 60
			fallthrough
		case "m":
			mag *= 60
			fallthrough
		case "s":
			mag *= 1000
			fallthrough
		case "ms":
			mag *= 1000
			fallthrough
		case "us", "µs":
			mag *= 1000
			fallthrough
		case "ns":
			d.nsecs += mag
		}
	}
	return d, nil
}

var lastDayOfMonths = map[time.Month]int{
	time.January:   31,
	time.February:  28,
	time.March:     31,
	time.April:     30,
	time.May:       31,
	time.June:      30,
	time.July:      31,
	time.August:    31,
	time.September: 30,
	time.October:   31,
	time.November:  30,
	time.December:  31,
}

func isLeapYear(year int) bool {
	return year%400 == 0 || (year%4 == 0 && year%100 != 0)
}

Yep, this was missing.