Merge branch 'main' into splits

Author: harshachinta

.github/.OwlBot.lock.yaml

@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:5581906b957284864632cde4e9c51d1cc66b0094990b27e689132fe5cd036046
-# created: 2025-03-05
+  digest: sha256:25de45b58e52021d3a24a6273964371a97a4efeefe6ad3845a64e697c63b6447
+# created: 2025-04-14T14:34:43.260858345Z

google/cloud/spanner_dbapi/client_side_statement_executor.py

@@ -11,7 +11,8 @@
 # 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.
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Union
+from google.cloud.spanner_v1 import TransactionOptions
 
 if TYPE_CHECKING:
     from google.cloud.spanner_dbapi.cursor import Cursor
@@ -58,7 +59,7 @@ def execute(cursor: "Cursor", parsed_statement: ParsedStatement):
         connection.commit()
         return None
     if statement_type == ClientSideStatementType.BEGIN:
-        connection.begin()
+        connection.begin(isolation_level=_get_isolation_level(parsed_statement))
         return None
     if statement_type == ClientSideStatementType.ROLLBACK:
         connection.rollback()
@@ -121,3 +122,19 @@ def _get_streamed_result_set(column_name, type_code, column_values):
             column_values_pb.append(_make_value_pb(column_value))
         result_set.values.extend(column_values_pb)
     return StreamedResultSet(iter([result_set]))
+
+
+def _get_isolation_level(
+    statement: ParsedStatement,
+) -> Union[TransactionOptions.IsolationLevel, None]:
+    if (
+        statement.client_side_statement_params is None
+        or len(statement.client_side_statement_params) == 0
+    ):
+        return None
+    level = statement.client_side_statement_params[0]
+    if not isinstance(level, str) or level == "":
+        return None
+    # Replace (duplicate) whitespaces in the string with an underscore.
+    level = "_".join(level.split()).upper()
+    return TransactionOptions.IsolationLevel[level]

google/cloud/spanner_dbapi/client_side_statement_parser.py

@@ -21,7 +21,10 @@
     Statement,
 )
 
