Move admin/ to client/ (#298)

This fixes #103.  Moved the files from `bigtable/admin` to `bigtable/client`.
Thanks to @paprat for catching the include guard changes.

Author: coryan

bigtable/CMakeLists.txt

@@ -156,7 +156,6 @@ add_dependencies(depends-local gmock bigtable_protos)
 # All tests get added to this target below.
 add_custom_target(tests-local)
 add_subdirectory(client)
-add_subdirectory(admin)
 add_subdirectory(tests)
 
 if (GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
@@ -173,10 +172,6 @@ if (CLANG_TIDY_EXE AND BIGTABLE_CLIENT_CLANG_TIDY)
             bigtable_client PROPERTIES
             CXX_CLANG_TIDY "${CLANG_TIDY_EXE}"
     )
-    set_target_properties(
-            bigtable_admin_client PROPERTIES
-            CXX_CLANG_TIDY "${CLANG_TIDY_EXE}"
-    )
 endif ()
 
 # Install the libraries and headers in the locations determined by

bigtable/admin/CMakeLists.txt

@@ -23,7 +23,7 @@ add_library(bigtable_benchmark_common
         setup.h
         setup.cc)
 target_link_libraries(bigtable_benchmark_common
-        bigtable_admin_client bigtable_client bigtable_protos
+        bigtable_client bigtable_protos
         gRPC::grpc++ gRPC::grpc protobuf::libprotobuf)
 
 # List the unit tests, then setup the targets and dependencies.
@@ -39,7 +39,7 @@ foreach (fname ${bigtable_benchmarks_unit_tests})
     set(target "bigtable_benchmarks_${target}")
     add_executable(${target} ${fname})
     target_link_libraries(${target} PRIVATE
-            bigtable_benchmark_common bigtable_admin_client bigtable_client
+            bigtable_benchmark_common bigtable_client
             bigtable_protos bigtable_common_options
             gmock gRPC::grpc++ gRPC::grpc protobuf::libprotobuf)
     add_test(NAME ${target} COMMAND ${target})
@@ -49,20 +49,20 @@ endforeach ()
 # Benchmark Table::ReadRows().
 add_executable(scan_throughput_benchmark scan_throughput_benchmark.cc)
 target_link_libraries(scan_throughput_benchmark PRIVATE
-        bigtable_benchmark_common bigtable_admin_client bigtable_client
+        bigtable_benchmark_common bigtable_client
         bigtable_protos bigtable_common_options
         gRPC::grpc++ gRPC::grpc protobuf::libprotobuf)
 
 # Benchmark for Table::Apply() and Table::ReadRow().
 add_executable(apply_read_latency_benchmark apply_read_latency_benchmark.cc)
 target_link_libraries(apply_read_latency_benchmark PRIVATE
-        bigtable_benchmark_common bigtable_admin_client bigtable_client
+        bigtable_benchmark_common bigtable_client
         bigtable_protos bigtable_common_options
         gRPC::grpc++ gRPC::grpc protobuf::libprotobuf)
 
 # A benchmark to measure performance of long running programs.
 add_executable(endurance_benchmark endurance_benchmark.cc)
 target_link_libraries(endurance_benchmark PRIVATE
-        bigtable_benchmark_common bigtable_admin_client bigtable_client
+        bigtable_benchmark_common bigtable_client
         bigtable_protos bigtable_common_options
         gRPC::grpc++ gRPC::grpc protobuf::libprotobuf)

bigtable/admin/config-version.cmake.in

@@ -13,13 +13,10 @@
 // limitations under the License.
 
 #include "bigtable/benchmarks/embedded_server.h"
-
-#include <thread>
-
 #include <gmock/gmock.h>
-
-#include "bigtable/admin/table_admin.h"
+#include <thread>
 #include "bigtable/client/table.h"
+#include "bigtable/client/table_admin.h"
 
 using namespace bigtable::benchmarks;
 

bigtable/admin/config.cmake.in

@@ -17,8 +17,8 @@
 
 #include <algorithm>
 #include <random>
-#include "bigtable/admin/table_admin.h"
 #include "bigtable/client/table.h"
+#include "bigtable/client/table_admin.h"
 
 namespace bigtable {
 namespace benchmarks {

bigtable/admin/config.pc.in

@@ -17,18 +17,25 @@ configure_file(version_info.h.in version_info.h)
 
 # the client library
 add_library(bigtable_client
+        admin_client.h
+        admin_client.cc
         ${CMAKE_CURRENT_BINARY_DIR}/build_info.cc
         ${CMAKE_CURRENT_BINARY_DIR}/version_info.h
         build_info.h
         cell.h
         client_options.h
         client_options.cc
+        column_family.h
         data_client.h
         data_client.cc
         filters.h
         filters.cc
         grpc_error.h
         grpc_error.cc
+        instance_admin_client.h
+        instance_admin_client.cc
+        instance_admin.h
+        instance_admin.cc
         internal/bulk_mutator.h
         internal/bulk_mutator.cc
         internal/common_client.h
@@ -64,6 +71,10 @@ add_library(bigtable_client
         rpc_retry_policy.cc
         table.h
         table.cc
+        table_admin.h
+        table_admin.cc
+        table_config.h
+        table_config.cc
         version.h
         version.cc)
 target_link_libraries(bigtable_client PUBLIC
@@ -92,20 +103,26 @@ target_link_libraries(bigtable_client_testing PUBLIC
 
 # List the unit tests, then setup the targets and dependencies.
 set(bigtable_client_unit_tests
+        admin_client_test.cc
         cell_test.cc
         client_options_test.cc
+        column_family_test.cc
         data_client_test.cc
         filters_test.cc
         force_sanitizer_failures_test.cc
         grpc_error_test.cc
         idempotent_mutation_policy_test.cc
+        instance_admin_client_test.cc
+        instance_admin_test.cc
         internal/bulk_mutator_test.cc
         internal/prefix_range_end_test.cc
         internal/readrowsparser_test.cc
         mutations_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_readrow_test.cc
         table_readrows_test.cc
         table_test.cc

bigtable/benchmarks/CMakeLists.txt

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "bigtable/admin/admin_client.h"
+#include "bigtable/client/admin_client.h"
 #include "bigtable/client/internal/common_client.h"
 
 namespace {