Merge branch 'main' into test-xdist-experimentation

Author: chalmerlowe

.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-07
+  digest: sha256:a7aef70df5f13313ddc027409fc8f3151422ec2a57ac8730fce8fa75c060d5bb
+# created: 2025-04-10T17:00:10.042601326Z

google/cloud/bigquery/_job_helpers.py

@@ -564,6 +564,7 @@ def _supported_by_jobs_query(request_body: Dict[str, Any]) -> bool:
         "maximumBytesBilled",
         "requestId",
         "createSession",
+        "writeIncrementalResults",
     }
 
     unsupported_keys = request_keys - keys_allowlist

google/cloud/bigquery/job/query.py

@@ -674,6 +674,21 @@ def write_disposition(self):
     def write_disposition(self, value):
         self._set_sub_prop("writeDisposition", value)
 
+    @property
+    def write_incremental_results(self) -> Optional[bool]:
+        """This is only supported for a SELECT query using a temporary table.
+
+        If set, the query is allowed to write results incrementally to the temporary result
+        table. This may incur a performance penalty. This option cannot be used with Legacy SQL.
+
+        This feature is not generally available.
+        """
+        return self._get_sub_prop("writeIncrementalResults")
+
+    @write_incremental_results.setter
+    def write_incremental_results(self, value):
+        self._set_sub_prop("writeIncrementalResults", value)
+
     @property
     def table_definitions(self):
         """Dict[str, google.cloud.bigquery.external_config.ExternalConfig]:

google/cloud/bigquery/table.py

@@ -1873,6 +1873,11 @@ def total_bytes_processed(self) -> Optional[int]:
         """total bytes processed from job statistics, if present."""
         return self._total_bytes_processed
 
+    @property
+    def page_size(self) -> Optional[int]:
+        """The maximum number of rows in each page of results from this request, if present."""
+        return self._page_size
+
     def _is_almost_completely_cached(self):
         """Check if all results are completely cached.
 
@@ -1924,7 +1929,7 @@ def _should_use_bqstorage(self, bqstorage_client, create_bqstorage_client):
         if self._is_almost_completely_cached():
             return False
 
-        if self.max_results is not None:
+        if self.max_results is not None or self.page_size is not None:
             return False
 
         try:
@@ -1994,7 +1999,9 @@ def _maybe_warn_max_results(
             bqstorage_client:
                 The BigQuery Storage client intended to use for downloading result rows.
         """
-        if bqstorage_client is not None and self.max_results is not None:
+        if bqstorage_client is not None and (
+            self.max_results is not None or self.page_size is not None
+        ):
             warnings.warn(
                 "Cannot use bqstorage_client if max_results is set, "
                 "reverting to fetching data with the REST endpoint.",

owlbot.py

@@ -130,14 +130,6 @@
     'ALL_VERSIONS = ["3.9", "3.10", "3.11", "3.12", "3.13"]',
 )
 
-
-# ----------------------------------------------------------------------------
-# pytype-related changes
-# ----------------------------------------------------------------------------
-
-# Add .pytype to .gitignore
-s.replace(".gitignore", r"\.pytest_cache", "\\g<0>\n.pytype")
-
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)
 for noxfile in REPO_ROOT.glob("samples/**/noxfile.py"):
     s.shell.run(["nox", "-s", "blacken"], cwd=noxfile.parent, hide_output=False)

samples/geography/requirements.txt

@@ -34,8 +34,9 @@ pytz==2025.2
 PyYAML==6.0.2
 requests==2.32.3
 rsa==4.9
-Shapely==2.0.7
+Shapely===2.0.7; python_version == '3.9'
+Shapely==2.1.0; python_version >= '3.10'
 six==1.17.0
-typing-extensions==4.13.0
+typing-extensions==4.13.1
 typing-inspect==0.9.0
 urllib3==2.3.0

tests/unit/job/test_query_config.py

@@ -167,6 +167,11 @@ def test_connection_properties(self):
         self.assertEqual(config.connection_properties[1].key, "time_zone")
         self.assertEqual(config.connection_properties[1].value, "America/Chicago")
 
+    def test_incremental_results(self):
+        config = self._get_target_class()()
+        config.write_incremental_results = True
+        self.assertEqual(config.write_incremental_results, True)
+
     def test_create_session(self):
         config = self._get_target_class()()
         self.assertIsNone(config.create_session)

tests/unit/test__job_helpers.py

@@ -194,6 +194,13 @@ def make_query_response(
             make_query_request({"maximumBytesBilled": "987654"}),
             id="job_config-with-maximum_bytes_billed",
         ),
+        pytest.param(
+            job_query.QueryJobConfig(
+                write_incremental_results=True,
+            ),
+            make_query_request({"writeIncrementalResults": True}),
+            id="job_config-with-incremental-results",
+        ),
     ),
 )
 def test__to_query_request(job_config, expected):
@@ -1141,6 +1148,11 @@ def test_make_job_id_w_job_id_overrides_prefix():
             False,
             id="priority=BATCH",
         ),
+        pytest.param(
+            job_query.QueryJobConfig(write_incremental_results=True),
+            True,
+            id="write_incremental_results",
+        ),
     ),
 )
 def test_supported_by_jobs_query_from_queryjobconfig(

tests/unit/test_dbapi_cursor.py

@@ -161,6 +161,7 @@ def _mock_rows(
             mock_rows,
         )
         mock_rows.max_results = None
+        mock_rows.page_size = None
         type(mock_rows).job_id = mock.PropertyMock(return_value="test-job-id")
         type(mock_rows).location = mock.PropertyMock(return_value="test-location")
         type(mock_rows).num_dml_affected_rows = mock.PropertyMock(

tests/unit/test_table.py

@@ -2693,6 +2693,13 @@ def test__should_use_bqstorage_returns_false_if_max_results_set(self):
         )
         self.assertFalse(result)
 
+    def test__should_use_bqstorage_returns_false_if_page_size_set(self):
+        iterator = self._make_one(page_size=10, first_page_response=None)  # not cached
+        result = iterator._should_use_bqstorage(
+            bqstorage_client=None, create_bqstorage_client=True
+        )
+        self.assertFalse(result)
+
     def test__should_use_bqstorage_returns_false_w_warning_if_missing_dependency(self):
         iterator = self._make_one(first_page_response=None)  # not cached