|
16 | 16 | # This file is automatically generated by CrossSync. Do not edit manually. |
17 | 17 |
|
18 | 18 | """Model a set of read-only queries to a database as a snapshot.""" |
| 19 | + |
19 | 20 | import functools |
20 | 21 | from typing import List, Optional, Union |
21 | 22 | from google.api_core import gapic_v1 |
|
49 | 50 | _augment_error_with_request_id, |
50 | 51 | _check_rst_stream_error, |
51 | 52 | _make_value_pb, |
| 53 | + _merge_client_context, |
52 | 54 | _merge_query_options, |
| 55 | + _merge_request_options, |
53 | 56 | _metadata_with_leader_aware_routing, |
54 | 57 | _metadata_with_prefix, |
55 | 58 | _SessionWrapper, |
56 | 59 | _validate_client_context, |
57 | | - _merge_client_context, |
58 | | - _merge_request_options, |
59 | 60 | ) |
60 | 61 | from google.cloud.spanner_v1._opentelemetry_tracing import add_span_event, trace_call |
61 | 62 | from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture |
@@ -118,10 +119,11 @@ def _restart_on_unavailable( |
118 | 119 | observability_options=observability_options, |
119 | 120 | metadata=metadata, |
120 | 121 | ) as span, MetricsCapture(resource_info): |
121 | | - (call_metadata, current_request_id) = ( |
122 | | - request_id_manager.metadata_and_request_id( |
123 | | - nth_request, attempt, metadata, span |
124 | | - ) |
| 122 | + ( |
| 123 | + call_metadata, |
| 124 | + current_request_id, |
| 125 | + ) = request_id_manager.metadata_and_request_id( |
| 126 | + nth_request, attempt, metadata, span |
125 | 127 | ) |
126 | 128 | iterator = CrossSync._Sync_Impl.run_if_async( |
127 | 129 | method, request=request, metadata=call_metadata |
@@ -320,7 +322,7 @@ def execute_sql( |
320 | 322 | raise ValueError("Transaction has not begun.") |
321 | 323 | if params is not None: |
322 | 324 | params_pb = Struct( |
323 | | - fields={key: _make_value_pb(value) for (key, value) in params.items()} |
| 325 | + fields={key: _make_value_pb(value) for key, value in params.items()} |
324 | 326 | ) |
325 | 327 | else: |
326 | 328 | params_pb = {} |
@@ -511,7 +513,7 @@ def partition_query( |
511 | 513 | raise ValueError("Cannot partition a single-use transaction.") |
512 | 514 | if params is not None: |
513 | 515 | params_pb = Struct( |
514 | | - fields={key: _make_value_pb(value) for (key, value) in params.items()} |
| 516 | + fields={key: _make_value_pb(value) for key, value in params.items()} |
515 | 517 | ) |
516 | 518 | else: |
517 | 519 | params_pb = Struct() |
@@ -612,7 +614,7 @@ def wrapped_method(): |
612 | 614 | begin_transaction_request = BeginTransactionRequest( |
613 | 615 | **begin_request_kwargs |
614 | 616 | ) |
615 | | - (call_metadata, error_augmenter) = database.with_error_augmentation( |
| 617 | + call_metadata, error_augmenter = database.with_error_augmentation( |
616 | 618 | nth_request, attempt.increment(), metadata, span |
617 | 619 | ) |
618 | 620 | begin_transaction_method = functools.partial( |
|
0 commit comments