Skip to content

Commit 5ef3a3e

Browse files
authored
Upgrade thrift version to 0.18.1 (#213)
* update thrift version to 0.18.1 * update thrift auto generated files
1 parent 4bc76e1 commit 5ef3a3e

File tree

6 files changed

+1372
-789
lines changed

6 files changed

+1372
-789
lines changed

go.mod

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
module github.com/beltran/gohive
22

3-
go 1.14
3+
go 1.19
44

55
require (
6-
github.com/apache/thrift v0.14.1
6+
github.com/apache/thrift v0.18.1
77
github.com/beltran/gosasl v0.0.0-20200715011608-d5475aebb293
88
github.com/go-zookeeper/zk v1.0.1
99
github.com/pkg/errors v0.9.1
1010
)
11+
12+
require github.com/beltran/gssapi v0.0.0-20200324152954-d86554db4bab // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/apache/thrift v0.14.1 h1:Yh8v0hpCj63p5edXOLaqTJW0IJ1p+eMW6+YSOqw1d6s=
2-
github.com/apache/thrift v0.14.1/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
1+
github.com/apache/thrift v0.18.1 h1:lNhK/1nqjbwbiOPDBPFJVKxgDEGSepKuTh6OLiXW8kg=
2+
github.com/apache/thrift v0.18.1/go.mod h1:rdQn/dCcDKEWjjylUeueum4vQEjG2v8v2PqriUnbr+I=
33
github.com/beltran/gosasl v0.0.0-20200715011608-d5475aebb293 h1:1wRvU44e78w7zJoynLqrXLKSI+VEFEaWmzyq5JdUx7I=
44
github.com/beltran/gosasl v0.0.0-20200715011608-d5475aebb293/go.mod h1:Qx8cW6jkI8riyzmklj80kAIkv+iezFUTBiGU0qHhHes=
55
github.com/beltran/gssapi v0.0.0-20200324152954-d86554db4bab h1:ayfcn60tXOSYy5zUN1AMSTQo4nJCf7hrdzAVchpPst4=

hive.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -213,20 +213,17 @@ func innerConnect(ctx context.Context, host string, port int, auth string,
213213
}
214214
} else {
215215
if configuration.TLSConfig != nil {
216-
socket, err = thrift.NewTSSLSocketConf(addr, &thrift.TConfiguration{
216+
socket = thrift.NewTSSLSocketConf(addr, &thrift.TConfiguration{
217217
ConnectTimeout: configuration.ConnectTimeout,
218218
SocketTimeout: configuration.SocketTimeout,
219219
TLSConfig: configuration.TLSConfig,
220220
})
221221
} else {
222-
socket, err = thrift.NewTSocketConf(addr, &thrift.TConfiguration{
222+
socket = thrift.NewTSocketConf(addr, &thrift.TConfiguration{
223223
ConnectTimeout: configuration.ConnectTimeout,
224224
SocketTimeout: configuration.SocketTimeout,
225225
})
226226
}
227-
if err != nil {
228-
return
229-
}
230227
if err = socket.Open(); err != nil {
231228
return
232229
}

hiveserver/GoUnusedProtection__.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hiveserver/HiveServer-consts.go

+35-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)