This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new ab567df6a chore(go/adbc): bump google.golang.org/grpc from 1.63.2 to
1.64.0 in /go/adbc (#1872)
ab567df6a is described below
commit ab567df6af9b2e81c2d52acfb6d971f20f165f8a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Jun 20 00:46:29 2024 -0400
chore(go/adbc): bump google.golang.org/grpc from 1.63.2 to 1.64.0 in
/go/adbc (#1872)
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from
1.63.2 to 1.64.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/grpc/grpc-go/releases";>google.golang.org/grpc's
releases</a>.</em></p>
<blockquote>
<h2>Release 1.64.0</h2>
<h1>API Changes</h1>
<ul>
<li>stats: Deprecate <code>InPayload.Data</code> and
<code>OutPayload.Data</code>; they were experimental and will be deleted
in the next release (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7121";>#7121</a>)</li>
</ul>
<h1>Behavior Changes</h1>
<ul>
<li>codec: Remove handling of environment variable
<code>GRPC_GO_ADVERTISE_COMPRESSORS</code> to suppress setting supported
compressors in <code>grpc-accept-encoding</code> header. Compressors
will always be advertised, as they have been by default for some time
(<a
href="https://redirect.github.com/grpc/grpc-go/issues/7203";>#7203</a>)</li>
</ul>
<h1>New Features</h1>
<ul>
<li>resolver/dns: Add <code>SetMinResolutionInterval</code> to set the
minimum interval at which DNS re-resolutions may occur (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6962";>#6962</a>)
<ul>
<li>Special Thanks: <a
href="https://github.com/HomayoonAlimohammadi";><code>@HomayoonAlimohammadi</code></a></li>
</ul>
</li>
<li>peer/peer: Implement the <code>fmt.Stringer</code> interface for
pretty printing <code>Peer</code>, and</li>
<li>metadata/metadata: Implement the <code>fmt.Stringer</code> interface
for pretty printing <code>MD</code> (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7137";>#7137</a>)
<ul>
<li>Special Thanks: <a
href="https://github.com/AnomalRoil";><code>@AnomalRoil</code></a></li>
</ul>
</li>
</ul>
<h1>Performance Improvements</h1>
<ul>
<li>client: Improve RPC performance by reducing work while holding a
lock (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7132";>#7132</a>)</li>
</ul>
<h1>Bug Fixes</h1>
<ul>
<li>transport/server: Display the proper timeout value when keepalive
pings are not ack'd in time (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7038";>#7038</a>)
<ul>
<li>Special Thanks: <a
href="https://github.com/BatmanAoD";><code>@BatmanAoD</code></a></li>
</ul>
</li>
<li>channelz: Fix bug that was causing the subchannel's target to be
unset (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7189";>#7189</a>)</li>
<li>stats: Fix bug where peer was not set in context when calling stats
handler for <code>OutPayload</code>, <code>InPayload</code>, and
<code>End</code> (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7096";>#7096</a>)</li>
</ul>
<h1>Dependencies</h1>
<ul>
<li>deps: Remove dependency on deprecated
<code>github.com/golang/protobuf</code> module (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7122";>#7122</a>)</li>
</ul>
<h1>Documentation</h1>
<ul>
<li>grpc: Deprecate <code>WithBlock</code>,
<code>WithReturnConnectionError</code>,
<code>FailOnNonTempDialError</code> which are ignored by
<code>NewClient</code> (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7097";>#7097</a>)
<ul>
<li>Special Thanks: <a
href="https://github.com/pellared";><code>@pellared</code></a></li>
</ul>
</li>
<li>grpc: Deprecate <code>Dial</code> and <code>DialContext</code>.
These will continue to be supported throughout 1.x, but are deprecated
to direct users to <code>NewClient</code> (See <a
href="https://redirect.github.com/grpc/grpc-go/issues/7090";>#7090</a>
for more information)</li>
<li>examples: Add custom lb example (<a
href="https://redirect.github.com/grpc/grpc-go/issues/6691";>#6691</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/grpc/grpc-go/commit/fa274d77904729c2893111ac292048d56dcf0bb1";><code>fa274d7</code></a>
Change version to 1.64.0 (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7218";>#7218</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/6b413c8351abd92f8f9953bb9b41fc9e2262b99c";><code>6b413c8</code></a>
xds: Surround two <code>Infof</code> calls that use
<code>pretty.ToJSON</code> with <code>V(2)</code> checks (...</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/2dbbcefef2db79dcbe0ee25c1bdf040c4613ae9a";><code>2dbbcef</code></a>
resolver/dns: Add docstring to SetMinResolutionInterval (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7217";>#7217</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/070d9c793af46df05f24b4de548509627606f5b7";><code>070d9c7</code></a>
codes: replace %q to %d in error string when invalid code is an integer
(<a
href="https://redirect.github.com/grpc/grpc-go/issues/7188";>#7188</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/5d24ee2bd170a0c2c636b7d1ebc7ebdd3ecf81ac";><code>5d24ee2</code></a>
xds: store server config for LRS server in xdsresource.ClusterUpdate (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7191";>#7191</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/c76f686c517261380b0a9a98d16510f271e4895e";><code>c76f686</code></a>
advancedTLS: Rename get root certs related pieces (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7207";>#7207</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/f591e3b82f76ee56ed32d53579332200242a10dc";><code>f591e3b</code></a>
codec: remove option to suppress setting supported compressors in
headers (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7";>#7</a>...</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/b4f7947184ed45e72283a37aeaf214e38c35bc63";><code>b4f7947</code></a>
github: remove dependabot (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7208";>#7208</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/0561c78c9dcb5876a140ff7be97f0f37abc36ec8";><code>0561c78</code></a>
client: add user-friendly error message of LB policy update timed out
(<a
href="https://redirect.github.com/grpc/grpc-go/issues/7206";>#7206</a>)</li>
<li><a
href="https://github.com/grpc/grpc-go/commit/9d9c1fbd60cfd34608b731aa12a968d2f61a36d1";><code>9d9c1fb</code></a>
peer: remove change detector test (<a
href="https://redirect.github.com/grpc/grpc-go/issues/7204";>#7204</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/grpc/grpc-go/compare/v1.63.2...v1.64.0";>compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: David Li <[email protected]>
---
docs/source/driver/flight_sql.rst | 9 +++++----
go/adbc/driver/flightsql/flightsql_database.go | 19 ++-----------------
go/adbc/driver/flightsql/flightsql_driver.go | 3 ---
go/adbc/go.mod | 4 ++--
go/adbc/go.sum | 8 ++++----
5 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/docs/source/driver/flight_sql.rst
b/docs/source/driver/flight_sql.rst
index add9ea419..bac793cad 100644
--- a/docs/source/driver/flight_sql.rst
+++ b/docs/source/driver/flight_sql.rst
@@ -223,10 +223,11 @@ These options map 1:1 with the options in
FlightClientOptions:
certificate.
``adbc.flight.sql.client_option.with_block``
- Whether connections should wait until connections are established,
- or connect lazily when used. The latter is gRPC's default
- behavior, but the driver defaults to eager connection to surface
- errors earlier. Value should be ``true`` or ``false``.
+ .. warning:: This option is deprecated as gRPC itself has deprecated the
+ underlying option.
+
+ This option has no effect and will be removed in a future release.
+ Value should be ``true`` or ``false``.
``adbc.flight.sql.client_option.with_max_msg_size``
The maximum message size to accept from the server. The driver
diff --git a/go/adbc/driver/flightsql/flightsql_database.go
b/go/adbc/driver/flightsql/flightsql_database.go
index 57d94b610..367ae8ebb 100644
--- a/go/adbc/driver/flightsql/flightsql_database.go
+++ b/go/adbc/driver/flightsql/flightsql_database.go
@@ -42,7 +42,6 @@ import (
type dbDialOpts struct {
opts []grpc.DialOption
- block bool
maxMsgSize int
authority string
}
@@ -52,9 +51,6 @@ func (d *dbDialOpts) rebuild() {
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(d.maxMsgSize),
grpc.MaxCallSendMsgSize(d.maxMsgSize)),
}
- if d.block {
- d.opts = append(d.opts, grpc.WithBlock())
- }
if d.authority != "" {
d.opts = append(d.opts, grpc.WithAuthority(d.authority))
}
@@ -200,19 +196,8 @@ func (d *databaseImpl) SetOptions(cnOptions
map[string]string) error {
delete(cnOptions, OptionTimeoutConnect)
}
- if val, ok := cnOptions[OptionWithBlock]; ok {
- if val == adbc.OptionValueEnabled {
- d.dialOpts.block = true
- } else if val == adbc.OptionValueDisabled {
- d.dialOpts.block = false
- } else {
- return adbc.Error{
- Msg: fmt.Sprintf("Invalid value for database
option '%s': '%s'", OptionWithBlock, val),
- Code: adbc.StatusInvalidArgument,
- }
- }
- delete(cnOptions, OptionWithBlock)
- }
+ // gRPC deprecated this and explicitly recommends against it
+ delete(cnOptions, OptionWithBlock)
if val, ok := cnOptions[OptionWithMaxMsgSize]; ok {
var err error
diff --git a/go/adbc/driver/flightsql/flightsql_driver.go
b/go/adbc/driver/flightsql/flightsql_driver.go
index db3e39772..e3cb40bba 100644
--- a/go/adbc/driver/flightsql/flightsql_driver.go
+++ b/go/adbc/driver/flightsql/flightsql_driver.go
@@ -107,10 +107,7 @@ func (d *driverImpl) NewDatabase(opts map[string]string)
(adbc.Database, error)
return nil, adbc.Error{Msg: err.Error(), Code:
adbc.StatusInvalidArgument}
}
- // Do not set WithBlock since it converts some types of connection
- // errors to infinite hangs
// Use WithMaxMsgSize(16 MiB) since Flight services tend to send large
messages
- db.dialOpts.block = false
db.dialOpts.maxMsgSize = 16 * 1024 * 1024
db.options = make(map[string]string)
diff --git a/go/adbc/go.mod b/go/adbc/go.mod
index ea2d02232..f4317cc66 100644
--- a/go/adbc/go.mod
+++ b/go/adbc/go.mod
@@ -30,7 +30,7 @@ require (
golang.org/x/exp v0.0.0-20240529005216-23cca8864a10
golang.org/x/sync v0.7.0
golang.org/x/tools v0.22.0
- google.golang.org/grpc v1.63.2
+ google.golang.org/grpc v1.64.0
google.golang.org/protobuf v1.34.2
)
@@ -92,7 +92,7 @@ require (
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
- google.golang.org/genproto/googleapis/rpc
v0.0.0-20240227224415-6ceb2ff114de // indirect
+ google.golang.org/genproto/googleapis/rpc
v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect
modernc.org/libc v1.45.3 // indirect
diff --git a/go/adbc/go.sum b/go/adbc/go.sum
index 94b40e344..46274793e 100644
--- a/go/adbc/go.sum
+++ b/go/adbc/go.sum
@@ -186,10 +186,10 @@ golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
h1:+cNy6SZtPcJQH3LJVLOSm
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod
h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ=
gonum.org/v1/gonum v0.15.0/go.mod
h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de
h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY=
-google.golang.org/genproto/googleapis/rpc
v0.0.0-20240227224415-6ceb2ff114de/go.mod
h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
-google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
-google.golang.org/grpc v1.63.2/go.mod
h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237
h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc=
+google.golang.org/genproto/googleapis/rpc
v0.0.0-20240318140521-94a12d6c2237/go.mod
h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
+google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY=
+google.golang.org/grpc v1.64.0/go.mod
h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
google.golang.org/protobuf v1.34.2
h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod
h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
