Skip to content

Commit

Permalink
Upgrade thrift version to 0.18.1 (#213)
Browse files Browse the repository at this point in the history
* update thrift version to 0.18.1

* update thrift auto generated files
  • Loading branch information
beltran authored May 1, 2023
1 parent 4bc76e1 commit 5ef3a3e
Show file tree
Hide file tree
Showing 6 changed files with 1,372 additions and 789 deletions.
6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
module github.com/beltran/gohive

go 1.14
go 1.19

require (
github.com/apache/thrift v0.14.1
github.com/apache/thrift v0.18.1
github.com/beltran/gosasl v0.0.0-20200715011608-d5475aebb293
github.com/go-zookeeper/zk v1.0.1
github.com/pkg/errors v0.9.1
)

require github.com/beltran/gssapi v0.0.0-20200324152954-d86554db4bab // indirect
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/apache/thrift v0.14.1 h1:Yh8v0hpCj63p5edXOLaqTJW0IJ1p+eMW6+YSOqw1d6s=
github.com/apache/thrift v0.14.1/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.18.1 h1:lNhK/1nqjbwbiOPDBPFJVKxgDEGSepKuTh6OLiXW8kg=
github.com/apache/thrift v0.18.1/go.mod h1:rdQn/dCcDKEWjjylUeueum4vQEjG2v8v2PqriUnbr+I=
github.com/beltran/gosasl v0.0.0-20200715011608-d5475aebb293 h1:1wRvU44e78w7zJoynLqrXLKSI+VEFEaWmzyq5JdUx7I=
github.com/beltran/gosasl v0.0.0-20200715011608-d5475aebb293/go.mod h1:Qx8cW6jkI8riyzmklj80kAIkv+iezFUTBiGU0qHhHes=
github.com/beltran/gssapi v0.0.0-20200324152954-d86554db4bab h1:ayfcn60tXOSYy5zUN1AMSTQo4nJCf7hrdzAVchpPst4=
Expand Down
7 changes: 2 additions & 5 deletions hive.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,20 +213,17 @@ func innerConnect(ctx context.Context, host string, port int, auth string,
}
} else {
if configuration.TLSConfig != nil {
socket, err = thrift.NewTSSLSocketConf(addr, &thrift.TConfiguration{
socket = thrift.NewTSSLSocketConf(addr, &thrift.TConfiguration{
ConnectTimeout: configuration.ConnectTimeout,
SocketTimeout: configuration.SocketTimeout,
TLSConfig: configuration.TLSConfig,
})
} else {
socket, err = thrift.NewTSocketConf(addr, &thrift.TConfiguration{
socket = thrift.NewTSocketConf(addr, &thrift.TConfiguration{
ConnectTimeout: configuration.ConnectTimeout,
SocketTimeout: configuration.SocketTimeout,
})
}
if err != nil {
return
}
if err = socket.Open(); err != nil {
return
}
Expand Down
2 changes: 1 addition & 1 deletion hiveserver/GoUnusedProtection__.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 35 additions & 28 deletions hiveserver/HiveServer-consts.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5ef3a3e

Please sign in to comment.