-RE_BEGIN = re.compile(r"^\s*(BEGIN|START)(\s+TRANSACTION)?\s*$", re.IGNORECASE)
+RE_BEGIN = re.compile(
+    r"^\s*(?:BEGIN|START)(?:\s+TRANSACTION)?(?:\s+ISOLATION\s+LEVEL\s+(REPEATABLE\s+READ|SERIALIZABLE))?\s*$",
+    re.IGNORECASE,
+)
 RE_COMMIT = re.compile(r"^\s*(COMMIT)(\s+TRANSACTION)?\s*$", re.IGNORECASE)
 RE_ROLLBACK = re.compile(r"^\s*(ROLLBACK)(\s+TRANSACTION)?\s*$", re.IGNORECASE)
 RE_SHOW_COMMIT_TIMESTAMP = re.compile(
@@ -68,6 +71,10 @@ def parse_stmt(query):
     elif RE_START_BATCH_DML.match(query):
         client_side_statement_type = ClientSideStatementType.START_BATCH_DML
     elif RE_BEGIN.match(query):
+        match = re.search(RE_BEGIN, query)
+        isolation_level = match.group(1)
+        if isolation_level is not None:
+            client_side_statement_params.append(isolation_level)
         client_side_statement_type = ClientSideStatementType.BEGIN
     elif RE_RUN_BATCH.match(query):
         client_side_statement_type = ClientSideStatementType.RUN_BATCH

owlbot.py

@@ -85,6 +85,7 @@ def get_staging_dirs(
         excludes=[
             "google/cloud/spanner/**",
             "*.*",
+            "noxfile.py",
             "docs/index.rst",
             "google/cloud/spanner_v1/__init__.py",
             "**/gapic_version.py",
@@ -102,7 +103,7 @@ def get_staging_dirs(
     )
     s.move(
         library,
-        excludes=["google/cloud/spanner_admin_instance/**", "*.*", "docs/index.rst", "**/gapic_version.py", "testing/constraints-3.7.txt",],
+        excludes=["google/cloud/spanner_admin_instance/**", "*.*", "docs/index.rst", "noxfile.py", "**/gapic_version.py", "testing/constraints-3.7.txt",],
     )
 
 for library in get_staging_dirs(
@@ -115,7 +116,7 @@ def get_staging_dirs(
     )
     s.move(
         library,
-        excludes=["google/cloud/spanner_admin_database/**", "*.*", "docs/index.rst", "**/gapic_version.py", "testing/constraints-3.7.txt",],
+        excludes=["google/cloud/spanner_admin_database/**", "*.*", "docs/index.rst", "noxfile.py", "**/gapic_version.py", "testing/constraints-3.7.txt",],
     )
 
 s.remove_staging_dirs()
@@ -161,219 +162,4 @@ def get_staging_dirs(
 
 python.py_samples()
 
-# ----------------------------------------------------------------------------
-# Customize noxfile.py
-# ----------------------------------------------------------------------------
-
-
-def place_before(path, text, *before_text, escape=None):
-    replacement = "\n".join(before_text) + "\n" + text
-    if escape:
-        for c in escape:
-            text = text.replace(c, "\\" + c)
-    s.replace([path], text, replacement)
-
-
-open_telemetry_test = """
-    # XXX Work around Kokoro image's older pip, which borks the OT install.
-    session.run("pip", "install", "--upgrade", "pip")
-    constraints_path = str(
-        CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
-    )
-    session.install("-e", ".[tracing]", "-c", constraints_path)
-    # XXX: Dump installed versions to debug OT issue
-    session.run("pip", "list")
-
-    # Run py.test against the unit tests with OpenTelemetry.
-    session.run(
-        "py.test",
-        "--quiet",
-        "--cov=google.cloud.spanner",
-        "--cov=google.cloud",
-        "--cov=tests.unit",
-        "--cov-append",
-        "--cov-config=.coveragerc",
-        "--cov-report=",
-        "--cov-fail-under=0",
-        os.path.join("tests", "unit"),
-        *session.posargs,
-    )
-"""
-
-place_before(
-    "noxfile.py",
-    "@nox.session(python=UNIT_TEST_PYTHON_VERSIONS)",
-    open_telemetry_test,
-    escape="()",
-)
-
-skip_tests_if_env_var_not_set = """# Sanity check: Only run tests if the environment variable is set.
-    if not os.environ.get("GOOGLE_APPLICATION_CREDENTIALS", "") and not os.environ.get(
-        "SPANNER_EMULATOR_HOST", ""
-    ):
-        session.skip(
-            "Credentials or emulator host must be set via environment variable"
-        )
-    # If POSTGRESQL tests and Emulator, skip the tests
-    if os.environ.get("SPANNER_EMULATOR_HOST") and database_dialect == "POSTGRESQL":
-        session.skip("Postgresql is not supported by Emulator yet.")
-"""
-
-place_before(
-    "noxfile.py",
-    "# Install pyopenssl for mTLS testing.",
-    skip_tests_if_env_var_not_set,
-    escape="()",
-)
-
-s.replace(
-    "noxfile.py",
-    r"""session.install\("-e", "."\)""",
-    """session.install("-e", ".[tracing]")""",
-)
-
-# Apply manual changes from PR https://github.com/googleapis/python-spanner/pull/759
-s.replace(
-    "noxfile.py",
-    """@nox.session\(python=SYSTEM_TEST_PYTHON_VERSIONS\)
-def system\(session\):""",
-    """@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
-@nox.parametrize(
-    "protobuf_implementation,database_dialect",
-    [
-        ("python", "GOOGLE_STANDARD_SQL"),
-        ("python", "POSTGRESQL"),
-        ("upb", "GOOGLE_STANDARD_SQL"),
-        ("upb", "POSTGRESQL"),
-        ("cpp", "GOOGLE_STANDARD_SQL"),
-        ("cpp", "POSTGRESQL"),
-    ],
-)
-def system(session, protobuf_implementation, database_dialect):""",
-)
-
-s.replace(
-    "noxfile.py",
-    """\*session.posargs,
-        \)""",
-    """*session.posargs,
-            env={
-                "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
-                "SPANNER_DATABASE_DIALECT": database_dialect,
-                "SKIP_BACKUP_TESTS": "true",
-            },
-        )""",
-)
-
-s.replace("noxfile.py",
-    """env={
-                "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
-            },""",
-    """env={
-                "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
-                "SPANNER_DATABASE_DIALECT": database_dialect,
-                "SKIP_BACKUP_TESTS": "true",
-            },""",
-)
-
-s.replace("noxfile.py",
-"""session.run\(
-        "py.test",
-        "tests/unit",
-        env={
-            "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
-        },
-    \)""",
-"""session.run(
-        "py.test",
-        "tests/unit",
-        env={
-            "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
-            "SPANNER_DATABASE_DIALECT": database_dialect,
-            "SKIP_BACKUP_TESTS": "true",
-        },
-    )""",
-)
-
-s.replace(
-    "noxfile.py",
-    """\@nox.session\(python="3.13"\)
-\@nox.parametrize\(
-    "protobuf_implementation",
-    \[ "python", "upb", "cpp" \],
-\)
-def prerelease_deps\(session, protobuf_implementation\):""",
-    """@nox.session(python="3.13")
-@nox.parametrize(
-    "protobuf_implementation,database_dialect",
-    [
-        ("python", "GOOGLE_STANDARD_SQL"),
-        ("python", "POSTGRESQL"),
-        ("upb", "GOOGLE_STANDARD_SQL"),
-        ("upb", "POSTGRESQL"),
-        ("cpp", "GOOGLE_STANDARD_SQL"),
-        ("cpp", "POSTGRESQL"),
-    ],
-)
-def prerelease_deps(session, protobuf_implementation, database_dialect):""",
-)
-
-
-mockserver_test = """
-@nox.session(python=DEFAULT_MOCK_SERVER_TESTS_PYTHON_VERSION)
-def mockserver(session):
-    # Install all test dependencies, then install this package in-place.
-
-    constraints_path = str(
-        CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
-    )
-    # install_unittest_dependencies(session, "-c", constraints_path)
-    standard_deps = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_DEPENDENCIES
-    session.install(*standard_deps, "-c", constraints_path)
-    session.install("-e", ".", "-c", constraints_path)
-
-    # Run py.test against the mockserver tests.
-    session.run(
-        "py.test",
-        "--quiet",
-        f"--junitxml=unit_{session.python}_sponge_log.xml",
-        "--cov=google",
-        "--cov=tests/unit",
-        "--cov-append",
-        "--cov-config=.coveragerc",
-        "--cov-report=",
-        "--cov-fail-under=0",
-        os.path.join("tests", "mockserver_tests"),
-        *session.posargs,
-    )
-
-"""
-
-place_before(
-    "noxfile.py",
-    "def install_systemtest_dependencies(session, *constraints):",
-    mockserver_test,
-    escape="()_*:",
-)
-
-s.replace(
-    "noxfile.py",
-    "install_systemtest_dependencies\(session, \"-c\", constraints_path\)",
-    """install_systemtest_dependencies(session, "-c", constraints_path)
-
-    # TODO(https://github.com/googleapis/synthtool/issues/1976):
-    # Remove the 'cpp' implementation once support for Protobuf 3.x is dropped.
-    # The 'cpp' implementation requires Protobuf<4.
-    if protobuf_implementation == "cpp":
-        session.install("protobuf<4")
-"""
-)
-
-place_before(
-    "noxfile.py",
-    "UNIT_TEST_PYTHON_VERSIONS: List[str] = [",
-    'DEFAULT_MOCK_SERVER_TESTS_PYTHON_VERSION = "3.12"',
-    escape="[]",
-)
-
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)

tests/mockserver_tests/test_dbapi_isolation_level.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from google.api_core.exceptions import Unknown
 from google.cloud.spanner_dbapi import Connection
 from google.cloud.spanner_v1 import (
     BeginTransactionRequest,
@@ -117,3 +118,33 @@ def test_transaction_isolation_level(self):
             self.assertEqual(1, len(begin_requests))
             self.assertEqual(begin_requests[0].options.isolation_level, level)
             MockServerTestBase.spanner_service.clear_requests()
+
+    def test_begin_isolation_level(self):
+        connection = Connection(self.instance, self.database)
+        for level in [
+            TransactionOptions.IsolationLevel.REPEATABLE_READ,
+            TransactionOptions.IsolationLevel.SERIALIZABLE,
+        ]:
+            isolation_level_name = level.name.replace("_", " ")
+            with connection.cursor() as cursor:
+                cursor.execute(f"begin isolation level {isolation_level_name}")
+                cursor.execute(
+                    "insert into singers (id, name) values (1, 'Some Singer')"
+                )
+                self.assertEqual(1, cursor.rowcount)
+            connection.commit()
+            begin_requests = list(
+                filter(
+                    lambda msg: isinstance(msg, BeginTransactionRequest),
+                    self.spanner_service.requests,
+                )
+            )
+            self.assertEqual(1, len(begin_requests))
+            self.assertEqual(begin_requests[0].options.isolation_level, level)
+            MockServerTestBase.spanner_service.clear_requests()
+
+    def test_begin_invalid_isolation_level(self):
+        connection = Connection(self.instance, self.database)
+        with connection.cursor() as cursor:
+            with self.assertRaises(Unknown):
+                cursor.execute("begin isolation level does_not_exist")