Skip to content

Commit 869c98e

Browse files
Revert update Apache Arrow to v16 (#228)
Reverts #216 Unfortunately, updating Apache Arrow turned out to be a breaking change which created issues to some library users. We made a decision to revert this upgrade
1 parent 9f63de7 commit 869c98e

File tree

10 files changed

+104
-99
lines changed

10 files changed

+104
-99
lines changed

examples/arrrowbatches/main.go

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

13-
"github.com/apache/arrow/go/v16/arrow"
13+
"github.com/apache/arrow/go/v12/arrow"
1414
dbsql "github.com/databricks/databricks-sql-go"
1515
dbsqlrows "github.com/databricks/databricks-sql-go/rows"
1616
"github.com/joho/godotenv"

go.mod

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,57 @@
11
module github.com/databricks/databricks-sql-go
22

3-
go 1.21
3+
go 1.20
44

55
require (
6-
github.com/apache/arrow/go/v16 v16.0.0
7-
github.com/apache/thrift v0.19.0
6+
github.com/apache/arrow/go/v12 v12.0.1
7+
github.com/apache/thrift v0.17.0
88
github.com/coreos/go-oidc/v3 v3.5.0
9-
github.com/hashicorp/go-retryablehttp v0.7.1
109
github.com/joho/godotenv v1.4.0
1110
github.com/mattn/go-isatty v0.0.19
12-
github.com/pierrec/lz4/v4 v4.1.21
13-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
14-
github.com/pkg/errors v0.9.1
15-
github.com/rs/zerolog v1.28.0
16-
github.com/stretchr/testify v1.9.0
11+
github.com/pierrec/lz4/v4 v4.1.15
12+
github.com/stretchr/testify v1.8.1
1713
golang.org/x/oauth2 v0.7.0
1814
gotest.tools/gotestsum v1.8.2
1915
)
2016

2117
require (
18+
github.com/andybalholm/brotli v1.0.4 // indirect
2219
github.com/davecgh/go-spew v1.1.1 // indirect
2320
github.com/dnephin/pflag v1.0.7 // indirect
24-
github.com/fatih/color v1.15.0 // indirect
21+
github.com/fatih/color v1.13.0 // indirect
2522
github.com/fsnotify/fsnotify v1.5.4 // indirect
2623
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
27-
github.com/goccy/go-json v0.10.2 // indirect
28-
github.com/golang/protobuf v1.5.3 // indirect
29-
github.com/google/flatbuffers v24.3.25+incompatible // indirect
24+
github.com/goccy/go-json v0.9.11 // indirect
25+
github.com/golang/protobuf v1.5.2 // indirect
26+
github.com/golang/snappy v0.0.4 // indirect
27+
github.com/google/flatbuffers v2.0.8+incompatible // indirect
3028
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
3129
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
32-
github.com/klauspost/compress v1.17.7 // indirect
33-
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
34-
github.com/kr/pretty v0.3.0 // indirect
35-
github.com/mattn/go-colorable v0.1.13 // indirect
30+
github.com/klauspost/asmfmt v1.3.2 // indirect
31+
github.com/klauspost/compress v1.15.9 // indirect
32+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
33+
github.com/kr/text v0.2.0 // indirect
34+
github.com/mattn/go-colorable v0.1.12 // indirect
35+
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
36+
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
3637
github.com/pmezard/go-difflib v1.0.0 // indirect
3738
github.com/zeebo/xxh3 v1.0.2 // indirect
38-
golang.org/x/crypto v0.21.0 // indirect
39-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
40-
golang.org/x/mod v0.16.0 // indirect
41-
golang.org/x/net v0.22.0 // indirect
42-
golang.org/x/sync v0.6.0 // indirect
43-
golang.org/x/sys v0.18.0 // indirect
44-
golang.org/x/term v0.18.0 // indirect
45-
golang.org/x/tools v0.19.0 // indirect
46-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
39+
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
40+
golang.org/x/mod v0.8.0 // indirect
41+
golang.org/x/net v0.9.0 // indirect
42+
golang.org/x/sync v0.1.0 // indirect
43+
golang.org/x/term v0.7.0 // indirect
44+
golang.org/x/tools v0.6.0 // indirect
45+
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
4746
google.golang.org/appengine v1.6.7 // indirect
48-
google.golang.org/protobuf v1.33.0 // indirect
49-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
47+
google.golang.org/protobuf v1.28.1 // indirect
5048
gopkg.in/yaml.v3 v3.0.1 // indirect
5149
)
50+
51+
require (
52+
github.com/hashicorp/go-retryablehttp v0.7.1
53+
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
54+
github.com/pkg/errors v0.9.1
55+
github.com/rs/zerolog v1.28.0
56+
golang.org/x/sys v0.7.0 // indirect
57+
)

go.sum

Lines changed: 55 additions & 56 deletions
Large diffs are not rendered by default.

internal/rows/arrowbased/arrowRecordIterator.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/v16/arrow"
7+
"github.com/apache/arrow/go/v12/arrow"
88
"github.com/databricks/databricks-sql-go/internal/cli_service"
99
"github.com/databricks/databricks-sql-go/internal/config"
1010
dbsqlerr "github.com/databricks/databricks-sql-go/internal/errors"

internal/rows/arrowbased/arrowRows.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"io"
88
"time"
99

10-
"github.com/apache/arrow/go/v16/arrow"
11-
"github.com/apache/arrow/go/v16/arrow/array"
12-
"github.com/apache/arrow/go/v16/arrow/ipc"
10+
"github.com/apache/arrow/go/v12/arrow"
11+
"github.com/apache/arrow/go/v12/arrow/array"
12+
"github.com/apache/arrow/go/v12/arrow/ipc"
1313
dbsqlerr "github.com/databricks/databricks-sql-go/errors"
1414
"github.com/databricks/databricks-sql-go/internal/cli_service"
1515
"github.com/databricks/databricks-sql-go/internal/config"

internal/rows/arrowbased/arrowRows_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"testing"
1212
"time"
1313

14-
"github.com/apache/arrow/go/v16/arrow"
15-
"github.com/apache/arrow/go/v16/arrow/array"
14+
"github.com/apache/arrow/go/v12/arrow"
15+
"github.com/apache/arrow/go/v12/arrow/array"
1616
dbsqlerr "github.com/databricks/databricks-sql-go/errors"
1717
"github.com/databricks/databricks-sql-go/internal/cli_service"
1818
"github.com/databricks/databricks-sql-go/internal/config"

internal/rows/arrowbased/batchloader.go

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

1414
"net/http"
1515

16-
"github.com/apache/arrow/go/v16/arrow/ipc"
16+
"github.com/apache/arrow/go/v12/arrow/ipc"
1717
dbsqlerr "github.com/databricks/databricks-sql-go/errors"
1818
"github.com/databricks/databricks-sql-go/internal/cli_service"
1919
dbsqlerrint "github.com/databricks/databricks-sql-go/internal/errors"

internal/rows/arrowbased/batchloader_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/apache/arrow/go/v16/arrow"
14-
"github.com/apache/arrow/go/v16/arrow/array"
15-
"github.com/apache/arrow/go/v16/arrow/ipc"
16-
"github.com/apache/arrow/go/v16/arrow/memory"
13+
"github.com/apache/arrow/go/v12/arrow"
14+
"github.com/apache/arrow/go/v12/arrow/array"
15+
"github.com/apache/arrow/go/v12/arrow/ipc"
16+
"github.com/apache/arrow/go/v12/arrow/memory"
1717
dbsqlerr "github.com/databricks/databricks-sql-go/errors"
1818
dbsqlerrint "github.com/databricks/databricks-sql-go/internal/errors"
1919
"github.com/databricks/databricks-sql-go/internal/rows/rowscanner"

internal/rows/arrowbased/columnValues.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strings"
66
"time"
77

8-
"github.com/apache/arrow/go/v16/arrow"
9-
"github.com/apache/arrow/go/v16/arrow/array"
8+
"github.com/apache/arrow/go/v12/arrow"
9+
"github.com/apache/arrow/go/v12/arrow/array"
1010
"github.com/databricks/databricks-sql-go/internal/rows/rowscanner"
1111
dbsqllog "github.com/databricks/databricks-sql-go/logger"
1212
"github.com/pkg/errors"

rows/rows.go

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

6-
"github.com/apache/arrow/go/v16/arrow"
6+
"github.com/apache/arrow/go/v12/arrow"
77
)
88

99
type Rows interface {

0 commit comments

Comments
 (0)