Skip to content

Commit e4b0207

Browse files
committed
try to update and pin both spanner versions
1 parent 190edd0 commit e4b0207

3 files changed

Lines changed: 4 additions & 12 deletions

File tree

.github/workflows/main-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ jobs:
837837
services:
838838
spanner-emulator:
839839
# SPANNER_EMULATOR_VER (unit tests) — keep in sync with docker/docker-compose.spanner.yaml
840-
image: gcr.io/cloud-spanner-emulator/emulator:1.4.0
840+
image: gcr.io/cloud-spanner-emulator/emulator:1.5.52
841841
ports:
842842
- 9010:9010
843843
- 9020:9020

docker/docker-compose.spanner.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
services:
22
sync-db:
3-
# Getting sporadic errors in spanner.
4-
# These errors are "INTERNAL: ZETASQL_RET_CHECK failure"
5-
# in the `backend/query/query_engine.cc` file for spanner.
6-
# These result in a 500 error, which causes the test to fail.
7-
# I believe come from the SQL parser, but am not sure. I am
8-
# unable to produce these errors locally, and am using the cited
9-
# version.
103
# SPANNER_EMULATOR_VER (e2e/integration tests) — keep in sync with .github/workflows/main-workflow.yml
11-
# Pinned to 1.5.13 (not 1.4.0) to avoid sporadic "INTERNAL: ZETASQL_RET_CHECK failure" errors.
12-
image: gcr.io/cloud-spanner-emulator/emulator:1.5.13
4+
image: gcr.io/cloud-spanner-emulator/emulator:1.5.52
135
ports:
146
- "9010:9010"
157
- "9020:9020"

docs/src/introduction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,10 @@ Google supports an in-memory Spanner emulator, which can run on your local machi
357357

358358
**Updating the emulator version:** The emulator version is pinned in two places, each marked with `SPANNER_EMULATOR_VER`:
359359

360-
- `docker/docker-compose.spanner.yaml` — used for e2e/integration tests (currently pinned to a specific version to avoid ZetaSQL query engine errors; see the comment there before bumping)
360+
- `docker/docker-compose.spanner.yaml` — used for e2e/integration tests
361361
- `.github/workflows/main-workflow.yml` — used for CI unit tests
362362

363-
When upgrading, update both and verify that neither the ZetaSQL issue nor any new regressions appear in CI.
363+
Both should always be set to the same version. When upgrading, update both and verify no regressions appear in CI.
364364

365365
##### Quick Setup Using prepare-spanner.sh
366366

0 commit comments

Comments
 (0)