Skip to content

feat: remove DataClient and it's usages #15847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mpeddada1 wants to merge 2 commits into
base: prepare-for-v3.0.0
Choose a base branch
from
+249 −9,200
Draft

feat: remove DataClient and it's usages #15847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3087d97
feat: remove DataClient and it's usages
mpeddada1 Dec 24, 2025
0378315
fix Cmake
mpeddada1 Dec 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions examples/gcs2cbt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ int main(int argc, char* argv[]) try {

// Create a connection to Cloud Bigtable and an object to manipulate the
// specific table used in this demo.
cbt::Table table(cbt::MakeDataClient(options.project_id, options.instance_id),
options.table_id);
cbt::Table table(cbt::MakeDataConnection(),
cbt::TableResource(options.project_id, options.instance_id,
options.table_id));
cbt::MutationBatcher batcher(table);

// How often do we print a progress marker ('.') in the reader thread.
Expand Down
34 changes: 1 addition & 33 deletions google/cloud/bigtable/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@ add_library(
cluster_list_responses.h
column_family.h
completion_queue.h
data_client.cc
data_client.h
data_connection.cc
data_connection.h
expr.cc
Expand Down Expand Up @@ -195,16 +193,6 @@ add_library(
internal/defaults.h
internal/google_bytes_traits.cc
internal/google_bytes_traits.h
internal/legacy_async_bulk_apply.cc
internal/legacy_async_bulk_apply.h
internal/legacy_async_row_reader.cc
internal/legacy_async_row_reader.h
internal/legacy_async_row_sampler.cc
internal/legacy_async_row_sampler.h
internal/legacy_row_reader.cc
internal/legacy_row_reader.h
internal/logging_data_client.cc
internal/logging_data_client.h
internal/logging_result_set_reader.cc
internal/logging_result_set_reader.h
internal/metrics.cc
Expand Down Expand Up @@ -403,11 +391,8 @@ if (BUILD_TESTING)
testing/cleanup_stale_resources.h
testing/embedded_server_test_fixture.cc
testing/embedded_server_test_fixture.h
testing/inprocess_data_client.cc
testing/inprocess_data_client.h
testing/mock_async_failing_rpc_factory.h
testing/mock_bigtable_stub.h
testing/mock_data_client.h
testing/mock_mutate_rows_limiter.h
testing/mock_mutate_rows_reader.h
testing/mock_partial_result_set_reader.h
Expand All @@ -418,9 +403,7 @@ if (BUILD_TESTING)
testing/random_names.cc
testing/random_names.h
testing/table_integration_test.cc
testing/table_integration_test.h
testing/table_test_fixture.cc
testing/table_test_fixture.h)
testing/table_integration_test.h)
target_link_libraries(
bigtable_client_testing
PUBLIC google-cloud-cpp::bigtable
Expand Down Expand Up @@ -456,7 +439,6 @@ if (BUILD_TESTING)
client_test.cc
cluster_config_test.cc
column_family_test.cc
data_client_test.cc
data_connection_test.cc
expr_test.cc
filters_test.cc
Expand Down Expand Up @@ -485,12 +467,6 @@ if (BUILD_TESTING)
internal/default_row_reader_test.cc
internal/defaults_test.cc
internal/google_bytes_traits_test.cc
internal/legacy_async_bulk_apply_test.cc
internal/legacy_async_row_reader_test.cc
internal/legacy_async_row_sampler_test.cc
internal/legacy_bulk_mutator_test.cc
internal/legacy_row_reader_test.cc
internal/logging_data_client_test.cc
internal/logging_result_set_reader_test.cc
internal/metrics_test.cc
internal/mutate_rows_limiter_test.cc
Expand All @@ -504,7 +480,6 @@ if (BUILD_TESTING)
internal/retry_traits_test.cc
internal/traced_row_reader_test.cc
internal/tuple_utils_test.cc
legacy_table_test.cc
metadata_update_policy_test.cc
mocks/mock_row_reader_test.cc
mutation_batcher_test.cc
Expand All @@ -522,15 +497,8 @@ if (BUILD_TESTING)
rpc_retry_policy_test.cc
sql_statement_test.cc
table_admin_test.cc
table_apply_test.cc
table_bulk_apply_test.cc
table_check_and_mutate_row_test.cc
table_config_test.cc
table_readmodifywriterow_test.cc
table_readrow_test.cc
table_readrows_test.cc
table_resource_test.cc
table_sample_row_keys_test.cc
table_test.cc
testing/cleanup_stale_resources_test.cc
testing/random_names_test.cc
Expand Down
1 change: 1 addition & 0 deletions google/cloud/bigtable/benchmarks/benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "google/cloud/bigtable/admin/bigtable_table_admin_client.h"
#include "google/cloud/bigtable/benchmarks/random_mutation.h"
#include "google/cloud/bigtable/resource_names.h"
#include "google/cloud/grpc_options.h"
#include "google/cloud/internal/background_threads_impl.h"
#include "google/cloud/internal/getenv.h"
#include "google/cloud/internal/make_status.h"
Expand Down
1 change: 1 addition & 0 deletions google/cloud/bigtable/benchmarks/embedded_server_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "google/cloud/bigtable/admin/bigtable_table_admin_client.h"
#include "google/cloud/bigtable/resource_names.h"
#include "google/cloud/bigtable/table.h"
#include "google/cloud/grpc_options.h"
#include "google/cloud/testing_util/status_matchers.h"
#include <gmock/gmock.h>
#include <thread>
Expand Down
5 changes: 0 additions & 5 deletions google/cloud/bigtable/bigtable_client_testing.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
bigtable_client_testing_hdrs = [
"testing/cleanup_stale_resources.h",
"testing/embedded_server_test_fixture.h",
"testing/inprocess_data_client.h",
"testing/mock_async_failing_rpc_factory.h",
"testing/mock_bigtable_stub.h",
"testing/mock_data_client.h",
"testing/mock_mutate_rows_limiter.h",
"testing/mock_mutate_rows_reader.h",
"testing/mock_partial_result_set_reader.h",
Expand All @@ -32,14 +30,11 @@ bigtable_client_testing_hdrs = [
"testing/mock_sample_row_keys_reader.h",
"testing/random_names.h",
"testing/table_integration_test.h",
"testing/table_test_fixture.h",
]

bigtable_client_testing_srcs = [
"testing/cleanup_stale_resources.cc",
"testing/embedded_server_test_fixture.cc",
"testing/inprocess_data_client.cc",
"testing/random_names.cc",
"testing/table_integration_test.cc",
"testing/table_test_fixture.cc",
]
15 changes: 0 additions & 15 deletions google/cloud/bigtable/bigtable_client_unit_tests.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ bigtable_client_unit_tests = [
"client_test.cc",
"cluster_config_test.cc",
"column_family_test.cc",
"data_client_test.cc",
"data_connection_test.cc",
"expr_test.cc",
"filters_test.cc",
Expand Down Expand Up @@ -57,12 +56,6 @@ bigtable_client_unit_tests = [
"internal/default_row_reader_test.cc",
"internal/defaults_test.cc",
"internal/google_bytes_traits_test.cc",
"internal/legacy_async_bulk_apply_test.cc",
"internal/legacy_async_row_reader_test.cc",
"internal/legacy_async_row_sampler_test.cc",
"internal/legacy_bulk_mutator_test.cc",
"internal/legacy_row_reader_test.cc",
"internal/logging_data_client_test.cc",
"internal/logging_result_set_reader_test.cc",
"internal/metrics_test.cc",
"internal/mutate_rows_limiter_test.cc",
Expand All @@ -76,7 +69,6 @@ bigtable_client_unit_tests = [
"internal/retry_traits_test.cc",
"internal/traced_row_reader_test.cc",
"internal/tuple_utils_test.cc",
"legacy_table_test.cc",
"metadata_update_policy_test.cc",
"mocks/mock_row_reader_test.cc",
"mutation_batcher_test.cc",
Expand All @@ -94,15 +86,8 @@ bigtable_client_unit_tests = [
"rpc_retry_policy_test.cc",
"sql_statement_test.cc",
"table_admin_test.cc",
"table_apply_test.cc",
"table_bulk_apply_test.cc",
"table_check_and_mutate_row_test.cc",
"table_config_test.cc",
"table_readmodifywriterow_test.cc",
"table_readrow_test.cc",
"table_readrows_test.cc",
"table_resource_test.cc",
"table_sample_row_keys_test.cc",
"table_test.cc",
"testing/cleanup_stale_resources_test.cc",
"testing/random_names_test.cc",
Expand Down
Loading