Skip to content
This repository was archived by the owner on Mar 31, 2026. It is now read-only.

Commit d513594

Browse files
odeke-emodeke-em
committed
Finished retrofit and all tests passing
1 parent 1dfd134 commit d513594

File tree

7 files changed

+113
-96
lines changed

7 files changed

+113
-96
lines changed

‎google/cloud/spanner_v1/database.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
from google.cloud.spanner_v1 import SpannerClient
5252
from google.cloud.spanner_v1._helpers import _merge_query_options
5353
from google.cloud.spanner_v1._helpers import (
54-
AtomicCounter,
5554
_metadata_with_prefix,
5655
_metadata_with_leader_aware_routing,
5756
_metadata_with_request_id,

‎google/cloud/spanner_v1/snapshot.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
_retry,
3939
_check_rst_stream_error,
4040
_SessionWrapper,
41-
AtomicCounter,
4241
)
4342
from google.cloud.spanner_v1._opentelemetry_tracing import trace_call
4443
from google.cloud.spanner_v1.streamed import StreamedResultSet
@@ -82,7 +81,10 @@ def _restart_on_unavailable(
8281

8382
resume_token = b""
8483
item_buffer = []
85-
next_nth_request = lambda: getattr(request_id_manager, "_next_nth_request", 0)
84+
85+
def next_nth_request():
86+
return getattr(request_id_manager, "_next_nth_request", 0)
87+
8688
nth_request = next_nth_request()
8789

8890
if transaction is not None:

‎tests/unit/test_batch.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
from google.cloud.spanner_v1._helpers import (
4141
_metadata_with_request_id,
4242
)
43-
from google.cloud.spanner_v1.request_id_header import REQ_RAND_PROCESS_ID
4443

4544
TABLE_NAME = "citizens"
4645
COLUMNS = ["email", "first_name", "last_name", "age"]

‎tests/unit/test_database.py‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ def test_exists_grpc_error(self):
773773
("google-cloud-resource-prefix", database.name),
774774
(
775775
"x-goog-spanner-request-id",
776-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
776+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.{database._channel_id}.1.1",
777777
),
778778
],
779779
)
@@ -796,7 +796,7 @@ def test_exists_not_found(self):
796796
("google-cloud-resource-prefix", database.name),
797797
(
798798
"x-goog-spanner-request-id",
799-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
799+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.{database._channel_id}.1.1",
800800
),
801801
],
802802
)
@@ -821,7 +821,7 @@ def test_exists_success(self):
821821
("google-cloud-resource-prefix", database.name),
822822
(
823823
"x-goog-spanner-request-id",
824-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
824+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.{database._channel_id}.1.1",
825825
),
826826
],
827827
)
@@ -845,7 +845,7 @@ def test_reload_grpc_error(self):
845845
("google-cloud-resource-prefix", database.name),
846846
(
847847
"x-goog-spanner-request-id",
848-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
848+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.{database._channel_id}.1.1",
849849
),
850850
],
851851
)
@@ -869,7 +869,7 @@ def test_reload_not_found(self):
869869
("google-cloud-resource-prefix", database.name),
870870
(
871871
"x-goog-spanner-request-id",
872-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
872+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.{database._channel_id}.1.1",
873873
),
874874
],
875875
)
@@ -1358,10 +1358,6 @@ def _execute_partitioned_dml_helper(
13581358
request_options=expected_request_options,
13591359
)
13601360

1361-
print("expected_request", expected_request)
1362-
print(
1363-
"\033[34marg_list", api.execute_streaming_sql.call_args_list, "\033[00m"
1364-
)
13651361
self.assertEqual(
13661362
api.execute_streaming_sql.call_args_list,
13671363
[

‎tests/unit/test_session.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,10 @@ def test_create_ok(self):
330330
metadata=[
331331
("google-cloud-resource-prefix", database.name),
332332
("x-goog-spanner-route-to-leader", "true"),
333+
(
334+
"x-goog-spanner-request-id",
335+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.{database._channel_id}.1.1",
336+
),
333337
],
334338
)
335339

@@ -360,6 +364,10 @@ def test_create_w_labels(self):
360364
metadata=[
361365
("google-cloud-resource-prefix", database.name),
362366
("x-goog-spanner-route-to-leader", "true"),
367+
(
368+
"x-goog-spanner-request-id",
369+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.{database._channel_id}.1.1",
370+
),
363371
],
364372
)
365373

‎tests/unit/test_snapshot.py‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def test_iteration_w_empty_raw(self):
165165
metadata=[
166166
(
167167
"x-goog-spanner-request-id",
168-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
168+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.1.1",
169169
)
170170
],
171171
)
@@ -187,7 +187,7 @@ def test_iteration_w_non_empty_raw(self):
187187
metadata=[
188188
(
189189
"x-goog-spanner-request-id",
190-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
190+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.1.1",
191191
)
192192
],
193193
)
@@ -214,7 +214,7 @@ def test_iteration_w_raw_w_resume_tken(self):
214214
metadata=[
215215
(
216216
"x-goog-spanner-request-id",
217-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
217+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.1.1",
218218
)
219219
],
220220
)
@@ -293,7 +293,7 @@ def test_iteration_w_raw_raising_non_retryable_internal_error_no_token(self):
293293
metadata=[
294294
(
295295
"x-goog-spanner-request-id",
296-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
296+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.1.1",
297297
)
298298
],
299299
)
@@ -371,7 +371,7 @@ def test_iteration_w_raw_raising_non_retryable_internal_error(self):
371371
metadata=[
372372
(
373373
"x-goog-spanner-request-id",
374-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
374+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.1.1",
375375
)
376376
],
377377
)
@@ -550,7 +550,7 @@ def test_iteration_w_raw_raising_non_retryable_internal_error_after_token(self):
550550
metadata=[
551551
(
552552
"x-goog-spanner-request-id",
553-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
553+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.1.1",
554554
)
555555
],
556556
)
@@ -834,7 +834,7 @@ def _read_helper(
834834
("google-cloud-resource-prefix", database.name),
835835
(
836836
"x-goog-spanner-request-id",
837-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.{database._channel_id}.0.1",
837+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.{database._channel_id}.1.1",
838838
),
839839
],
840840
retry=retry,
@@ -1089,7 +1089,7 @@ def _execute_sql_helper(
10891089
("google-cloud-resource-prefix", database.name),
10901090
(
10911091
"x-goog-spanner-request-id",
1092-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
1092+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.1.1",
10931093
),
10941094
],
10951095
timeout=timeout,
@@ -1266,7 +1266,7 @@ def _partition_read_helper(
12661266
("x-goog-spanner-route-to-leader", "true"),
12671267
(
12681268
"x-goog-spanner-request-id",
1269-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
1269+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.1.1",
12701270
),
12711271
],
12721272
retry=retry,
@@ -1449,7 +1449,7 @@ def _partition_query_helper(
14491449
("x-goog-spanner-route-to-leader", "true"),
14501450
(
14511451
"x-goog-spanner-request-id",
1452-
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.0.1",
1452+
f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.1.1",
14531453
),
14541454
],
14551455
retry=retry,
@@ -1920,6 +1920,7 @@ def __init__(self):
19201920
class _Database(object):
19211921
def __init__(self, directed_read_options=None):
19221922
self.name = "testing"
1923+
self._nth_request = 0
19231924
self._instance = _Instance()
19241925
self._route_to_leader_enabled = True
19251926
self._directed_read_options = directed_read_options

0 commit comments

Comments
 (0)