Skip to content

Commit 3087d97

Browse files
committed
feat: remove DataClient and it's usages
1 parent 600d394 commit 3087d97

File tree

66 files changed

+248
-9175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+248
-9175
lines changed

examples/gcs2cbt.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ int main(int argc, char* argv[]) try {
6060

6161
// Create a connection to Cloud Bigtable and an object to manipulate the
6262
// specific table used in this demo.
63-
cbt::Table table(cbt::MakeDataClient(options.project_id, options.instance_id),
64-
options.table_id);
63+
cbt::Table table(cbt::MakeDataConnection(),
64+
cbt::TableResource(options.project_id, options.instance_id,
65+
options.table_id));
6566
cbt::MutationBatcher batcher(table);
6667

6768
// How often do we print a progress marker ('.') in the reader thread.

google/cloud/bigtable/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ add_library(
123123
cluster_list_responses.h
124124
column_family.h
125125
completion_queue.h
126-
data_client.cc
127-
data_client.h
128126
data_connection.cc
129127
data_connection.h
130128
expr.cc
@@ -403,8 +401,6 @@ if (BUILD_TESTING)
403401
testing/cleanup_stale_resources.h
404402
testing/embedded_server_test_fixture.cc
405403
testing/embedded_server_test_fixture.h
406-
testing/inprocess_data_client.cc
407-
testing/inprocess_data_client.h
408404
testing/mock_async_failing_rpc_factory.h
409405
testing/mock_bigtable_stub.h
410406
testing/mock_data_client.h
@@ -456,7 +452,6 @@ if (BUILD_TESTING)
456452
client_test.cc
457453
cluster_config_test.cc
458454
column_family_test.cc
459-
data_client_test.cc
460455
data_connection_test.cc
461456
expr_test.cc
462457
filters_test.cc
@@ -524,13 +519,10 @@ if (BUILD_TESTING)
524519
table_admin_test.cc
525520
table_apply_test.cc
526521
table_bulk_apply_test.cc
527-
table_check_and_mutate_row_test.cc
528522
table_config_test.cc
529-
table_readmodifywriterow_test.cc
530523
table_readrow_test.cc
531524
table_readrows_test.cc
532525
table_resource_test.cc
533-
table_sample_row_keys_test.cc
534526
table_test.cc
535527
testing/cleanup_stale_resources_test.cc
536528
testing/random_names_test.cc

google/cloud/bigtable/benchmarks/benchmark.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "google/cloud/bigtable/admin/bigtable_table_admin_client.h"
1717
#include "google/cloud/bigtable/benchmarks/random_mutation.h"
1818
#include "google/cloud/bigtable/resource_names.h"
19+
#include "google/cloud/grpc_options.h"
1920
#include "google/cloud/internal/background_threads_impl.h"
2021
#include "google/cloud/internal/getenv.h"
2122
#include "google/cloud/internal/make_status.h"

google/cloud/bigtable/benchmarks/embedded_server_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "google/cloud/bigtable/admin/bigtable_table_admin_client.h"
1717
#include "google/cloud/bigtable/resource_names.h"
1818
#include "google/cloud/bigtable/table.h"
19+
#include "google/cloud/grpc_options.h"
1920
#include "google/cloud/testing_util/status_matchers.h"
2021
#include <gmock/gmock.h>
2122
#include <thread>

google/cloud/bigtable/bigtable_client_testing.bzl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
bigtable_client_testing_hdrs = [
2020
"testing/cleanup_stale_resources.h",
2121
"testing/embedded_server_test_fixture.h",
22-
"testing/inprocess_data_client.h",
2322
"testing/mock_async_failing_rpc_factory.h",
2423
"testing/mock_bigtable_stub.h",
25-
"testing/mock_data_client.h",
2624
"testing/mock_mutate_rows_limiter.h",
2725
"testing/mock_mutate_rows_reader.h",
2826
"testing/mock_partial_result_set_reader.h",
@@ -32,14 +30,11 @@ bigtable_client_testing_hdrs = [
3230
"testing/mock_sample_row_keys_reader.h",
3331
"testing/random_names.h",
3432
"testing/table_integration_test.h",
35-
"testing/table_test_fixture.h",
3633
]
3734

3835
bigtable_client_testing_srcs = [
3936
"testing/cleanup_stale_resources.cc",
4037
"testing/embedded_server_test_fixture.cc",
41-
"testing/inprocess_data_client.cc",
4238
"testing/random_names.cc",
4339
"testing/table_integration_test.cc",
44-
"testing/table_test_fixture.cc",
4540
]

google/cloud/bigtable/bigtable_client_unit_tests.bzl

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ bigtable_client_unit_tests = [
2828
"client_test.cc",
2929
"cluster_config_test.cc",
3030
"column_family_test.cc",
31-
"data_client_test.cc",
3231
"data_connection_test.cc",
3332
"expr_test.cc",
3433
"filters_test.cc",
@@ -57,12 +56,6 @@ bigtable_client_unit_tests = [
5756
"internal/default_row_reader_test.cc",
5857
"internal/defaults_test.cc",
5958
"internal/google_bytes_traits_test.cc",
60-
"internal/legacy_async_bulk_apply_test.cc",
61-
"internal/legacy_async_row_reader_test.cc",
62-
"internal/legacy_async_row_sampler_test.cc",
63-
"internal/legacy_bulk_mutator_test.cc",
64-
"internal/legacy_row_reader_test.cc",
65-
"internal/logging_data_client_test.cc",
6659
"internal/logging_result_set_reader_test.cc",
6760
"internal/metrics_test.cc",
6861
"internal/mutate_rows_limiter_test.cc",
@@ -76,7 +69,6 @@ bigtable_client_unit_tests = [
7669
"internal/retry_traits_test.cc",
7770
"internal/traced_row_reader_test.cc",
7871
"internal/tuple_utils_test.cc",
79-
"legacy_table_test.cc",
8072
"metadata_update_policy_test.cc",
8173
"mocks/mock_row_reader_test.cc",
8274
"mutation_batcher_test.cc",
@@ -94,15 +86,8 @@ bigtable_client_unit_tests = [
9486
"rpc_retry_policy_test.cc",
9587
"sql_statement_test.cc",
9688
"table_admin_test.cc",
97-
"table_apply_test.cc",
98-
"table_bulk_apply_test.cc",
99-
"table_check_and_mutate_row_test.cc",
10089
"table_config_test.cc",
101-
"table_readmodifywriterow_test.cc",
102-
"table_readrow_test.cc",
103-
"table_readrows_test.cc",
10490
"table_resource_test.cc",
105-
"table_sample_row_keys_test.cc",
10691
"table_test.cc",
10792
"testing/cleanup_stale_resources_test.cc",
10893
"testing/random_names_test.cc",

google/cloud/bigtable/data_client.cc

Lines changed: 0 additions & 242 deletions
This file was deleted.

0 commit comments

Comments
 (0)