Skip to content

Commit 2568b22

Browse files
mhiltonmhilton
committed
build(deps): update to github.com/apache/arrow-go/v18
Update the arrow version used in flux to github.com/apache/arrow-go/v18. The Go implementation of arrow has been split away from the main arrow repository, this will make the arrow module more stable with regards version numbers. Update to the new version so that it is easier to update the arrow module in the future. The version of arrow is strictly speaking part of the external interface so that change will cause a knock-on upgrade to be required for all other systems that include flux. This is not epected to be too complex an update.
1 parent 13acdee commit 2568b22

File tree

106 files changed

+288
-645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+288
-645
lines changed

‎array/array.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package array
33
import (
44
"strconv"
55

6-
"github.com/apache/arrow/go/v7/arrow"
7-
"github.com/apache/arrow/go/v7/arrow/array"
6+
"github.com/apache/arrow-go/v18/arrow"
7+
"github.com/apache/arrow-go/v18/arrow/array"
88

99
"github.com/influxdata/flux/codes"
1010
"github.com/influxdata/flux/internal/errors"

‎array/array_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package array_test
33
import (
44
"testing"
55

6-
apachearray "github.com/apache/arrow/go/v7/arrow/array"
7-
"github.com/apache/arrow/go/v7/arrow/memory"
6+
apachearray "github.com/apache/arrow-go/v18/arrow/array"
7+
"github.com/apache/arrow-go/v18/arrow/memory"
88
"github.com/google/go-cmp/cmp"
99
"github.com/influxdata/flux/array"
1010
fluxmemory "github.com/influxdata/flux/memory"

‎array/binary.gen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package array
99
import (
1010
"math"
1111

12-
"github.com/apache/arrow/go/v7/arrow/memory"
12+
"github.com/apache/arrow-go/v18/arrow/memory"
1313
"github.com/influxdata/flux/codes"
1414
"github.com/influxdata/flux/internal/errors"
1515
)

‎array/binary.gen.go.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package array
33
import (
44
"math"
55

6-
"github.com/apache/arrow/go/v7/arrow/memory"
6+
"github.com/apache/arrow-go/v18/arrow/memory"
77
"github.com/influxdata/flux/codes"
88
"github.com/influxdata/flux/internal/errors"
99
)

‎array/binary.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package array
22

33
import (
4-
"github.com/apache/arrow/go/v7/arrow/memory"
4+
"github.com/apache/arrow-go/v18/arrow/memory"
55
"github.com/influxdata/flux/codes"
66
"github.com/influxdata/flux/internal/errors"
77
)

‎array/builder.gen.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ package array
99
import (
1010
"fmt"
1111

12-
"github.com/apache/arrow/go/v7/arrow/array"
13-
"github.com/apache/arrow/go/v7/arrow/memory"
12+
"github.com/apache/arrow-go/v18/arrow/array"
13+
"github.com/apache/arrow-go/v18/arrow/memory"
1414
)
1515

1616
type (

‎array/builder.gen.go.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package array
33
import (
44
"fmt"
55

6-
"github.com/apache/arrow/go/v7/arrow/array"
7-
"github.com/apache/arrow/go/v7/arrow/memory"
6+
"github.com/apache/arrow-go/v18/arrow/array"
7+
"github.com/apache/arrow-go/v18/arrow/memory"
88
)
99

1010
type (

‎array/builder.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"sync/atomic"
66
"unsafe"
77

8-
"github.com/apache/arrow/go/v7/arrow"
9-
"github.com/apache/arrow/go/v7/arrow/array"
10-
"github.com/apache/arrow/go/v7/arrow/bitutil"
11-
"github.com/apache/arrow/go/v7/arrow/memory"
8+
"github.com/apache/arrow-go/v18/arrow"
9+
"github.com/apache/arrow-go/v18/arrow/array"
10+
"github.com/apache/arrow-go/v18/arrow/bitutil"
11+
"github.com/apache/arrow-go/v18/arrow/memory"
1212
)
1313

1414
type StringBuilder struct {

‎array/conditional.gen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package array
88

99
import (
10-
"github.com/apache/arrow/go/v7/arrow/memory"
10+
"github.com/apache/arrow-go/v18/arrow/memory"
1111
"github.com/influxdata/flux/codes"
1212
"github.com/influxdata/flux/internal/errors"
1313
)

‎array/conditional.gen.go.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package array
22

33
import (
4-
"github.com/apache/arrow/go/v7/arrow/memory"
4+
"github.com/apache/arrow-go/v18/arrow/memory"
55
"github.com/influxdata/flux/codes"
66
"github.com/influxdata/flux/internal/errors"
77
)

‎array/repeat.gen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package array
88

99
import (
10-
"github.com/apache/arrow/go/v7/arrow/memory"
10+
"github.com/apache/arrow-go/v18/arrow/memory"
1111
)
1212

1313
func IntRepeat(v int64, isNull bool, n int, mem memory.Allocator) *Int {

‎array/repeat.gen.go.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package array
22

33
import (
4-
"github.com/apache/arrow/go/v7/arrow/memory"
4+
"github.com/apache/arrow-go/v18/arrow/memory"
55
)
66

77
{{range .}}{{if .ArrowType}}

‎array/repeat.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package array
33
import (
44
"unsafe"
55

6-
"github.com/apache/arrow/go/v7/arrow"
7-
"github.com/apache/arrow/go/v7/arrow/memory"
6+
"github.com/apache/arrow-go/v18/arrow"
7+
"github.com/apache/arrow-go/v18/arrow/memory"
88
)
99

1010
func StringRepeat(v string, n int, mem memory.Allocator) *String {

‎array/repeat_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package array_test
33
import (
44
"testing"
55

6-
"github.com/apache/arrow/go/v7/arrow/memory"
6+
"github.com/apache/arrow-go/v18/arrow/memory"
77
"github.com/influxdata/flux"
88
"github.com/influxdata/flux/arrow"
99
"github.com/influxdata/flux/values"

‎array/unary.gen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package array
88

99
import (
10-
"github.com/apache/arrow/go/v7/arrow/memory"
10+
"github.com/apache/arrow-go/v18/arrow/memory"
1111
)
1212

1313
//

‎array/unary.gen.go.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package array
22

33
import (
4-
"github.com/apache/arrow/go/v7/arrow/memory"
4+
"github.com/apache/arrow-go/v18/arrow/memory"
55
)
66

77
//

‎arrow/allocator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package arrow
22

33
import (
4-
arrowmemory "github.com/apache/arrow/go/v7/arrow/memory"
4+
arrowmemory "github.com/apache/arrow-go/v18/arrow/memory"
55
"github.com/influxdata/flux/memory"
66
)
77

‎arrow/arrow_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package arrow_test
33
import (
44
"testing"
55

6-
"github.com/apache/arrow/go/v7/arrow/math"
7-
arrowmemory "github.com/apache/arrow/go/v7/arrow/memory"
6+
"github.com/apache/arrow-go/v18/arrow/math"
7+
arrowmemory "github.com/apache/arrow-go/v18/arrow/memory"
88
"github.com/google/go-cmp/cmp"
99
"github.com/influxdata/flux/array"
1010
"github.com/influxdata/flux/arrow"

‎arrow/repeat.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package arrow
22

33
import (
4-
"github.com/apache/arrow/go/v7/arrow/memory"
4+
"github.com/apache/arrow-go/v18/arrow/memory"
55
"github.com/influxdata/flux"
66
"github.com/influxdata/flux/array"
77
"github.com/influxdata/flux/codes"

‎arrow/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package arrow
33
import (
44
"fmt"
55

6-
"github.com/apache/arrow/go/v7/arrow/memory"
6+
"github.com/apache/arrow-go/v18/arrow/memory"
77
"github.com/influxdata/flux"
88
"github.com/influxdata/flux/array"
99
"github.com/influxdata/flux/codes"

‎compiler/vectorized_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"math"
77
"testing"
88

9-
arrow "github.com/apache/arrow/go/v7/arrow/memory"
9+
arrow "github.com/apache/arrow-go/v18/arrow/memory"
1010
"github.com/google/go-cmp/cmp"
1111
"github.com/influxdata/flux/compiler"
1212
"github.com/influxdata/flux/execute/executetest"

‎csv/result.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"time"
1414
"unicode/utf8"
1515

16-
"github.com/apache/arrow/go/v7/arrow/memory"
16+
"github.com/apache/arrow-go/v18/arrow/memory"
1717
"github.com/influxdata/flux"
1818
"github.com/influxdata/flux/array"
1919
"github.com/influxdata/flux/arrow"

‎dependencies/influxdb/http.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strconv"
1212
"time"
1313

14-
"github.com/apache/arrow/go/v7/arrow/memory"
14+
"github.com/apache/arrow-go/v18/arrow/memory"
1515
"github.com/influxdata/flux"
1616
"github.com/influxdata/flux/ast"
1717
"github.com/influxdata/flux/ast/astutil"

‎dependencies/influxdb/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"io"
66

7-
"github.com/apache/arrow/go/v7/arrow/memory"
7+
"github.com/apache/arrow-go/v18/arrow/memory"
88
"github.com/influxdata/flux"
99
"github.com/influxdata/flux/codes"
1010
"github.com/influxdata/flux/internal/errors"

‎dependencies/iox/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package iox
33
import (
44
"context"
55

6-
"github.com/apache/arrow/go/v7/arrow/array"
6+
"github.com/apache/arrow-go/v18/arrow/array"
77
"github.com/influxdata/flux/codes"
88
"github.com/influxdata/flux/dependencies/influxdb"
99
"github.com/influxdata/flux/internal/errors"

‎execute/aggregate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"sync"
66

7-
"github.com/apache/arrow/go/v7/arrow/memory"
7+
"github.com/apache/arrow-go/v18/arrow/memory"
88
"github.com/influxdata/flux"
99
"github.com/influxdata/flux/array"
1010
"github.com/influxdata/flux/arrow"

‎execute/aggregate_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sync/atomic"
88
"testing"
99

10-
"github.com/apache/arrow/go/v7/arrow/memory"
10+
"github.com/apache/arrow-go/v18/arrow/memory"
1111
"github.com/google/go-cmp/cmp"
1212
"github.com/google/go-cmp/cmp/cmpopts"
1313
"github.com/influxdata/flux"
@@ -1333,7 +1333,7 @@ func TestSimpleAggregate_Process(t *testing.T) {
13331333
sort.Sort(executetest.SortedTables(got))
13341334
sort.Sort(executetest.SortedTables(tc.want))
13351335

1336-
if !cmp.Equal(tc.want, got, cmpopts.EquateNaNs()) {
1336+
if !cmp.Equal(tc.want, got, cmpopts.EquateNaNs(), cmpopts.EquateApprox(0.0000001, 0)) {
13371337
t.Errorf("unexpected tables -want/+got\n%s", cmp.Diff(tc.want, got))
13381338
}
13391339
})

‎execute/dataset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"strconv"
66

7-
"github.com/apache/arrow/go/v7/arrow/memory"
7+
"github.com/apache/arrow-go/v18/arrow/memory"
88
uuid "github.com/gofrs/uuid"
99
"github.com/influxdata/flux"
1010
"github.com/influxdata/flux/codes"

‎execute/dataset_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package execute_test
33
import (
44
"testing"
55

6-
arrowmem "github.com/apache/arrow/go/v7/arrow/memory"
6+
arrowmem "github.com/apache/arrow-go/v18/arrow/memory"
77
"github.com/google/go-cmp/cmp"
88
"github.com/influxdata/flux"
99
"github.com/influxdata/flux/array"

‎execute/executetest/allocator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package executetest
22

33
import (
4-
arrowmem "github.com/apache/arrow/go/v7/arrow/memory"
4+
arrowmem "github.com/apache/arrow-go/v18/arrow/memory"
55

66
"github.com/influxdata/flux/memory"
77
)

‎execute/group_transformation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package execute
22

33
import (
4-
"github.com/apache/arrow/go/v7/arrow/memory"
4+
"github.com/apache/arrow-go/v18/arrow/memory"
55
"github.com/influxdata/flux/execute/table"
66
)
77

‎execute/group_transformation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package execute_test
33
import (
44
"testing"
55

6-
"github.com/apache/arrow/go/v7/arrow/memory"
6+
"github.com/apache/arrow-go/v18/arrow/memory"
77
"github.com/google/go-cmp/cmp"
88
"github.com/influxdata/flux"
99
"github.com/influxdata/flux/codes"

‎execute/narrow_state_transformation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package execute
22

33
import (
4-
"github.com/apache/arrow/go/v7/arrow/memory"
4+
"github.com/apache/arrow-go/v18/arrow/memory"
55
"github.com/influxdata/flux"
66
"github.com/influxdata/flux/execute/table"
77
)

‎execute/narrow_state_transformation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package execute_test
33
import (
44
"testing"
55

6-
"github.com/apache/arrow/go/v7/arrow/memory"
6+
"github.com/apache/arrow-go/v18/arrow/memory"
77
"github.com/google/go-cmp/cmp"
88
"github.com/influxdata/flux"
99
"github.com/influxdata/flux/codes"

‎execute/narrow_transformation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package execute
22

33
import (
4-
"github.com/apache/arrow/go/v7/arrow/memory"
4+
"github.com/apache/arrow-go/v18/arrow/memory"
55
"github.com/influxdata/flux/execute/table"
66
)
77

‎execute/narrow_transformation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package execute_test
33
import (
44
"testing"
55

6-
"github.com/apache/arrow/go/v7/arrow/memory"
6+
"github.com/apache/arrow-go/v18/arrow/memory"
77
"github.com/google/go-cmp/cmp"
88
"github.com/influxdata/flux"
99
"github.com/influxdata/flux/codes"

‎execute/table/buffered_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package table
22

33
import (
4-
"github.com/apache/arrow/go/v7/arrow/memory"
4+
"github.com/apache/arrow-go/v18/arrow/memory"
55
"github.com/influxdata/flux"
66
"github.com/influxdata/flux/array"
77
"github.com/influxdata/flux/arrow"

‎execute/table/static/static.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"fmt"
1414
"time"
1515

16-
"github.com/apache/arrow/go/v7/arrow/memory"
16+
"github.com/apache/arrow-go/v18/arrow/memory"
1717
"github.com/influxdata/flux"
1818
"github.com/influxdata/flux/array"
1919
"github.com/influxdata/flux/arrow"

‎execute/table/stringify_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package table_test
33
import (
44
"testing"
55

6-
"github.com/apache/arrow/go/v7/arrow/memory"
6+
"github.com/apache/arrow-go/v18/arrow/memory"
77
"github.com/influxdata/flux/execute/table"
88
"github.com/influxdata/flux/execute/table/static"
99
)

‎execute/transport.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sync"
88
"sync/atomic"
99

10-
"github.com/apache/arrow/go/v7/arrow/memory"
10+
"github.com/apache/arrow-go/v18/arrow/memory"
1111
"github.com/influxdata/flux"
1212
"github.com/influxdata/flux/arrow"
1313
"github.com/influxdata/flux/codes"

‎execute/transport_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package execute_test
33
import (
44
"testing"
55

6-
"github.com/apache/arrow/go/v7/arrow/memory"
6+
"github.com/apache/arrow-go/v18/arrow/memory"
77
"github.com/influxdata/flux"
88
"github.com/influxdata/flux/codes"
99
"github.com/influxdata/flux/execute"

0 commit comments

Comments
 (0)