fixup! chore(deps): bump cloud.google.com/go/bigquery from 1.59.1 to …

…1.61.0

sqlconnect/internal/bigquery/db.go

@@ -30,9 +30,6 @@ func NewDB(configJSON json.RawMessage) (*DB, error) {
 
  db := sql.OpenDB(driver.NewConnector(
  config.ProjectID,
- driver.Config{
- JobRateLimitExceededRetryEnabled: true,
- },
  option.WithCredentialsJSON([]byte(config.CredentialsJSON))),
  )
 

sqlconnect/internal/bigquery/driver/connection.go

@@ -5,16 +5,12 @@ import (
  "database/sql/driver"
  "errors"
  "fmt"
- "strings"
- "time"
 
  "cloud.google.com/go/bigquery"
- "github.com/cenkalti/backoff/v4"
  "google.golang.org/api/iterator"
 )
 
 type bigQueryConnection struct {
- config Config
  ctx context.Context
  client *bigquery.Client
  closed bool
@@ -80,28 +76,3 @@ func (bigQueryConnection) CheckNamedValue(*driver.NamedValue) error {
 func (connection *bigQueryConnection) BigqueryClient() *bigquery.Client {
  return connection.client
 }
-
-// readWithBackoff will retry the read operation if the error is [jobRateLimitExceeded] and the config is set to retry rate limit errors
-//
-// TODO: this should no longer be needed once this fix is released:
-// https://github.com/googleapis/google-cloud-go/pull/9726
-func (connection *bigQueryConnection) readWithBackoff(ctx context.Context, query *bigquery.Query) (it *bigquery.RowIterator, err error) {
- if !connection.config.JobRateLimitExceededRetryEnabled {
- return query.Read(ctx)
- }
- // mimicking google's own retry backoff settings
- // https://github.com/googleapis/google-cloud-go/blob/b2e704d9d287445304d2b6030b6e35a4eb8be80a/bigquery/bigquery.go#L236
- retry := backoff.WithContext(backoff.NewExponentialBackOff(
- backoff.WithInitialInterval(1*time.Second),
- backoff.WithMaxInterval(32*time.Second),
- backoff.WithMultiplier(2),
- ), ctx)
- _ = backoff.Retry(func() error {
- it, err = query.Read(ctx)
- if err != nil && (strings.Contains(err.Error(), "jobRateLimitExceeded")) {
- return err
- }
- return nil
- }, retry)
- return it, err
-}

sqlconnect/internal/bigquery/driver/connector.go

@@ -8,21 +8,15 @@ import (
  "google.golang.org/api/option"
 )
 
-type Config struct {
- JobRateLimitExceededRetryEnabled bool // Enable jobRateLimitExceeded retries: default false
-}
-
-func NewConnector(projectID string, config Config, opts ...option.ClientOption) driver.Connector {
+func NewConnector(projectID string, opts ...option.ClientOption) driver.Connector {
  return &bigQueryConnector{
  projectID: projectID,
- config: config,
  opts: opts,
  }
 }
 
 type bigQueryConnector struct {
  projectID string
- config Config
  opts []option.ClientOption
 }
 
@@ -33,7 +27,6 @@ func (c *bigQueryConnector) Connect(ctx context.Context) (driver.Conn, error) {
  }
 
  return &bigQueryConnection{
- config: c.config,
  ctx: ctx,
  client: client,
  }, nil

sqlconnect/internal/bigquery/driver/driver_test.go

@@ -34,7 +34,7 @@ func TestBigqueryDriver(t *testing.T) {
  require.NoError(t, json.Unmarshal([]byte(configJSON), &c))
 
  t.Run("OpenDB", func(t *testing.T) {
- db := sql.OpenDB(driver.NewConnector(c.ProjectID, driver.Config{}, option.WithCredentialsJSON([]byte(c.CredentialsJSON))))
+ db := sql.OpenDB(driver.NewConnector(c.ProjectID, option.WithCredentialsJSON([]byte(c.CredentialsJSON))))
  t.Cleanup(func() {
  require.NoError(t, db.Close(), "it should be able to close the database connection")
  })
@@ -225,32 +225,9 @@ func TestBigqueryDriver(t *testing.T) {
  })
  })
 
- // TODO: this test should start failing once this fix is released:
- // https://github.com/googleapis/google-cloud-go/pull/9726
  t.Run("jobRateLimitExceeded", func(t *testing.T) {
- t.Run("selecting from information schema from multiple go-routines should lead to a jobRateLimitExceeded error", func(t *testing.T) {
- db := sql.OpenDB(driver.NewConnector(c.ProjectID, driver.Config{}, option.WithCredentialsJSON([]byte(c.CredentialsJSON))))
- t.Cleanup(func() {
- require.NoError(t, db.Close(), "it should be able to close the database connection")
- })
- ctx, cancel := context.WithCancel(context.Background())
- t.Cleanup(cancel)
-
- g, ctx := errgroup.WithContext(ctx)
- g.SetLimit(10)
- for i := 0; i < 200; i++ {
- g.Go(func() error {
- _, err := db.ExecContext(ctx, "SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'invalid'")
- return err
- })
- }
- err := g.Wait()
- require.Error(t, err, "it should return an error")
- require.Contains(t, err.Error(), "jobRateLimitExceeded", "it should return a jobRateLimitExceeded error")
- })
-
  t.Run("selecting from information schema from multiple go-routines and having rate limit retries enabled, shoudln't lead to a jobRateLimitExceeded error", func(t *testing.T) {
- db := sql.OpenDB(driver.NewConnector(c.ProjectID, driver.Config{JobRateLimitExceededRetryEnabled: true}, option.WithCredentialsJSON([]byte(c.CredentialsJSON))))
+ db := sql.OpenDB(driver.NewConnector(c.ProjectID, option.WithCredentialsJSON([]byte(c.CredentialsJSON))))
  t.Cleanup(func() {
  require.NoError(t, db.Close(), "it should be able to close the database connection")
  })

sqlconnect/internal/bigquery/driver/statement.go

@@ -41,7 +41,7 @@ func (statement *bigQueryStatement) ExecContext(ctx context.Context, args []driv
  return nil, err
  }
 
- rowIterator, err := statement.connection.readWithBackoff(ctx, query)
+ rowIterator, err := query.Read(ctx)
  if err != nil {
  return nil, err
  }
@@ -55,7 +55,7 @@ func (statement *bigQueryStatement) QueryContext(ctx context.Context, args []dri
  return nil, err
  }
 
- rowIterator, err := statement.connection.readWithBackoff(ctx, query)
+ rowIterator, err := query.Read(ctx)
  if err != nil {
  return nil, err
  }