Visitar URL original
chore: revert sync client customizations (#1009) · googleapis/python-bigtable@abe67c4 · GitHub
Skip to content
This repository was archived by the owner on Aug 30, 2026. It is now read-only.

Commit abe67c4

Browse files
daniel-sanchedaniel-sanche
authored
chore: revert sync client customizations (#1009)
1 parent f029a24 commit abe67c4

2 files changed

Lines changed: 35 additions & 39 deletions

File tree

‎google/cloud/bigtable_v2/services/bigtable/client.py‎

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -817,9 +817,9 @@ def read_rows(
817817
)
818818

819819
if header_params:
820-
metadata = tuple(metadata)
821-
if all(m[0] != gapic_v1.routing_header.ROUTING_METADATA_KEY for m in metadata):
822-
metadata += (gapic_v1.routing_header.to_grpc_metadata(header_params),)
820+
metadata = tuple(metadata) + (
821+
gapic_v1.routing_header.to_grpc_metadata(header_params),
822+
)
823823

824824
# Validate the universe domain.
825825
self._validate_universe_domain()
@@ -933,9 +933,9 @@ def sample_row_keys(
933933
)
934934

935935
if header_params:
936-
metadata = tuple(metadata)
937-
if all(m[0] != gapic_v1.routing_header.ROUTING_METADATA_KEY for m in metadata):
938-
metadata += (gapic_v1.routing_header.to_grpc_metadata(header_params),)
936+
metadata = tuple(metadata) + (
937+
gapic_v1.routing_header.to_grpc_metadata(header_params),
938+
)
939939

940940
# Validate the universe domain.
941941
self._validate_universe_domain()
@@ -1070,9 +1070,9 @@ def mutate_row(
10701070
)
10711071

10721072
if header_params:
1073-
metadata = tuple(metadata)
1074-
if all(m[0] != gapic_v1.routing_header.ROUTING_METADATA_KEY for m in metadata):
1075-
metadata += (gapic_v1.routing_header.to_grpc_metadata(header_params),)
1073+
metadata = tuple(metadata) + (
1074+
gapic_v1.routing_header.to_grpc_metadata(header_params),
1075+
)
10761076

10771077
# Validate the universe domain.
10781078
self._validate_universe_domain()
@@ -1201,9 +1201,9 @@ def mutate_rows(
12011201
)
12021202

12031203
if header_params:
1204-
metadata = tuple(metadata)
1205-
if all(m[0] != gapic_v1.routing_header.ROUTING_METADATA_KEY for m in metadata):
1206-
metadata += (gapic_v1.routing_header.to_grpc_metadata(header_params),)
1204+
metadata = tuple(metadata) + (
1205+
gapic_v1.routing_header.to_grpc_metadata(header_params),
1206+
)
12071207

12081208
# Validate the universe domain.
12091209
self._validate_universe_domain()
@@ -1375,9 +1375,9 @@ def check_and_mutate_row(
13751375
)
13761376

13771377
if header_params:
1378-
metadata = tuple(metadata)
1379-
if all(m[0] != gapic_v1.routing_header.ROUTING_METADATA_KEY for m in metadata):
1380-
metadata += (gapic_v1.routing_header.to_grpc_metadata(header_params),)
1378+
metadata = tuple(metadata) + (
1379+
gapic_v1.routing_header.to_grpc_metadata(header_params),
1380+
)
13811381

13821382
# Validate the universe domain.
13831383
self._validate_universe_domain()
@@ -1477,9 +1477,9 @@ def ping_and_warm(
14771477
header_params["app_profile_id"] = request.app_profile_id
14781478

14791479
if header_params:
1480-
metadata = tuple(metadata)
1481-
if all(m[0] != gapic_v1.routing_header.ROUTING_METADATA_KEY for m in metadata):
1482-
metadata += (gapic_v1.routing_header.to_grpc_metadata(header_params),)
1480+
metadata = tuple(metadata) + (
1481+
gapic_v1.routing_header.to_grpc_metadata(header_params),
1482+
)
14831483

14841484
# Validate the universe domain.
14851485
self._validate_universe_domain()
@@ -1620,9 +1620,9 @@ def read_modify_write_row(
16201620
)
16211621

16221622
if header_params:
1623-
metadata = tuple(metadata)
1624-
if all(m[0] != gapic_v1.routing_header.ROUTING_METADATA_KEY for m in metadata):
1625-
metadata += (gapic_v1.routing_header.to_grpc_metadata(header_params),)
1623+
metadata = tuple(metadata) + (
1624+
gapic_v1.routing_header.to_grpc_metadata(header_params),
1625+
)
16261626

16271627
# Validate the universe domain.
16281628
self._validate_universe_domain()
@@ -1725,13 +1725,11 @@ def generate_initial_change_stream_partitions(
17251725

17261726
# Certain fields should be provided within the metadata header;
17271727
# add these here.
1728-
metadata = tuple(metadata)
1729-
if all(m[0] != gapic_v1.routing_header.ROUTING_METADATA_KEY for m in metadata):
1730-
metadata += (
1731-
gapic_v1.routing_header.to_grpc_metadata(
1732-
(("table_name", request.table_name),)
1733-
),
1734-
)
1728+
metadata = tuple(metadata) + (
1729+
gapic_v1.routing_header.to_grpc_metadata(
1730+
(("table_name", request.table_name),)
1731+
),
1732+
)
17351733

17361734
# Validate the universe domain.
17371735
self._validate_universe_domain()
@@ -1826,13 +1824,11 @@ def read_change_stream(
18261824

18271825
# Certain fields should be provided within the metadata header;
18281826
# add these here.
1829-
metadata = tuple(metadata)
1830-
if all(m[0] != gapic_v1.routing_header.ROUTING_METADATA_KEY for m in metadata):
1831-
metadata += (
1832-
gapic_v1.routing_header.to_grpc_metadata(
1833-
(("table_name", request.table_name),)
1834-
),
1835-
)
1827+
metadata = tuple(metadata) + (
1828+
gapic_v1.routing_header.to_grpc_metadata(
1829+
(("table_name", request.table_name),)
1830+
),
1831+
)
18361832

18371833
# Validate the universe domain.
18381834
self._validate_universe_domain()
@@ -1937,9 +1933,9 @@ def execute_query(
19371933
header_params["app_profile_id"] = request.app_profile_id
19381934

19391935
if header_params:
1940-
metadata = tuple(metadata)
1941-
if all(m[0] != gapic_v1.routing_header.ROUTING_METADATA_KEY for m in metadata):
1942-
metadata += (gapic_v1.routing_header.to_grpc_metadata(header_params),)
1936+
metadata = tuple(metadata) + (
1937+
gapic_v1.routing_header.to_grpc_metadata(header_params),
1938+
)
19431939

19441940
# Validate the universe domain.
19451941
self._validate_universe_domain()

‎owlbot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def insert(file, before_line, insert_line, after_line, escape=None):
146146
# ----------------------------------------------------------------------------
147147
# Patch duplicate routing header: https://github.com/googleapis/gapic-generator-python/issues/2078
148148
# ----------------------------------------------------------------------------
149-
for file in ["client.py", "async_client.py"]:
149+
for file in ["async_client.py"]:
150150
s.replace(
151151
f"google/cloud/bigtable_v2/services/bigtable/{file}",
152152
"metadata \= tuple\(metadata\) \+ \(",

0 commit comments

Comments
 (0)