diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c8a221..9b5bcbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,11 @@ UNRELEASED [XXXX-XX-XX] - improve error handling - improve code readability - remove code gen to prepare for Timestamp support +- Types - add Bow data type in Buffer to decouple Go native types from Arrow types + - add support for Arrow Timestamp type +- Parquet + - use the new arrow/go/v8/parquet package instead of xitongsys/parquet-go v0.18.0 [2022-02-16] ------------------- diff --git a/XXXexamples_test.go b/XXXexamples_test.go index 45ee31f..08fbce7 100644 --- a/XXXexamples_test.go +++ b/XXXexamples_test.go @@ -49,25 +49,24 @@ func ExampleNewBowFromColBasedInterfaces() { } func ExampleNewBowFromRowBasedInterfaces() { - colNames := []string{"time", "value", "valueFromJSON"} - colTypes := []Type{Int64, Int64, Float64} - rowBasedData := [][]interface{}{ - {1, 1, json.Number("1.1")}, - {1.2, json.Number("1.2"), 2}, - {json.Number("3"), 3, 1.3}, - } - - b, err := NewBowFromRowBasedInterfaces(colNames, colTypes, rowBasedData) + b, err := NewBowFromRowBasedInterfaces( + []string{"time", "int", "float"}, + []Type{TimestampMilli, Int64, Float64}, + [][]interface{}{ + {"2022-04-27T01:00:00.001Z", 1, 1.1}, + {"2022-04-27T02:00:00.002Z", 2, 2.2}, + {"2022-04-27T03:00:00.003Z", 3, 3.3}, + }) if err != nil { panic(err) } fmt.Println(b) // Output: - // time:int64 value:int64 valueFromJSON:float64 - // 1 1 1.1 - // 1 2 - // 3 3 1.3 + // time:timestamp[ms, tz=UTC] int:int64 float:float64 + // 2022-04-27T01:00:00.001Z 1 1.1 + // 2022-04-27T02:00:00.002Z 2 2.2 + // 2022-04-27T03:00:00.003Z 3 3.3 } func ExampleBow_MarshalJSON() { diff --git a/bow.go b/bow.go index dfba6fe..a3662d0 100644 --- a/bow.go +++ b/bow.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "reflect" - "time" "github.com/apache/arrow/go/v8/arrow" "github.com/apache/arrow/go/v8/arrow/array" @@ -88,7 +87,6 @@ type Bow interface { UnmarshalJSON(data []byte) error NewValuesFromJSON(jsonB JSONBow) error WriteParquet(path string, verbose bool) error - GetParquetMetaColTimeUnit(colIndex int) (time.Duration, error) } type bow struct { diff --git a/bowappend.go b/bowappend.go index 4dcd2d9..6015797 100644 --- a/bowappend.go +++ b/bowappend.go @@ -89,6 +89,21 @@ func AppendBows(bows ...Bow) (Bow, error) { builder.AppendValues(v, valid) } newArray = builder.NewArray() + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + builder := array.NewTimestampBuilder(mem, mapBowToArrowTypes[refType].(*arrow.TimestampType)) + builder.Resize(numRows) + for _, b := range bows { + if colType := b.ColumnType(colIndex); colType != refType { + return nil, fmt.Errorf( + "incompatible types '%s' and '%s'", refType, colType) + } + data := b.(*bow).Column(colIndex).Data() + arr := array.NewTimestampData(data) + v := timestampValues(arr) + valid := getValiditySlice(arr) + builder.AppendValues(v, valid) + } + newArray = builder.NewArray() default: return nil, fmt.Errorf("unsupported type '%s'", refType) } diff --git a/bowbuffer.go b/bowbuffer.go index fbcfed3..7f2fb36 100644 --- a/bowbuffer.go +++ b/bowbuffer.go @@ -4,6 +4,7 @@ import ( "fmt" "sort" + "github.com/apache/arrow/go/v8/arrow" "github.com/apache/arrow/go/v8/arrow/array" "github.com/apache/arrow/go/v8/arrow/bitutil" ) @@ -33,6 +34,8 @@ func NewBuffer(size int, typ Type) Buffer { buf.Data = make([]bool, size) case String: buf.Data = make([]string, size) + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + buf.Data = make([]arrow.Timestamp, size) default: panic(fmt.Errorf("unsupported type '%s'", typ)) } @@ -50,6 +53,8 @@ func (b Buffer) Len() int { return len(b.Data.([]bool)) case String: return len(b.Data.([]string)) + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + return len(b.Data.([]arrow.Timestamp)) default: panic(fmt.Errorf("unsupported type '%s'", b.DataType)) } @@ -68,6 +73,8 @@ func (b *Buffer) SetOrDrop(i int, value interface{}) { b.Data.([]bool)[i], valid = Boolean.Convert(value).(bool) case String: b.Data.([]string)[i], valid = String.Convert(value).(string) + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + b.Data.([]arrow.Timestamp)[i], valid = b.DataType.Convert(value).(arrow.Timestamp) default: panic(fmt.Errorf("unsupported type '%s'", b.DataType)) } @@ -92,6 +99,16 @@ func (b *Buffer) SetOrDropStrict(i int, value interface{}) { b.Data.([]bool)[i], valid = value.(bool) case String: b.Data.([]string)[i], valid = value.(string) + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + valid = true + switch value := value.(type) { + case arrow.Timestamp: + b.Data.([]arrow.Timestamp)[i] = value + case int64: + b.Data.([]int64)[i] = value + default: + valid = false + } default: panic(fmt.Errorf("unsupported type '%s'", b.DataType)) } @@ -103,7 +120,6 @@ func (b *Buffer) SetOrDropStrict(i int, value interface{}) { } } -// GetValue gets the value at index `i` from the Buffer func (b *Buffer) GetValue(i int) interface{} { if bitutil.BitIsNotSet(b.nullBitmapBytes, i) { return nil @@ -118,6 +134,8 @@ func (b *Buffer) GetValue(i int) interface{} { return b.Data.([]bool)[i] case String: return b.Data.([]string)[i] + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + return b.Data.([]arrow.Timestamp)[i] default: panic(fmt.Errorf("unsupported type '%s'", b.DataType)) } @@ -133,6 +151,8 @@ func (b Buffer) Less(i, j int) bool { return b.Data.([]string)[i] < b.Data.([]string)[j] case Boolean: return !b.Data.([]bool)[i] && b.Data.([]bool)[j] + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + return b.Data.([]arrow.Timestamp)[i] < b.Data.([]arrow.Timestamp)[j] default: panic(fmt.Errorf("unsupported type '%s'", b.DataType)) } @@ -170,9 +190,17 @@ func (b *bow) NewBufferFromCol(colIndex int) Buffer { copy(nullBitmapBytesCopy, nullBitmapBytes) res.Data = stringValues(arr) res.nullBitmapBytes = nullBitmapBytesCopy + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + arr := array.NewTimestampData(data) + nullBitmapBytes := arr.NullBitmapBytes()[:bitutil.CeilByte(arr.Data().Len())/8] + nullBitmapBytesCopy := make([]byte, len(nullBitmapBytes)) + copy(nullBitmapBytesCopy, nullBitmapBytes) + res.Data = timestampValues(arr) + res.nullBitmapBytes = nullBitmapBytesCopy default: panic(fmt.Errorf("unsupported type '%s'", b.ColumnType(colIndex))) } + return res } diff --git a/bowconvert.go b/bowconvert.go index b17c29d..7aa100c 100644 --- a/bowconvert.go +++ b/bowconvert.go @@ -4,6 +4,8 @@ import ( "encoding/json" "fmt" "strconv" + + "github.com/apache/arrow/go/v8/arrow" ) // ToInt64 attempts to convert `input` to int64. @@ -28,17 +30,23 @@ func ToInt64(input interface{}) (output int64, ok bool) { case float64: return int64(input), true case bool: - if input { - return 1, true - } - return 0, true + return boolToInt64(input) case string: output, err := strconv.ParseInt(input, 10, 64) return output, err == nil + case arrow.Timestamp: + return int64(input), true } return } +func boolToInt64(input bool) (int64, bool) { + if input { + return 1, true + } + return 0, true +} + // ToFloat64 attempts to convert `input` to float64. // Return also a false boolean if the conversion failed. func ToFloat64(input interface{}) (output float64, ok bool) { @@ -61,17 +69,23 @@ func ToFloat64(input interface{}) (output float64, ok bool) { case float32: return float64(input), true case bool: - if input { - return 1., true - } - return 0., true + return boolToFloat64(input) case string: output, err := strconv.ParseFloat(input, 64) return output, err == nil + case arrow.Timestamp: + return float64(input), true } return } +func boolToFloat64(input bool) (float64, bool) { + if input { + return 1., true + } + return 0., true +} + // ToBoolean attempts to convert `input` to bool. // Return also a false boolean if the conversion failed. // In case of numeric type, returns true if the value is non-zero. @@ -99,6 +113,8 @@ func ToBoolean(input interface{}) (output bool, ok bool) { return input != 0., true case float64: return input != 0., true + case arrow.Timestamp: + return input != 0, true } return } @@ -108,10 +124,7 @@ func ToBoolean(input interface{}) (output bool, ok bool) { func ToString(input interface{}) (output string, ok bool) { switch input := input.(type) { case bool: - if input { - return "true", true - } - return "false", true + return boolToString(input) case string: return input, true case json.Number: @@ -130,6 +143,63 @@ func ToString(input interface{}) (output string, ok bool) { return fmt.Sprintf("%f", input), true case float64: return fmt.Sprintf("%f", input), true + case arrow.Timestamp: + return strconv.Itoa(int(input)), true } return } + +func boolToString(input bool) (string, bool) { + if input { + return "true", true + } + return "false", true +} + +// ToTimestamp returns an arrow.Timestamp value and a bool whether the conversion was successful or not. +// String values are first interpreted with strconv.ParseInt. +// If it fails, the values are parsed with arrow.TimestampFromString with the `timeUnit` time unit. +func ToTimestamp(input interface{}, timeUnit arrow.TimeUnit) (output arrow.Timestamp, ok bool) { + switch input := input.(type) { + case json.Number: + output, err := input.Int64() + return arrow.Timestamp(output), err == nil + case int: + return arrow.Timestamp(input), true + case int8: + return arrow.Timestamp(input), true + case int16: + return arrow.Timestamp(input), true + case int32: + return arrow.Timestamp(input), true + case int64: + return arrow.Timestamp(input), true + case float32: + return arrow.Timestamp(input), true + case float64: + return arrow.Timestamp(input), true + case bool: + return boolToTimestamp(input) + case string: + return stringToTimestamp(input, timeUnit) + case arrow.Timestamp: + return input, true + } + return +} + +func boolToTimestamp(input bool) (arrow.Timestamp, bool) { + if input { + return 1, true + } + return 0, true +} + +func stringToTimestamp(input string, timeUnit arrow.TimeUnit) (arrow.Timestamp, bool) { + output, err := strconv.ParseInt(input, 10, 64) + if err == nil { + return arrow.Timestamp(output), true + } + outputTS, err := arrow.TimestampFromString(input, timeUnit) + return outputTS, err == nil +} diff --git a/bowconvert_test.go b/bowconvert_test.go index b86125e..a41e24f 100644 --- a/bowconvert_test.go +++ b/bowconvert_test.go @@ -2,7 +2,9 @@ package bow import ( "testing" + "time" + "github.com/apache/arrow/go/v8/arrow" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -124,3 +126,157 @@ func TestToString(t *testing.T) { require.True(t, ok) assert.Equal(t, "0", v) } + +func TestToTimestamp(t *testing.T) { + t.Run("Sec", func(t *testing.T) { + v, ok := ToTimestamp(true, arrow.Second) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(1), v) + + v, ok = ToTimestamp(false, arrow.Second) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp(0., arrow.Second) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp(0, arrow.Second) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp("0", arrow.Second) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + assert.Equal(t, "1970-01-01T00:00:00Z", + v.ToTime(arrow.Second).Format(time.RFC3339Nano)) + + formattedTimeSec := "2022-04-27T00:00:00Z" + ti, err := time.Parse(time.RFC3339, formattedTimeSec) + require.NoError(t, err) + + v, ok = ToTimestamp(ti.Unix(), arrow.Second) + require.True(t, ok) + assert.Equal(t, "2022-04-27T00:00:00Z", + v.ToTime(arrow.Second).Format(time.RFC3339Nano)) + + v, ok = ToTimestamp(formattedTimeSec, arrow.Second) + require.True(t, ok) + assert.Equal(t, "2022-04-27T00:00:00Z", + v.ToTime(arrow.Second).Format(time.RFC3339Nano)) + }) + + t.Run("Milli", func(t *testing.T) { + v, ok := ToTimestamp(true, arrow.Millisecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(1), v) + + v, ok = ToTimestamp(false, arrow.Millisecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp(0., arrow.Millisecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp(0, arrow.Millisecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp("0", arrow.Millisecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + assert.Equal(t, "1970-01-01T00:00:00Z", + v.ToTime(arrow.Millisecond).Format(time.RFC3339Nano)) + + formattedTimeMilli := "2022-04-27T00:00:00.123Z" + ti, err := time.Parse(time.RFC3339, formattedTimeMilli) + require.NoError(t, err) + + v, ok = ToTimestamp(ti.UnixMilli(), arrow.Millisecond) + require.True(t, ok) + assert.Equal(t, "2022-04-27T00:00:00.123Z", + v.ToTime(arrow.Millisecond).Format(time.RFC3339Nano)) + + v, ok = ToTimestamp(formattedTimeMilli, arrow.Millisecond) + require.True(t, ok) + assert.Equal(t, "2022-04-27T00:00:00.123Z", + v.ToTime(arrow.Millisecond).Format(time.RFC3339Nano)) + }) + + t.Run("Micro", func(t *testing.T) { + v, ok := ToTimestamp(true, arrow.Microsecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(1), v) + + v, ok = ToTimestamp(false, arrow.Microsecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp(0., arrow.Microsecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp(0, arrow.Microsecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp("0", arrow.Microsecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + assert.Equal(t, "1970-01-01T00:00:00Z", + v.ToTime(arrow.Microsecond).Format(time.RFC3339Nano)) + + formattedTimeMicro := "2022-04-27T00:00:00.123456Z" + ti, err := time.Parse(time.RFC3339, formattedTimeMicro) + require.NoError(t, err) + + v, ok = ToTimestamp(ti.UnixMicro(), arrow.Microsecond) + require.True(t, ok) + assert.Equal(t, "2022-04-27T00:00:00.123456Z", + v.ToTime(arrow.Microsecond).Format(time.RFC3339Nano)) + + v, ok = ToTimestamp(formattedTimeMicro, arrow.Microsecond) + require.True(t, ok) + assert.Equal(t, "2022-04-27T00:00:00.123456Z", + v.ToTime(arrow.Microsecond).Format(time.RFC3339Nano)) + }) + + t.Run("Nano", func(t *testing.T) { + v, ok := ToTimestamp(true, arrow.Nanosecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(1), v) + + v, ok = ToTimestamp(false, arrow.Nanosecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp(0., arrow.Nanosecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp(0, arrow.Nanosecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + + v, ok = ToTimestamp("0", arrow.Nanosecond) + require.True(t, ok) + assert.Equal(t, arrow.Timestamp(0), v) + assert.Equal(t, "1970-01-01T00:00:00Z", + v.ToTime(arrow.Nanosecond).Format(time.RFC3339Nano)) + + formattedTimeNano := "2022-04-27T00:00:00.123456789Z" + ti, err := time.Parse(time.RFC3339, formattedTimeNano) + require.NoError(t, err) + + v, ok = ToTimestamp(ti.UnixNano(), arrow.Nanosecond) + require.True(t, ok) + assert.Equal(t, "2022-04-27T00:00:00.123456789Z", + v.ToTime(arrow.Nanosecond).Format(time.RFC3339Nano)) + + v, ok = ToTimestamp(formattedTimeNano, arrow.Nanosecond) + require.True(t, ok) + assert.Equal(t, "2022-04-27T00:00:00.123456789Z", + v.ToTime(arrow.Nanosecond).Format(time.RFC3339Nano)) + }) +} diff --git a/bowfill.go b/bowfill.go index c6d4236..9f19128 100644 --- a/bowfill.go +++ b/bowfill.go @@ -5,6 +5,7 @@ import ( "math" "sync" + "github.com/apache/arrow/go/v8/arrow" "github.com/apache/arrow/go/v8/arrow/array" ) @@ -27,6 +28,7 @@ func (b *bow) FillLinear(refColIndex, toFillColIndex int) (Bow, error) { switch b.ColumnType(refColIndex) { case Int64: case Float64: + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: default: return nil, fmt.Errorf("refColIndex '%d' is of type '%s'", refColIndex, b.ColumnType(refColIndex)) @@ -44,6 +46,7 @@ func (b *bow) FillLinear(refColIndex, toFillColIndex int) (Bow, error) { switch b.ColumnType(toFillColIndex) { case Int64: case Float64: + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: default: return nil, fmt.Errorf( "toFillColIndex '%d' is of unsupported type '%s'", @@ -81,6 +84,8 @@ func (b *bow) FillLinear(refColIndex, toFillColIndex int) (Bow, error) { buf.SetOrDropStrict(rowIndex, int64(prevToFill)) case Float64: buf.SetOrDropStrict(rowIndex, prevToFill) + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + buf.SetOrDropStrict(rowIndex, arrow.Timestamp(prevToFill)) } } @@ -93,6 +98,8 @@ func (b *bow) FillLinear(refColIndex, toFillColIndex int) (Bow, error) { buf.SetOrDropStrict(rowIndex, int64(math.Round(tmp))) case Float64: buf.SetOrDropStrict(rowIndex, tmp) + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + buf.SetOrDropStrict(rowIndex, arrow.Timestamp(math.Round(tmp))) } } @@ -116,6 +123,7 @@ func (b *bow) FillMean(colIndices ...int) (Bow, error) { switch b.ColumnType(colIndex) { case Int64: case Float64: + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: default: return nil, fmt.Errorf( "column '%s' is of unsupported type '%s'", @@ -149,6 +157,8 @@ func (b *bow) FillMean(colIndices ...int) (Bow, error) { buf.SetOrDropStrict(rowIndex, int64(math.Round((prevVal+nextVal)/2))) case Float64: buf.SetOrDropStrict(rowIndex, (prevVal+nextVal)/2) + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + buf.SetOrDropStrict(rowIndex, arrow.Timestamp(math.Round((prevVal+nextVal)/2))) } } } @@ -239,6 +249,17 @@ func fill(method string, b *bow, colIndices ...int) (Bow, error) { buf.SetOrDropStrict(rowIndex, arr.Value(fillRowIndex)) } } + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + arr := array.NewTimestampData(data) + for rowIndex := 0; rowIndex < b.NumRows(); rowIndex++ { + if buf.IsValid(rowIndex) { + continue + } + fillRowIndex := getFillRowIndex(b, method, colIndex, rowIndex) + if fillRowIndex > -1 { + buf.SetOrDropStrict(rowIndex, arr.Value(fillRowIndex)) + } + } default: filledSeries[colIndex] = b.NewSeriesFromCol(colIndex) } diff --git a/bowgetters.go b/bowgetters.go index d6bf9cf..70844aa 100644 --- a/bowgetters.go +++ b/bowgetters.go @@ -57,6 +57,8 @@ func (b *bow) GetValue(colIndex, rowIndex int) interface{} { return array.NewBooleanData(b.Column(colIndex).Data()).Value(rowIndex) case String: return array.NewStringData(b.Column(colIndex).Data()).Value(rowIndex) + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + return array.NewTimestampData(b.Column(colIndex).Data()).Value(rowIndex) default: panic(fmt.Errorf("unsupported type '%s'", b.ColumnType(colIndex))) } @@ -177,6 +179,9 @@ func (b *bow) GetInt64(colIndex, rowIndex int) (int64, bool) { return ToInt64(vd.Value(rowIndex)) } return 0., false + case arrow.TIMESTAMP: + vd := array.NewTimestampData(b.Column(colIndex).Data()) + return int64(vd.Value(rowIndex)), vd.IsValid(rowIndex) default: panic(fmt.Errorf("unsupported arrow.DataType '%s'", b.Schema().Field(colIndex).Type)) @@ -240,6 +245,9 @@ func (b *bow) GetFloat64(colIndex, rowIndex int) (float64, bool) { return ToFloat64(vd.Value(rowIndex)) } return 0., false + case arrow.TIMESTAMP: + vd := array.NewTimestampData(b.Column(colIndex).Data()) + return float64(vd.Value(rowIndex)), vd.IsValid(rowIndex) default: panic(fmt.Sprintf("unsupported arrow.DataType '%s'", b.Schema().Field(colIndex).Type)) diff --git a/bowgetters_test.go b/bowgetters_test.go index 5b5f2bf..0f3d85c 100644 --- a/bowgetters_test.go +++ b/bowgetters_test.go @@ -3,6 +3,7 @@ package bow import ( "testing" + "github.com/apache/arrow/go/v8/arrow" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -32,12 +33,13 @@ func TestBow_GetValue(t *testing.T) { } func TestBow_Distinct(t *testing.T) { - colNames := []string{"time", "value", "meta"} - colTypes := []Type{Int64, Float64, String} + colNames := []string{"time", "value", "meta", "timestamp"} + colTypes := []Type{Int64, Float64, String, TimestampMilli} colData := [][]interface{}{ {1, 1, 2, nil, 3}, {1.1, 1.1, 2.2, nil, 3.3}, {"", "test", "test", nil, "3.3"}, + {1, 1, 2, nil, 3}, } b, err := NewBowFromColBasedInterfaces(colNames, colTypes, colData) @@ -66,4 +68,12 @@ func TestBow_Distinct(t *testing.T) { ExpectEqual(t, expect, res) }) + + t.Run(TimestampMilli.String(), func(t *testing.T) { + res := b.Distinct(3) + expect, err := NewBow(NewSeries("timestamp", TimestampMilli, []arrow.Timestamp{1, 2, 3}, nil)) + require.NoError(t, err) + + ExpectEqual(t, expect, res) + }) } diff --git a/bowjoin.go b/bowjoin.go index 77dac71..5215b50 100644 --- a/bowjoin.go +++ b/bowjoin.go @@ -219,6 +219,13 @@ func innerFillLeftBowCols(newSeries *[]Series, left *bow, newNumRows int, buf.SetOrDropStrict(rowIndex, data.Value(commonRows.l[rowIndex])) } } + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + data := array.NewTimestampData(left.Column(colIndex).Data()) + for rowIndex := 0; rowIndex < newNumRows; rowIndex++ { + if data.IsValid(commonRows.l[rowIndex]) { + buf.SetOrDropStrict(rowIndex, data.Value(commonRows.l[rowIndex])) + } + } default: panic(fmt.Errorf("unsupported type '%s'", buf.DataType)) } @@ -267,6 +274,13 @@ func innerFillRightBowCols(newSeries *[]Series, left, right *bow, newNumRows, ne buf.SetOrDropStrict(rowIndex, data.Value(commonRows.r[rowIndex])) } } + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + data := array.NewTimestampData(right.Column(rightCol).Data()) + for rowIndex := 0; rowIndex < newNumRows; rowIndex++ { + if data.IsValid(commonRows.r[rowIndex]) { + buf.SetOrDropStrict(rowIndex, data.Value(commonRows.r[rowIndex])) + } + } default: panic(fmt.Errorf("unsupported type '%s'", buf.DataType)) } @@ -375,6 +389,28 @@ func outerFillLeftBowCols(newSeries *[]Series, left, right *bow, newNumRows, uni break } } + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + data := array.NewTimestampData(left.Column(colIndex).Data()) + for newRow := 0; left.NumRows() > 0 && newRow < newNumRows; newRow++ { + if data.IsValid(leftRow) { + buf.SetOrDropStrict(newRow, data.Value(leftRow)) + } + for commonRow < len(commonRows.l) && + leftRow == commonRows.l[commonRow] && + newRow < newNumRows { + if data.IsValid(leftRow) { + buf.SetOrDropStrict(newRow, data.Value(leftRow)) + } + if commonRow+1 < len(commonRows.l) && + commonRows.l[commonRow+1] == leftRow { + newRow++ + } + commonRow++ + } + if leftRow++; leftRow >= left.NumRows() { + break + } + } default: panic(fmt.Errorf("unsupported type '%s'", buf.DataType)) } @@ -548,6 +584,43 @@ func outerFillRightBowCols(newSeries *[]Series, left, right *bow, newNumCols, leftRow++ } + // Fill remaining rows from right bow + newRow := left.NumRows() + len(commonRows.r) - uniquesLeft + for rightRow := 0; rightRow < right.NumRows(); rightRow++ { + var isRowCommon bool + for i := 0; i < len(commonRows.r); i++ { + if rightRow == commonRows.r[i] { + isRowCommon = true + break + } + } + if !isRowCommon { + if data.IsValid(rightRow) { + buf.SetOrDropStrict(newRow, data.Value(rightRow)) + } + newRow++ + } + } + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + data := array.NewTimestampData(right.Column(rightCol).Data()) + + // Fill common rows from right bow + for newRow := 0; newRow < newNumRows; newRow++ { + for commonRow < len(commonRows.l) && + leftRow == commonRows.l[commonRow] && + newRow < newNumRows { + if data.IsValid(commonRows.r[commonRow]) { + buf.SetOrDropStrict(newRow, data.Value(commonRows.r[commonRow])) + } + if commonRow+1 < len(commonRows.l) && + commonRows.l[commonRow+1] == leftRow { + newRow++ + } + commonRow++ + } + leftRow++ + } + // Fill remaining rows from right bow newRow := left.NumRows() + len(commonRows.r) - uniquesLeft for rightRow := 0; rightRow < right.NumRows(); rightRow++ { @@ -568,6 +641,7 @@ func outerFillRightBowCols(newSeries *[]Series, left, right *bow, newNumCols, default: panic(fmt.Errorf("unsupported type '%s'", buf.DataType)) } + (*newSeries)[colIndex] = NewSeriesFromBuffer(right.ColumnName(rightCol), buf) rightCol++ } diff --git a/bowjoin_test.go b/bowjoin_test.go index 1c7938b..f121177 100644 --- a/bowjoin_test.go +++ b/bowjoin_test.go @@ -166,6 +166,39 @@ func TestBow_OuterJoin(t *testing.T) { assert.EqualValues(t, expected.String(), result.String()) }) + t.Run("timestamps", func(t *testing.T) { + b1, err := NewBowFromRowBasedInterfaces([]string{"milli", "micro1"}, + []Type{TimestampMilli, TimestampMicro}, [][]interface{}{ + {1000, 0}, + {1100, 1}, + {1200, 2}, + {1300, 3}, + }) + require.NoError(t, err) + + b2, err := NewBowFromRowBasedInterfaces([]string{"milli", "micro2"}, + []Type{TimestampMilli, TimestampMicro}, [][]interface{}{ + {1100, 0}, + {1200, 1}, + {1300, 2}, + {1400, 3}, + }) + require.NoError(t, err) + + expected, err := NewBowFromRowBasedInterfaces([]string{"milli", "micro1", "micro2"}, + []Type{TimestampMilli, TimestampMicro, TimestampMicro}, [][]interface{}{ + {1000, 0, nil}, + {1100, 1, 0}, + {1200, 2, 1}, + {1300, 3, 2}, + {1400, nil, 3}, + }) + require.NoError(t, err) + + result := b1.OuterJoin(b2) + assert.EqualValues(t, expected.String(), result.String()) + }) + t.Run("with one common column", func(t *testing.T) { b1, err := NewBowFromRowBasedInterfaces([]string{"a", "b", "c"}, []Type{Int64, Int64, Int64}, [][]interface{}{ diff --git a/bowparquet.go b/bowparquet.go index 266d8b3..ee4c519 100644 --- a/bowparquet.go +++ b/bowparquet.go @@ -1,152 +1,61 @@ package bow import ( - "encoding/json" - "errors" + "context" "fmt" + "os" "strings" - "time" - "github.com/xitongsys/parquet-go-source/local" - "github.com/xitongsys/parquet-go/layout" - "github.com/xitongsys/parquet-go/marshal" - "github.com/xitongsys/parquet-go/parquet" - "github.com/xitongsys/parquet-go/reader" - "github.com/xitongsys/parquet-go/schema" - "github.com/xitongsys/parquet-go/source" - "github.com/xitongsys/parquet-go/writer" + "github.com/apache/arrow/go/v8/arrow" + "github.com/apache/arrow/go/v8/arrow/array" + "github.com/apache/arrow/go/v8/arrow/memory" + "github.com/apache/arrow/go/v8/parquet" + "github.com/apache/arrow/go/v8/parquet/compress" + "github.com/apache/arrow/go/v8/parquet/file" + "github.com/apache/arrow/go/v8/parquet/pqarrow" ) -var mapParquetToBowTypes = map[parquet.Type]Type{ - parquet.Type_BOOLEAN: Boolean, - parquet.Type_INT64: Int64, - parquet.Type_DOUBLE: Float64, - parquet.Type_BYTE_ARRAY: String, -} - -var mapBowToParquetTypes = map[Type]parquet.Type{ - Boolean: parquet.Type_BOOLEAN, - Int64: parquet.Type_INT64, - Float64: parquet.Type_DOUBLE, - String: parquet.Type_BYTE_ARRAY, -} - -const keyParquetColTypesMeta = "col_types" - -type parquetColTypesMeta struct { - Name string `json:"name"` - LogicalType *parquet.LogicalType `json:"logical_type"` -} - -// NewBowFromParquet loads a parquet object from the file path, returning a new Bow. +// NewBowFromParquet loads a parquet object from the file path, returning a new Bow // Only value columns are used to create the new Bow. // Argument verbose is used to print information about the file loaded. -func NewBowFromParquet(path string, verbose bool) (Bow, error) { - fr, err := local.NewLocalFileReader(path) +func NewBowFromParquet(filename string, verbose bool) (Bow, error) { + rdr, err := file.OpenParquetFile(filename, false) if err != nil { - return nil, fmt.Errorf("local.NewLocalFileReader: %w", err) - } - - pr := new(reader.ParquetReader) - pr.NP = 4 - pr.PFile = fr - if err = pr.ReadFooter(); err != nil { - return nil, fmt.Errorf("reader.ParquetReader.ReadFooter: %w", err) - } - pr.ColumnBuffers = make(map[string]*reader.ColumnBufferType) - pr.SchemaHandler = schema.NewSchemaHandlerFromSchemaList(pr.Footer.GetSchema()) - - var originalColNames = make([]string, len(pr.Footer.GetSchema())) - for i, se := range pr.Footer.GetSchema() { - originalColNames[i] = se.Name - } - - var originalRowGroups = make([]*parquet.RowGroup, len(pr.Footer.RowGroups)) - for r, rg := range pr.Footer.RowGroups { - var originalCols = make([]*parquet.ColumnChunk, len(rg.Columns)) - for c, col := range rg.Columns { - var originalMetaData = parquet.ColumnMetaData{ - PathInSchema: col.MetaData.PathInSchema, - } - var originalCol = parquet.ColumnChunk{ - MetaData: &originalMetaData, - } - originalCols[c] = &originalCol - } - originalRowGroups[r] = &parquet.RowGroup{Columns: originalCols} - } - - pr.RenameSchema() - - var valueColIndex int64 - var series = make([]Series, pr.SchemaHandler.GetColumnNum()) - var parquetColTypesMetas []parquetColTypesMeta - for colIndex, col := range pr.Footer.GetSchema() { - if col.NumChildren != nil { - continue - } - - if col.ConvertedType != nil || col.LogicalType != nil { - parquetColTypesMetas = append(parquetColTypesMetas, parquetColTypesMeta{ - Name: originalColNames[colIndex], - LogicalType: col.LogicalType, - }) - } - - values, _, _, err := pr.ReadColumnByIndex(valueColIndex, pr.GetNumRows()) - if err != nil { - return nil, fmt.Errorf("reader.ParquetReader.ReadColumnByIndex: %w", err) - } - - bowType := mapParquetToBowTypes[col.GetType()] - buf := NewBuffer(len(values), bowType) - for i, v := range values { - buf.SetOrDrop(i, v) - } - series[valueColIndex] = NewSeriesFromBuffer(originalColNames[colIndex], buf) - - pr.Footer.Schema[colIndex].Name = originalColNames[colIndex] - valueColIndex++ + return nil, fmt.Errorf("file.OpenParquetFile: %w", err) } + defer rdr.Close() - for r, rg := range pr.Footer.RowGroups { - for c := range rg.Columns { - pr.Footer.RowGroups[r].Columns[c].MetaData.PathInSchema = originalRowGroups[r]. - Columns[c].MetaData.PathInSchema - } + mem := memory.NewCheckedAllocator(memory.DefaultAllocator) + arrowRdr, err := pqarrow.NewFileReader(rdr, pqarrow.ArrowReadProperties{}, mem) + if err != nil { + return nil, fmt.Errorf("pqarrow.NewFileReader: %w", err) } - var keys, values []string - for _, m := range pr.Footer.KeyValueMetadata { - if m.GetKey() != "ARROW:schema" && m.GetKey() != keyParquetColTypesMeta { - keys = append(keys, m.GetKey()) - values = append(values, m.GetValue()) - } + tbl, err := arrowRdr.ReadTable(context.Background()) + if err != nil { + return nil, fmt.Errorf("pqarrow.FileReader.ReadTable: %w", err) } + defer tbl.Release() - if len(parquetColTypesMetas) > 0 { - colTypesJSON, err := json.Marshal(parquetColTypesMetas) - if err != nil { - return nil, fmt.Errorf("json.Marshal: %w", err) + cols := make([]arrow.Array, tbl.NumCols()) + for i := 0; i < int(tbl.NumCols()); i++ { + if len(tbl.Column(i).Data().Chunks()) != 1 { + return nil, fmt.Errorf( + "column %d has %d chunks", i, len(tbl.Column(i).Data().Chunks())) } - keys = append(keys, keyParquetColTypesMeta) - values = append(values, string(colTypesJSON)) - } - - b, err := NewBowWithMetadata(NewMetadata(keys, values), series...) - if err != nil { - return nil, fmt.Errorf("NewBowWithMetadata: %w", err) + cols[i] = tbl.Column(i).Data().Chunk(0) } - footerIndented, err := json.MarshalIndent(pr.Footer, "", "\t") + rec := array.NewRecord(tbl.Schema(), cols, tbl.NumRows()) + b, err := NewBowFromRecord(rec) if err != nil { - return nil, fmt.Errorf("json.MarshalIndent: %w", err) + return nil, fmt.Errorf("NewBowFromRecord: %w", err) } if verbose { fmt.Printf( - "bow.NewBowFromParquet: %s successfully read: %d rows\n%+v\n%+v\n", - path, b.NumRows(), b.Schema().String(), string(footerIndented)) + "bow.NewBowFromParquet: %s successfully read: %d rows\n%+v\n", + filename, b.NumRows(), b.Schema()) } return b, nil @@ -154,197 +63,37 @@ func NewBowFromParquet(path string, verbose bool) (Bow, error) { // WriteParquet writes a Bow to the binary parquet format. // Argument verbose is used to print information about the written file. -func (b *bow) WriteParquet(path string, verbose bool) error { +func (b *bow) WriteParquet(filename string, verbose bool) error { if b.NumCols() == 0 { return fmt.Errorf("bow has 0 columns") } - if !strings.HasSuffix(path, ".parquet") { - path += ".parquet" + if !strings.HasSuffix(filename, ".parquet") { + filename += ".parquet" } - var parquetColTypesMetas []parquetColTypesMeta - keyIndex := b.Metadata().FindKey(keyParquetColTypesMeta) - if keyIndex != -1 { - var err error - parquetColTypesMetas, err = readColTypesMeta(b, b.Metadata().Values()[keyIndex]) - if err != nil { - return fmt.Errorf("readColTypesMeta: %w", err) - } - } - - sElem := parquet.NewSchemaElement() - requiredRepType := parquet.FieldRepetitionType_REQUIRED - sElem.RepetitionType = &requiredRepType - sElem.Name = "Schema" - numChildren := int32(b.NumCols()) - sElem.NumChildren = &numChildren - - var sElems []*parquet.SchemaElement - sElems = append(sElems, sElem) - lTypes := []*parquet.LogicalType{nil} - for i, f := range b.Schema().Fields() { - parquetType := mapBowToParquetTypes[b.ColumnType(i)] - sElem = parquet.NewSchemaElement() - sElem.Type = &parquetType - optionalRepType := parquet.FieldRepetitionType_OPTIONAL - sElem.RepetitionType = &optionalRepType - sElem.Name = f.Name - for j, t := range parquetColTypesMetas { - if t.Name == f.Name { - sElem.LogicalType = parquetColTypesMetas[j].LogicalType - } - } - sElems = append(sElems, sElem) - lTypes = append(lTypes, sElem.LogicalType) - } - - parquetFile, err := local.NewLocalFileWriter(path) + f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.ModePerm) if err != nil { - return fmt.Errorf("local.NewLocalFileWriter: %w", err) + return err } - defer parquetFile.Close() - - parquetWriter, err := newJSONWriter(sElems, parquetFile, 4) + allocator := memory.NewCheckedAllocator(memory.DefaultAllocator) + wr, err := pqarrow.NewFileWriter(b.Schema(), f, + parquet.NewWriterProperties(parquet.WithCompression(compress.Codecs.Snappy)), + pqarrow.NewArrowWriterProperties(pqarrow.WithAllocator(allocator))) if err != nil { - return fmt.Errorf("newJSONWriter: %w", err) - } - - for k, key := range b.Metadata().Keys() { - if key != "ARROW:schema" { - parquetWriter.Footer.KeyValueMetadata = append(parquetWriter.Footer.KeyValueMetadata, - &parquet.KeyValue{ - Key: key, - Value: &b.Metadata().Values()[k], - }) - } - } - - for i, lt := range lTypes { - parquetWriter.SchemaHandler.SchemaElements[i].LogicalType = lt + return err } - for row := range b.GetRowsChan() { - rowJSON, err := json.Marshal(row) - if err != nil { - return fmt.Errorf("json.Marshal: %w", err) - } - if err = parquetWriter.Write(string(rowJSON)); err != nil { - return fmt.Errorf("JSONWriter.Write: %w", err) - } - } - - if err = parquetWriter.WriteStop(); err != nil { - return fmt.Errorf("JSONWriter.WriteStop: %w", err) - } - - footerBytes, err := json.MarshalIndent(parquetWriter.Footer, "", "\t") - if err != nil { - return fmt.Errorf("json.MarshalIndent: %w", err) + if err = wr.Write(b.Record); err != nil { + return err } + wr.Close() if verbose { fmt.Printf( - "bow.WriteParquet: %s successfully written: %d rows\n%s\n", - path, parquetWriter.Footer.NumRows, string(footerBytes)) + "bow.WriteParquet: %s successfully written: %d rows\n", + filename, b.NumRows()) } return nil } - -var ErrColTimeUnitNotFound = errors.New("column time unit not found in parquet metadata") - -// GetParquetMetaColTimeUnit attempts to get the time unit of the column as a time.Duration -// from the bow metadata read from a parquet file. -// If no time unit metadata is found, time.Duration(0) is returned along with ErrColTimeUnitNotFound. -func (b *bow) GetParquetMetaColTimeUnit(colIndex int) (time.Duration, error) { - colName := b.ColumnName(colIndex) - - keyIndex := b.Metadata().FindKey(keyParquetColTypesMeta) - if keyIndex == -1 { - return time.Duration(0), ErrColTimeUnitNotFound - } - - colTypesMeta, err := readColTypesMeta(b, b.Metadata().Values()[keyIndex]) - if err != nil { - return time.Duration(0), fmt.Errorf("readColTypesMeta: %w", err) - } - - for _, m := range colTypesMeta { - if m.Name == colName { - if m.LogicalType != nil && - m.LogicalType.IsSetTIMESTAMP() { - unit := m.LogicalType.TIMESTAMP.GetUnit() - switch { - case unit.IsSetMILLIS(): - return time.Millisecond, nil - case unit.IsSetMICROS(): - return time.Microsecond, nil - case unit.IsSetNANOS(): - return time.Nanosecond, nil - } - } - } - } - - return time.Duration(0), ErrColTimeUnitNotFound -} - -func readColTypesMeta(b Bow, jsonEncodedData string) ([]parquetColTypesMeta, error) { - var colTypesMeta []parquetColTypesMeta - if err := json.Unmarshal([]byte(jsonEncodedData), &colTypesMeta); err != nil { - return nil, fmt.Errorf("invalid column types metadata: %+v", jsonEncodedData) - } - - if len(colTypesMeta) > b.NumCols() { - return nil, fmt.Errorf("invalid column types metadata: %+v", colTypesMeta) - } - - var countByCols = make([]int, b.NumCols()) - for _, t := range colTypesMeta { - colFound := false - for i, f := range b.Schema().Fields() { - if t.Name == f.Name { - countByCols[i]++ - colFound = true - } - } - if !colFound { - return nil, fmt.Errorf("invalid column types metadata: %+v", colTypesMeta) - } - } - - for _, count := range countByCols { - if count > 1 { - return nil, fmt.Errorf("invalid column types metadata: %+v", colTypesMeta) - } - } - - return colTypesMeta, nil -} - -func newJSONWriter(se []*parquet.SchemaElement, pfile source.ParquetFile, np int64) (*writer.JSONWriter, error) { - res := new(writer.JSONWriter) - res.SchemaHandler = schema.NewSchemaHandlerFromSchemaList(se) - res.SchemaHandler.CreateInExMap() - - res.PFile = pfile - res.PageSize = 8 * 1024 //8K - res.RowGroupSize = 128 * 1024 * 1024 //128M - res.CompressionType = parquet.CompressionCodec_SNAPPY - res.PagesMapBuf = make(map[string][]*layout.Page) - res.DictRecs = make(map[string]*layout.DictRecType) - res.NP = np - res.Footer = parquet.NewFileMetaData() - res.Footer.Version = 1 - res.Footer.Schema = append(res.Footer.Schema, res.SchemaHandler.SchemaElements...) - res.Offset = 4 - res.MarshalFunc = marshal.MarshalJSON - - _, err := res.PFile.Write([]byte("PAR1")) - if err != nil { - return nil, err - } - - return res, nil -} diff --git a/bowparquet_test.go b/bowparquet_test.go index 211f08e..6f4a345 100644 --- a/bowparquet_test.go +++ b/bowparquet_test.go @@ -1,16 +1,11 @@ package bow import ( - "encoding/json" - "fmt" "os" "testing" - "time" - "github.com/apache/arrow/go/v8/arrow" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/xitongsys/parquet-go/parquet" ) const ( @@ -35,13 +30,28 @@ func TestParquet(t *testing.T) { t.Run("all supported types with rows and nil values", func(t *testing.T) { bBefore, err := NewBowFromRowBasedInterfaces( - []string{"int", "float", "bool", "string"}, - []Type{Int64, Float64, Boolean, String}, + []string{"int", "float", "bool", "string", + "timestamp_ms_int", "timestamp_ms_str", + "timestamp_us_int", "timestamp_us_str", + "timestamp_ns_int", "timestamp_ns_str"}, + []Type{Int64, Float64, Boolean, String, + TimestampMilli, TimestampMilli, + TimestampMicro, TimestampMicro, + TimestampNano, TimestampNano}, [][]interface{}{ - {1, 1., true, "hi"}, - {2, 2., false, "ho"}, - {nil, nil, nil, nil}, - {3, 3., true, "hu"}, + {1, 1., true, "hi", + 1651017600000, "2022-04-27T00:00:00.123Z", + 1651017600000000, "2022-04-27T00:00:00.123456Z", + 1651017600000000000, "2022-04-27T00:00:00.123456789Z"}, + {2, 2., false, "ho", + 1651021200000, "2022-04-27T01:00:00.123Z", + 1651021200000000, "2022-04-27T01:00:00.123456Z", + 1651021200000000000, "2022-04-27T01:00:00.123456789Z"}, + {nil, nil, nil, nil, nil, nil, nil, nil, nil, nil}, + {3, 3., true, "hu", + 1651028400000, "2022-04-27T03:00:00.123Z", + 1651028400000000, "2022-04-27T03:00:00.123Z456", + 1651028400000000000, "2022-04-27T03:00:00.123456789Z"}, }) require.NoError(t, err) @@ -80,159 +90,4 @@ func TestParquet(t *testing.T) { "bow.WriteParquet: no columns", ) }) - - t.Run("bow with context and col_types metadata", func(t *testing.T) { - var series = make([]Series, 2) - series[0] = NewSeries("time", Int64, []int64{0}, []bool{true}) - series[1] = NewSeries(" va\"lue ", Float64, []float64{0.}, []bool{true}) - - var keys, values []string - type Unit struct { - Symbol string `json:"symbol"` - } - type Meta struct { - Unit Unit `json:"unit"` - } - type Context map[string]Meta - - var ctx = Context{ - "time": Meta{Unit{Symbol: "microseconds"}}, - " va\"lue ": Meta{Unit{Symbol: "kWh"}}, - } - - contextJSON, err := json.Marshal(ctx) - require.NoError(t, err) - - keys = append(keys, "context") - values = append(values, string(contextJSON)) - - bBefore, err := NewBowWithMetadata( - newMetaWithParquetTimestampCol(keys, values, "time", time.Microsecond), - series...) - require.NoError(t, err) - - err = bBefore.WriteParquet(testOutputFileName+"_meta", false) - assert.NoError(t, err) - - bAfter, err := NewBowFromParquet(testOutputFileName+"_meta.parquet", false) - assert.NoError(t, err) - - assert.Equal(t, bBefore.String(), bAfter.String()) - - require.NoError(t, os.Remove(testOutputFileName+"_meta.parquet")) - }) - - t.Run("bow with wrong col_types metadata", func(t *testing.T) { - var series = make([]Series, 2) - - series[0] = NewSeries("time", Int64, []int64{0}, []bool{true}) - series[1] = NewSeries("value", Float64, []float64{0.}, []bool{true}) - - var keys, values []string - - bBefore, err := NewBowWithMetadata( - newMetaWithParquetTimestampCol(keys, values, "unknown", time.Microsecond), - series...) - assert.NoError(t, err) - - assert.Error(t, bBefore.WriteParquet(testOutputFileName+"_wrong", false)) - }) -} - -func TestBowGetParquetMetaColTimeUnit(t *testing.T) { - timeCol := "time" - var series = make([]Series, 2) - series[0] = NewSeries(timeCol, Int64, []int64{0}, nil) - series[1] = NewSeries("value", Float64, []float64{0.}, nil) - - t.Run("time.Millisecond", func(t *testing.T) { - b, err := NewBowWithMetadata( - newMetaWithParquetTimestampCol([]string{}, []string{}, timeCol, time.Millisecond), - series...) - require.NoError(t, err) - - got, err := b.GetParquetMetaColTimeUnit(0) - require.NoError(t, err) - assert.Equal(t, time.Millisecond, got) - }) - - t.Run("time.Microsecond", func(t *testing.T) { - b, err := NewBowWithMetadata( - newMetaWithParquetTimestampCol([]string{}, []string{}, timeCol, time.Microsecond), - series...) - require.NoError(t, err) - - got, err := b.GetParquetMetaColTimeUnit(0) - require.NoError(t, err) - assert.Equal(t, time.Microsecond, got) - }) - - t.Run("time.Nanosecond", func(t *testing.T) { - b, err := NewBowWithMetadata( - newMetaWithParquetTimestampCol([]string{}, []string{}, timeCol, time.Nanosecond), - series...) - require.NoError(t, err) - - got, err := b.GetParquetMetaColTimeUnit(0) - require.NoError(t, err) - assert.Equal(t, time.Nanosecond, got) - }) - - t.Run("column without timestamp metadata", func(t *testing.T) { - b, err := NewBowWithMetadata( - newMetaWithParquetTimestampCol([]string{}, []string{}, timeCol, time.Nanosecond), - series...) - require.NoError(t, err) - - got, err := b.GetParquetMetaColTimeUnit(1) - require.ErrorIs(t, err, ErrColTimeUnitNotFound) - require.Equal(t, time.Duration(0), got) - }) - - t.Run("column out of range", func(t *testing.T) { - b, err := NewBowWithMetadata( - newMetaWithParquetTimestampCol([]string{}, []string{}, timeCol, time.Nanosecond), - series...) - require.NoError(t, err) - - assert.Panics(t, func() { - _, _ = b.GetParquetMetaColTimeUnit(42) - }) - }) -} - -func newMetaWithParquetTimestampCol(keys, values []string, colName string, timeUnit time.Duration) Metadata { - var colTypes = make([]parquetColTypesMeta, 1) - - unit := parquet.TimeUnit{} - switch timeUnit { - case time.Millisecond: - unit.MILLIS = &parquet.MilliSeconds{} - case time.Microsecond: - unit.MICROS = &parquet.MicroSeconds{} - case time.Nanosecond: - unit.NANOS = &parquet.NanoSeconds{} - default: - panic(fmt.Errorf("unsupported time unit '%s'", timeUnit)) - } - - logicalType := parquet.LogicalType{ - TIMESTAMP: &parquet.TimestampType{ - IsAdjustedToUTC: true, - Unit: &unit, - }} - colTypes[0] = parquetColTypesMeta{ - Name: colName, - LogicalType: &logicalType, - } - - colTypesJSON, err := json.Marshal(colTypes) - if err != nil { - panic(err) - } - - keys = append(keys, keyParquetColTypesMeta) - values = append(values, string(colTypesJSON)) - - return Metadata{arrow.NewMetadata(keys, values)} } diff --git a/bowrecord.go b/bowrecord.go index eec6b67..510721c 100644 --- a/bowrecord.go +++ b/bowrecord.go @@ -8,6 +8,16 @@ import ( "github.com/apache/arrow/go/v8/arrow/array" ) +func NewBowFromRecord(record arrow.Record) (Bow, error) { + for _, f := range record.Schema().Fields() { + if getBowTypeFromArrowFingerprint(f.Type.Fingerprint()) == Unknown { + return nil, fmt.Errorf("unsupported type '%s'", f.Type) + } + } + + return &bow{Record: record}, nil +} + func newRecord(metadata Metadata, series ...Series) (arrow.Record, error) { var fields []arrow.Field var arrays []arrow.Array diff --git a/bowseries.go b/bowseries.go index 130a848..86e0d35 100644 --- a/bowseries.go +++ b/bowseries.go @@ -20,7 +20,7 @@ type Series struct { // NewSeries returns a new Series from: // - name: string // - typ: Bow data Type -// - dataArray: slice of the data +// - dataArray: slice of the data (for Timestamp types, data can be of type []int64 or []arrow.Timestamp) // - validityArray: // - if nil, the data will be non-nil // - can be of type []bool or []byte to represent nil values @@ -51,6 +51,8 @@ func newSeries(name string, typ Type, dataArray, validityArray interface{}) Seri length := len(dataArray.([]string)) nullBitmapBool := buildNullBitmapBool(length, validityArray) return newStringSeries(name, dataArray.([]string), nullBitmapBool) + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + return newTimestampSeries(name, typ, dataArray, validityArray) default: panic(fmt.Errorf("unsupported type '%s'", typ)) } @@ -98,6 +100,29 @@ func newStringSeries(name string, data []string, valid []bool) Series { return Series{Name: name, Array: builder.NewArray()} } +func newTimestampSeries(name string, typ Type, data, valid interface{}) Series { + mem := memory.NewCheckedAllocator(memory.NewGoAllocator()) + builder := array.NewTimestampBuilder(mem, mapBowToArrowTypes[typ].(*arrow.TimestampType)) + defer builder.Release() + switch data := data.(type) { + case []arrow.Timestamp: + length := len(data) + nullBitmapBool := buildNullBitmapBool(length, valid) + builder.AppendValues(data, nullBitmapBool) + case []int64: + length := len(data) + nullBitmapBool := buildNullBitmapBool(length, valid) + tsData := make([]arrow.Timestamp, length) + for i, intVal := range data { + tsData[i] = arrow.Timestamp(intVal) + } + builder.AppendValues(tsData, nullBitmapBool) + default: + panic(fmt.Errorf("unsupported type '%T' for Timestamp dataArray", data)) + } + return Series{Name: name, Array: builder.NewArray()} +} + // NewSeriesFromInterfaces returns a new Series from: // - name: string // - typ: Bow Type @@ -164,6 +189,19 @@ func NewSeriesFromInterfaces(name string, typ Type, data []interface{}) Series { builder.Append(v) } return Series{Name: name, Array: builder.NewArray()} + case TimestampSec, TimestampMilli, TimestampMicro, TimestampNano: + builder := array.NewTimestampBuilder(mem, mapBowToArrowTypes[typ].(*arrow.TimestampType)) + defer builder.Release() + builder.Resize(len(data)) + for i := 0; i < len(data); i++ { + v, ok := ToTimestamp(data[i], mapBowTypeToTimeUnit[typ]) + if !ok { + builder.AppendNull() + continue + } + builder.Append(v) + } + return Series{Name: name, Array: builder.NewArray()} default: panic(fmt.Errorf("unsupported type '%s'", typ)) } diff --git a/bowsort_test.go b/bowsort_test.go index 2294499..94aeea6 100644 --- a/bowsort_test.go +++ b/bowsort_test.go @@ -52,6 +52,30 @@ func TestBow_SortByCol(t *testing.T) { assert.EqualValues(t, expected.String(), sorted.String()) }) + t.Run("unsorted with timestamps", func(t *testing.T) { + b, err := NewBowFromRowBasedInterfaces( + []string{"timestamp_ms", "a"}, + []Type{TimestampMilli, Int64}, + [][]interface{}{ + {"2022-01-01T00:00:00Z", 1}, + {"2022-01-03T00:00:00Z", 3}, + {"2022-01-02T00:00:00Z", 2}, + }) + require.NoError(t, err) + expected, err := NewBowFromRowBasedInterfaces( + []string{"timestamp_ms", "a"}, + []Type{TimestampMilli, Int64}, + [][]interface{}{ + {"2022-01-01T00:00:00Z", 1}, + {"2022-01-02T00:00:00Z", 2}, + {"2022-01-03T00:00:00Z", 3}, + }) + require.NoError(t, err) + sorted, err := b.SortByCol(0) + assert.NoError(t, err) + assert.EqualValues(t, expected.String(), sorted.String()) + }) + t.Run("unsorted with different cols", func(t *testing.T) { b, err := NewBowFromRowBasedInterfaces( []string{"a", "b", "time"}, diff --git a/bowstring.go b/bowstring.go index ccafb3c..8b4d12c 100644 --- a/bowstring.go +++ b/bowstring.go @@ -4,6 +4,9 @@ import ( "fmt" "strings" "text/tabwriter" + "time" + + "github.com/apache/arrow/go/v8/arrow" ) // String returns a formatted representation of the Bow. @@ -31,7 +34,23 @@ func (b *bow) String() string { for row := range b.GetRowsChan() { cells = []string{} for colIndex := 0; colIndex < b.NumCols(); colIndex++ { - cells = append(cells, fmt.Sprintf("%v", row[b.Schema().Field(colIndex).Name])) + ti, ok := row[b.Schema().Field(colIndex).Name].(arrow.Timestamp) + if ok { + switch b.ColumnType(colIndex) { + case TimestampSec: + cells = append(cells, ti.ToTime(arrow.Second).Format(time.RFC3339Nano)) + case TimestampMilli: + cells = append(cells, ti.ToTime(arrow.Millisecond).Format(time.RFC3339Nano)) + case TimestampMicro: + cells = append(cells, ti.ToTime(arrow.Microsecond).Format(time.RFC3339Nano)) + case TimestampNano: + cells = append(cells, ti.ToTime(arrow.Nanosecond).Format(time.RFC3339Nano)) + default: + panic(fmt.Sprintf("unsupported type '%s'", b.ColumnType(colIndex))) + } + } else { + cells = append(cells, fmt.Sprintf("%v", row[b.Schema().Field(colIndex).Name])) + } } if _, err = fmt.Fprintln(w, strings.Join(cells, "\t")); err != nil { panic(err) diff --git a/bowtypes.go b/bowtypes.go index 51ff85b..c327e44 100644 --- a/bowtypes.go +++ b/bowtypes.go @@ -6,6 +6,7 @@ import ( "github.com/apache/arrow/go/v8/arrow" ) +// Type is a Bow logical type. type Type int // How to add a Type: @@ -23,6 +24,10 @@ const ( Int64 Boolean String + TimestampSec + TimestampMilli + TimestampMicro + TimestampNano // InputDependent is used in aggregations when the output type is dependent on the input type. InputDependent @@ -33,10 +38,20 @@ const ( var ( mapBowToArrowTypes = map[Type]arrow.DataType{ - Float64: arrow.PrimitiveTypes.Float64, - Int64: arrow.PrimitiveTypes.Int64, - Boolean: arrow.FixedWidthTypes.Boolean, - String: arrow.BinaryTypes.String, + Float64: arrow.PrimitiveTypes.Float64, + Int64: arrow.PrimitiveTypes.Int64, + Boolean: arrow.FixedWidthTypes.Boolean, + String: arrow.BinaryTypes.String, + TimestampSec: arrow.FixedWidthTypes.Timestamp_s, + TimestampMilli: arrow.FixedWidthTypes.Timestamp_ms, + TimestampMicro: arrow.FixedWidthTypes.Timestamp_us, + TimestampNano: arrow.FixedWidthTypes.Timestamp_ns, + } + mapBowTypeToTimeUnit = map[Type]arrow.TimeUnit{ + TimestampSec: arrow.Second, + TimestampMilli: arrow.Millisecond, + TimestampMicro: arrow.Microsecond, + TimestampNano: arrow.Nanosecond, } mapArrowNameToBowTypes = func() map[string]Type { res := make(map[string]Type) @@ -73,6 +88,14 @@ func (t Type) Convert(input interface{}) interface{} { output, ok = ToBoolean(input) case String: output, ok = ToString(input) + case TimestampSec: + output, ok = ToTimestamp(input, arrow.Second) + case TimestampMilli: + output, ok = ToTimestamp(input, arrow.Millisecond) + case TimestampMicro: + output, ok = ToTimestamp(input, arrow.Microsecond) + case TimestampNano: + output, ok = ToTimestamp(input, arrow.Nanosecond) } if ok { return output diff --git a/bowvalues.go b/bowvalues.go index e315180..be2986c 100644 --- a/bowvalues.go +++ b/bowvalues.go @@ -1,6 +1,9 @@ package bow -import "github.com/apache/arrow/go/v8/arrow/array" +import ( + "github.com/apache/arrow/go/v8/arrow" + "github.com/apache/arrow/go/v8/arrow/array" +) func int64Values(arr *array.Int64) []int64 { return arr.Int64Values() @@ -25,3 +28,11 @@ func stringValues(arr *array.String) []string { } return res } + +func timestampValues(arr *array.Timestamp) []arrow.Timestamp { + var res = make([]arrow.Timestamp, arr.Len()) + for i := range res { + res[i] = arr.Value(i) + } + return res +} diff --git a/go.mod b/go.mod index d113fcf..b4a324b 100644 --- a/go.mod +++ b/go.mod @@ -3,31 +3,37 @@ module github.com/metronlab/bow go 1.18 require ( - github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect - github.com/apache/arrow/go/v8 v8.0.0-20220425143814-555b4d27192e - github.com/apache/thrift v0.16.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/apache/arrow/go/v8 v8.0.0-20220407025312-96de9d584208 github.com/google/uuid v1.3.0 - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/testify v1.7.0 - github.com/xitongsys/parquet-go v1.6.2 - github.com/xitongsys/parquet-go-source v0.0.0-20220315005136-aec0fe3e777c - golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) require ( + github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/andybalholm/brotli v1.0.4 // indirect - github.com/goccy/go-json v0.9.7 // indirect + github.com/apache/thrift v0.16.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/goccy/go-json v0.7.10 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/flatbuffers v2.0.5+incompatible // indirect github.com/klauspost/asmfmt v1.3.1 // indirect - github.com/klauspost/compress v1.15.1 // indirect + github.com/klauspost/compress v1.14.2 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect - github.com/pierrec/lz4/v4 v4.1.14 // indirect + github.com/pierrec/lz4/v4 v4.1.12 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/zeebo/xxh3 v1.0.1 // indirect - golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect - golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect - golang.org/x/tools v0.1.10 // indirect + golang.org/x/exp v0.0.0-20211216164055-b2b84827b756 // indirect + golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 // indirect + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/tools v0.1.9 // indirect + golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect + google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 // indirect + google.golang.org/grpc v1.44.0 // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) diff --git a/go.sum b/go.sum index edaf32f..535f99b 100644 --- a/go.sum +++ b/go.sum @@ -1,35 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= -github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= -github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= @@ -48,15 +21,10 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/arrow/go/arrow v0.0.0-20200730104253-651201b0f516/go.mod h1:QNYViu/X0HXDHw7m3KXzWSVXIbfUvJqBFe6Gj8/pYA0= -github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 h1:q4dksr6ICHXqG5hm0ZW5IHyeEJXoIJSOZeBLmWPNeIQ= -github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs= -github.com/apache/arrow/go/v8 v8.0.0-20220425143814-555b4d27192e h1:8tzo8QHYmveHydZDhaWswUUbgELAfZoKEv9c3+iFZls= -github.com/apache/arrow/go/v8 v8.0.0-20220425143814-555b4d27192e/go.mod h1:63co72EKYQT9WKr8Y1Yconk4dysC0t79wNDauYO1ZGg= -github.com/apache/thrift v0.0.0-20181112125854-24918abba929/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/arrow/go/v8 v8.0.0-20220407025312-96de9d584208 h1:dkJXBzsG4aIhQLl6FEIVfniTm4qrIvkJTmyFA+UIobI= +github.com/apache/arrow/go/v8 v8.0.0-20220407025312-96de9d584208/go.mod h1:UUe+gJaMnuFD6icfGSJxUjG/tX/POUbPS/wE+EFyncM= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.14.2/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.15.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= @@ -66,21 +34,7 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.30.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/aws/aws-sdk-go-v2 v1.7.1/go.mod h1:L5LuPC1ZgDr2xQS7AmIec/Jlc7O/Y1u2KxJyNVab250= -github.com/aws/aws-sdk-go-v2/config v1.5.0/go.mod h1:RWlPOAW3E3tbtNAqTwvSW54Of/yP3oiZXMI0xfUdjyA= -github.com/aws/aws-sdk-go-v2/credentials v1.3.1/go.mod h1:r0n73xwsIVagq8RsxmZbGSRQFj9As3je72C2WzUIToc= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.3.0/go.mod h1:2LAuqPx1I6jNfaGDucWfA2zqQCYCOMCDHiCOciALyNw= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.3.2/go.mod h1:qaqQiHSrOUVOfKe6fhgQ6UzhxjwqVW8aHNegd6Ws4w4= -github.com/aws/aws-sdk-go-v2/internal/ini v1.1.1/go.mod h1:Zy8smImhTdOETZqfyn01iNOe0CNggVbPjCajyaz6Gvg= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.2.1/go.mod h1:v33JQ57i2nekYTA70Mb+O18KeH4KqhdqxTJZNK1zdRE= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.2.1/go.mod h1:zceowr5Z1Nh2WVP8bf/3ikB41IZW59E4yIYbg+pC6mw= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.5.1/go.mod h1:6EQZIwNNvHpq/2/QSJnp4+ECvqIy55w95Ofs0ze+nGQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.11.1/go.mod h1:XLAGFrEjbvMCLvAtWLLP32yTv8GpBquCApZEycDLunI= -github.com/aws/aws-sdk-go-v2/service/sso v1.3.1/go.mod h1:J3A3RGUvuCZjvSuZEcOpHDnzZP/sKbhDWV2T1EOzFIM= -github.com/aws/aws-sdk-go-v2/service/sts v1.6.0/go.mod h1:q7o0j7d7HrJk/vr9uUt3BVRASvcU7gYZB9PUgPiByXg= -github.com/aws/smithy-go v1.6.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -91,9 +45,6 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -105,7 +56,6 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/colinmarc/hdfs/v2 v2.1.1/go.mod h1:M3x+k8UKKmxtFu++uAZ0OtDU8jR3jnaZIAc6yK4Ue0c= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -127,14 +77,12 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -144,7 +92,6 @@ github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3 github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -155,11 +102,9 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/goccy/go-json v0.9.6/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM= -github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.7.10 h1:ulhbuNe1JqE68nMRXXTJRrUu0uhouf0VevLINxQq4Ec= +github.com/goccy/go-json v0.7.10/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -168,15 +113,8 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -190,15 +128,13 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= -github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/flatbuffers v2.0.5+incompatible h1:ANsW0idDAXIY+mNHzIHxWRfabV2x5LUEEIIWcwsYgB8= github.com/google/flatbuffers v2.0.5+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -206,24 +142,15 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= @@ -243,7 +170,6 @@ github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHh github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v0.0.0-20180228145832-27454136f036/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= @@ -256,20 +182,13 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jcmturner/gofork v0.0.0-20180107083740-2aebee971930/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= @@ -278,18 +197,14 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/asmfmt v1.3.1 h1:7xZi1N7s9gTLbqiM8KUv8TLyysavbTRGBT5/ly0bRtw= github.com/klauspost/asmfmt v1.3.1/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= -github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= +github.com/klauspost/compress v1.14.2 h1:S0OHlFk/Gbon/yauFJ4FfJJF5V0fc5HbBTJazi28pRw= github.com/klauspost/compress v1.14.2/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.1 h1:y9FcTHGyrebwfP0ZZqFiaxTaiDnUrGkJkI+f583BL1A= -github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -297,7 +212,6 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= @@ -326,7 +240,6 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/ncw/swift v1.0.52/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= @@ -344,17 +257,14 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/getopt v0.0.0-20180729010549-6fdd0a2c7117/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.12 h1:44l88ehTZAUGW4VlO1QC4zkilL99M6Y9MXNwEs0uzP8= github.com/pierrec/lz4/v4 v4.1.12/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE= -github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -398,15 +308,14 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -417,15 +326,7 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xitongsys/parquet-go v1.5.1/go.mod h1:xUxwM8ELydxh4edHGegYq1pA8NnMKDx0K/GyB0o2bww= -github.com/xitongsys/parquet-go v1.6.2 h1:MhCaXii4eqceKPu9BwrjLqyK10oX9WF+xGhwvwbw7xM= -github.com/xitongsys/parquet-go v1.6.2/go.mod h1:IulAQyalCm0rPiZVNnCgm/PCL64X2tdSVGMQ/UeKqWA= -github.com/xitongsys/parquet-go-source v0.0.0-20190524061010-2b72cbee77d5/go.mod h1:xxCx7Wpym/3QCo6JhujJX51dzSXrwmb0oH6FQb39SEA= -github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0/go.mod h1:HYhIKsdns7xz80OgkbgJYrtQY7FjHWHKH6cvN7+czGE= -github.com/xitongsys/parquet-go-source v0.0.0-20220315005136-aec0fe3e777c h1:UDtocVeACpnwauljUbeHD9UOjjcvF5kLUHruww7VT9A= -github.com/xitongsys/parquet-go-source v0.0.0-20220315005136-aec0fe3e777c/go.mod h1:qLb2Itmdcp7KPa5KZKvhE9U1q5bYSOmgeOckF/H2rQA= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zeebo/xxh3 v1.0.1 h1:FMSRIbkrLikb/0hZxmltpg84VkqDAT5M8ufXynuhXsI= github.com/zeebo/xxh3 v1.0.1/go.mod h1:8VHV24/3AZLn3b6Mlp/KuC33LWH687Wq6EnziEB+rsA= @@ -433,10 +334,7 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= @@ -455,33 +353,21 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= -golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20211216164055-b2b84827b756 h1:/5Bs7sWi0i3rOVO5KnM55OwugpsD4bRW1zywKoZjbkI= golang.org/x/exp v0.0.0-20211216164055-b2b84827b756/go.mod h1:b9TAUYHmRtqA6klRHApnXMnj+OyLce4yF5cZCUbk2ps= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= @@ -497,27 +383,18 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 h1:LQmS1nU0twXLA96Kt7U9qtHJEbBk3z6Q0V4UXjZkpr4= golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -530,29 +407,19 @@ golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -575,24 +442,11 @@ golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -601,25 +455,20 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc= -golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -632,39 +481,18 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8= +golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -679,61 +507,33 @@ gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6d gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20210630183607-d20f26d13c79/go.mod h1:yiaVoXHpRzHGyxV3o4DktVWY4mSUErTKaeEOq6C3t3U= +google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 h1:YxHp5zqIcAShDEvRr5/0rVESVS+njYF68PSdazrNLJo= google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -746,21 +546,16 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= -gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= -gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= -gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= -gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= @@ -768,20 +563,13 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=