From 5eea4da0a3bcdb9fb0c0f0f8135964652fdf9cf9 Mon Sep 17 00:00:00 2001 From: Seth Hollyman Date: Mon, 18 Nov 2024 22:44:20 +0000 Subject: [PATCH] chore(bigquery): cleanup unused param This PR revisits a few of the internal method signatures and simplifies them in the cases where a param is effectively unused or returns only a single possible value. Fixes here are scoped only to the main bigquery package, a subsequent PR will do the same for managedwriter. --- bigquery/iterator.go | 4 ++-- bigquery/iterator_test.go | 2 +- bigquery/model.go | 9 ++++----- bigquery/model_test.go | 5 +---- bigquery/routine.go | 24 ++++++++---------------- 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/bigquery/iterator.go b/bigquery/iterator.go index 2cbcde029e6a..4a2fae609167 100644 --- a/bigquery/iterator.go +++ b/bigquery/iterator.go @@ -243,7 +243,7 @@ type fetchPageResult struct { // then dispatches to either the appropriate job or table-based backend mechanism // as needed. func fetchPage(ctx context.Context, src *rowSource, schema Schema, startIndex uint64, pageSize int64, pageToken string) (*fetchPageResult, error) { - result, err := fetchCachedPage(ctx, src, schema, startIndex, pageSize, pageToken) + result, err := fetchCachedPage(src, schema, startIndex, pageSize, pageToken) if err != nil { if err != errNoCacheData { // This likely means something more severe, like a problem with schema. @@ -371,7 +371,7 @@ var errNoCacheData = errors.New("no rows in rowSource cache") // fetchCachedPage attempts to service the first page of results. For the jobs path specifically, we have an // opportunity to fetch rows before the iterator is constructed, and thus serve that data as the first request // without an unnecessary network round trip. -func fetchCachedPage(ctx context.Context, src *rowSource, schema Schema, startIndex uint64, pageSize int64, pageToken string) (*fetchPageResult, error) { +func fetchCachedPage(src *rowSource, schema Schema, startIndex uint64, pageSize int64, pageToken string) (*fetchPageResult, error) { // we have no cached data if src.cachedRows == nil { return nil, errNoCacheData diff --git a/bigquery/iterator_test.go b/bigquery/iterator_test.go index faf23b816a82..0e1de2215f0b 100644 --- a/bigquery/iterator_test.go +++ b/bigquery/iterator_test.go @@ -141,7 +141,7 @@ func TestRowIteratorCacheBehavior(t *testing.T) { }, } for _, tc := range testCases { - gotResp, gotErr := fetchCachedPage(context.Background(), tc.inSource, tc.inSchema, tc.inStartIndex, tc.inPageSize, tc.inPageToken) + gotResp, gotErr := fetchCachedPage(tc.inSource, tc.inSchema, tc.inStartIndex, tc.inPageSize, tc.inPageToken) if gotErr != tc.wantErr { t.Errorf("err mismatch. got %v, want %v", gotErr, tc.wantErr) } else { diff --git a/bigquery/model.go b/bigquery/model.go index 7ecfbb2a3b2c..277cda5d9886 100644 --- a/bigquery/model.go +++ b/bigquery/model.go @@ -94,7 +94,7 @@ func (m *Model) Metadata(ctx context.Context) (mm *ModelMetadata, err error) { if err != nil { return nil, err } - return bqToModelMetadata(model) + return bqToModelMetadata(model), nil } // Update updates mutable fields in an ML model. @@ -120,7 +120,7 @@ func (m *Model) Update(ctx context.Context, mm ModelMetadataToUpdate, etag strin }); err != nil { return nil, err } - return bqToModelMetadata(res) + return bqToModelMetadata(res), nil } // Delete deletes an ML model. @@ -229,8 +229,8 @@ func bqToModelCols(s []*bq.StandardSqlField) ([]*StandardSQLField, error) { return cols, nil } -func bqToModelMetadata(m *bq.Model) (*ModelMetadata, error) { - md := &ModelMetadata{ +func bqToModelMetadata(m *bq.Model) *ModelMetadata { + return &ModelMetadata{ Description: m.Description, Name: m.FriendlyName, Type: m.ModelType, @@ -245,7 +245,6 @@ func bqToModelMetadata(m *bq.Model) (*ModelMetadata, error) { trainingRuns: m.TrainingRuns, ETag: m.Etag, } - return md, nil } // ModelMetadataToUpdate is used when updating an ML model's metadata. diff --git a/bigquery/model_test.go b/bigquery/model_test.go index d46bd2963125..ae708b3e88c7 100644 --- a/bigquery/model_test.go +++ b/bigquery/model_test.go @@ -56,10 +56,7 @@ func TestBQToModelMetadata(t *testing.T) { }, }, } { - got, err := bqToModelMetadata(test.in) - if err != nil { - t.Fatal(err) - } + got := bqToModelMetadata(test.in) if diff := testutil.Diff(got, test.want, cmpopts.IgnoreUnexported(ModelMetadata{})); diff != "" { t.Errorf("%+v:\n, -got, +want:\n%s", test.in, diff) } diff --git a/bigquery/routine.go b/bigquery/routine.go index 03d3bbae85a2..1519c88d6803 100644 --- a/bigquery/routine.go +++ b/bigquery/routine.go @@ -237,9 +237,9 @@ type RemoteFunctionOptions struct { UserDefinedContext map[string]string } -func bqToRemoteFunctionOptions(in *bq.RemoteFunctionOptions) (*RemoteFunctionOptions, error) { +func bqToRemoteFunctionOptions(in *bq.RemoteFunctionOptions) *RemoteFunctionOptions { if in == nil { - return nil, nil + return nil } rfo := &RemoteFunctionOptions{ Connection: in.Connection, @@ -252,12 +252,12 @@ func bqToRemoteFunctionOptions(in *bq.RemoteFunctionOptions) (*RemoteFunctionOpt rfo.UserDefinedContext[k] = v } } - return rfo, nil + return rfo } -func (rfo *RemoteFunctionOptions) toBQ() (*bq.RemoteFunctionOptions, error) { +func (rfo *RemoteFunctionOptions) toBQ() *bq.RemoteFunctionOptions { if rfo == nil { - return nil, nil + return nil } r := &bq.RemoteFunctionOptions{ Connection: rfo.Connection, @@ -270,7 +270,7 @@ func (rfo *RemoteFunctionOptions) toBQ() (*bq.RemoteFunctionOptions, error) { r.UserDefinedContext[k] = v } } - return r, nil + return r } func (rm *RoutineMetadata) toBQ() (*bq.Routine, error) { @@ -307,11 +307,7 @@ func (rm *RoutineMetadata) toBQ() (*bq.Routine, error) { r.Arguments = args r.ImportedLibraries = rm.ImportedLibraries if rm.RemoteFunctionOptions != nil { - rfo, err := rm.RemoteFunctionOptions.toBQ() - if err != nil { - return nil, err - } - r.RemoteFunctionOptions = rfo + r.RemoteFunctionOptions = rm.RemoteFunctionOptions.toBQ() } if !rm.CreationTime.IsZero() { return nil, errors.New("cannot set CreationTime on create") @@ -528,11 +524,7 @@ func bqToRoutineMetadata(r *bq.Routine) (*RoutineMetadata, error) { return nil, err } meta.ReturnType = ret - rfo, err := bqToRemoteFunctionOptions(r.RemoteFunctionOptions) - if err != nil { - return nil, err - } - meta.RemoteFunctionOptions = rfo + meta.RemoteFunctionOptions = bqToRemoteFunctionOptions(r.RemoteFunctionOptions) tt, err := bqToStandardSQLTableType(r.ReturnTableType) if err != nil { return nil, err