From d6dfc63e8e99749dbc8f08fe40242d5bd7b72d58 Mon Sep 17 00:00:00 2001 From: kinsaurralde Date: Wed, 1 Oct 2025 22:49:49 +0000 Subject: [PATCH 1/4] Add integration test to check that requests with large message sizes that are under the limit succeed --- .../spanner/integration_test.go | 14 +++++ .../spanner/spanner_insert_large_data.go | 55 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 spanner/spanner_snippets/spanner/spanner_insert_large_data.go diff --git a/spanner/spanner_snippets/spanner/integration_test.go b/spanner/spanner_snippets/spanner/integration_test.go index 76d17bcb40..36c486b945 100644 --- a/spanner/spanner_snippets/spanner/integration_test.go +++ b/spanner/spanner_snippets/spanner/integration_test.go @@ -1332,6 +1332,20 @@ func TestAddSplitPointsSample(t *testing.T) { assertContains(t, out, "Added split points") } +func TestTxWithLargeMessageSize(t *testing.T) { + _ = testutil.SystemTest(t) + t.Parallel() + + _, dbName, cleanup := initTest(t, randomID()) + defer cleanup() + + log.Printf("Starting TestTxWithLargeMessageSize: dbName: %s\n", dbName) + + mustRunSample(t, createDatabase, dbName, "failed to create a database") + + runSample(t, writeLargeData, dbName, "failed to write large data") +} + func maybeCreateKey(projectId, locationId, keyRingId, keyId string) error { client, err := kms.NewKeyManagementClient(context.Background()) if err != nil { diff --git a/spanner/spanner_snippets/spanner/spanner_insert_large_data.go b/spanner/spanner_snippets/spanner/spanner_insert_large_data.go new file mode 100644 index 0000000000..80b923c3f3 --- /dev/null +++ b/spanner/spanner_snippets/spanner/spanner_insert_large_data.go @@ -0,0 +1,55 @@ +// Copyright 2025 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package spanner + +// [START spanner_insert_large_data] + +import ( + "context" + "io" + "math/rand" + "time" + + "cloud.google.com/go/spanner" +) + +func writeLargeData(w io.Writer, db string) error { + ctx := context.Background() + ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second) + defer cancel() + client, err := spanner.NewClient(ctx, db) + if err != nil { + return err + } + defer client.Close() + + singerColumns := []string{"SingerId", "FirstName", "LastName", "SingerInfo"} + token := make([]byte, 10000000) + rand.Read(token) + // Mution is under the 100MB limit + m := []*spanner.Mutation{ + spanner.InsertOrUpdate("Singers", singerColumns, []interface{}{1, "Marc", "Richards", token}), + spanner.InsertOrUpdate("Singers", singerColumns, []interface{}{2, "Catalina", "Smith", token}), + spanner.InsertOrUpdate("Singers", singerColumns, []interface{}{3, "Alice", "Trentor", token}), + spanner.InsertOrUpdate("Singers", singerColumns, []interface{}{4, "Lea", "Martin", token}), + spanner.InsertOrUpdate("Singers", singerColumns, []interface{}{5, "David", "Lomond", token}), + spanner.InsertOrUpdate("Singers", singerColumns, []interface{}{6, "Marc", "Richards", token}), + spanner.InsertOrUpdate("Singers", singerColumns, []interface{}{7, "Catalina", "Smith", token}), + } + _, err = client.Apply(ctx, m) + return err +} + +// [END spanner_insert_large_data] From bbc77edea4a306c21cdebd32659d938f05cd3040 Mon Sep 17 00:00:00 2001 From: kinsaurralde Date: Wed, 1 Oct 2025 23:04:04 +0000 Subject: [PATCH 2/4] Remove debugging log --- spanner/spanner_snippets/spanner/integration_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/spanner/spanner_snippets/spanner/integration_test.go b/spanner/spanner_snippets/spanner/integration_test.go index 36c486b945..dc92c7852d 100644 --- a/spanner/spanner_snippets/spanner/integration_test.go +++ b/spanner/spanner_snippets/spanner/integration_test.go @@ -1339,10 +1339,7 @@ func TestTxWithLargeMessageSize(t *testing.T) { _, dbName, cleanup := initTest(t, randomID()) defer cleanup() - log.Printf("Starting TestTxWithLargeMessageSize: dbName: %s\n", dbName) - mustRunSample(t, createDatabase, dbName, "failed to create a database") - runSample(t, writeLargeData, dbName, "failed to write large data") } From 59f652c7b86659e121180affbcaefef4115bc2f6 Mon Sep 17 00:00:00 2001 From: kinsaurralde Date: Fri, 3 Oct 2025 22:30:45 +0000 Subject: [PATCH 3/4] Apply gemini suggested code review * Remove redunant ctx initialization * Fix comment typo * Replace "math/rand" with "crypto/rand" --- .../spanner/spanner_insert_large_data.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spanner/spanner_snippets/spanner/spanner_insert_large_data.go b/spanner/spanner_snippets/spanner/spanner_insert_large_data.go index 80b923c3f3..7796f1894d 100644 --- a/spanner/spanner_snippets/spanner/spanner_insert_large_data.go +++ b/spanner/spanner_snippets/spanner/spanner_insert_large_data.go @@ -19,14 +19,13 @@ package spanner import ( "context" "io" - "math/rand" + "crypto/rand" "time" "cloud.google.com/go/spanner" ) func writeLargeData(w io.Writer, db string) error { - ctx := context.Background() ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second) defer cancel() client, err := spanner.NewClient(ctx, db) @@ -37,8 +36,10 @@ func writeLargeData(w io.Writer, db string) error { singerColumns := []string{"SingerId", "FirstName", "LastName", "SingerInfo"} token := make([]byte, 10000000) - rand.Read(token) - // Mution is under the 100MB limit + if _, err := rand.Read(token); err != nil { + return err + } + // Mutation is under the 100MB limit m := []*spanner.Mutation{ spanner.InsertOrUpdate("Singers", singerColumns, []interface{}{1, "Marc", "Richards", token}), spanner.InsertOrUpdate("Singers", singerColumns, []interface{}{2, "Catalina", "Smith", token}), From 5c2a9f8654764ade620ed55b6c0930bc54408a1e Mon Sep 17 00:00:00 2001 From: kinsaurralde Date: Mon, 6 Oct 2025 16:47:26 +0000 Subject: [PATCH 4/4] formatting fixes --- spanner/spanner_snippets/spanner/spanner_insert_large_data.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spanner/spanner_snippets/spanner/spanner_insert_large_data.go b/spanner/spanner_snippets/spanner/spanner_insert_large_data.go index 7796f1894d..4625a6cff5 100644 --- a/spanner/spanner_snippets/spanner/spanner_insert_large_data.go +++ b/spanner/spanner_snippets/spanner/spanner_insert_large_data.go @@ -18,8 +18,8 @@ package spanner import ( "context" - "io" "crypto/rand" + "io" "time" "cloud.google.com/go/spanner"