partial table test updates

Author: scotthart

google/cloud/bigtable/testing/table_integration_test.h

@@ -162,6 +162,16 @@ class TableIntegrationTest
     return names;
   }
 
+  static StatusOr<std::vector<std::string>> TableNames(
+      StreamRange<google::bigtable::admin::v2::Table>& tables) {
+    std::vector<std::string> names;
+    for (auto const& table : tables) {
+      if (!table) return table.status();
+      names.push_back(table->name());
+    }
+    return names;
+  }
+
   static std::vector<std::string> BackupNames(
       std::vector<google::bigtable::admin::v2::Backup> const& backups) {
     std::vector<std::string> names(backups.size());

google/cloud/bigtable/tests/admin_integration_test.cc

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "google/cloud/bigtable/admin/bigtable_table_admin_client.h"
+#include "google/cloud/bigtable/table_config.h"
 #include "google/cloud/bigtable/testing/table_integration_test.h"
 #include "google/cloud/internal/getenv.h"
 #include "google/cloud/internal/random.h"
@@ -66,7 +67,7 @@ TEST_F(TableAdminIntegrationTest, TableListWithMultipleTables) {
         bigtable::TableName(project_id(), instance_id(), std::move(table_id)));
   }
   google::bigtable::admin::v2::ListTablesRequest list_request;
-  list_request.set_parent(bigtable::InstanceName(project_id(), instance_id()));
+  list_request.set_parent(instance_name);
   list_request.set_view(btadmin::Table::NAME_ONLY);
   auto tables = table_admin_->ListTables(list_request);
   std::vector<btadmin::Table> table_list;
@@ -93,7 +94,7 @@ TEST_F(TableAdminIntegrationTest, TableListWithMultipleTables) {
     EXPECT_THAT(names, Not(Contains(t)));
   }
 }
-#if 0
+
 TEST_F(TableAdminIntegrationTest, DropRowsByPrefix) {
   auto table = GetTable();
 
@@ -119,10 +120,11 @@ TEST_F(TableAdminIntegrationTest, DropRowsByPrefix) {
   // Create records
   CreateCells(table, created_cells);
   // Delete all the records for a row
-  EXPECT_STATUS_OK(table_admin_->DropRowsByPrefix(
-      bigtable::testing::TableTestEnvironment::table_id(), row_key1_prefix));
+  google::bigtable::admin::v2::DropRowRangeRequest drop_rows_by_prefix;
+  drop_rows_by_prefix.set_name(table.table_name());
+  drop_rows_by_prefix.set_row_key_prefix(row_key1_prefix);
+  EXPECT_STATUS_OK(table_admin_->DropRowRange(drop_rows_by_prefix));
   auto actual_cells = ReadRows(table, bigtable::Filter::PassAllFilter());
-
   CheckEqualUnordered(expected_cells, actual_cells);
 }
 
@@ -143,10 +145,11 @@ TEST_F(TableAdminIntegrationTest, DropAllRows) {
   // Create records
   CreateCells(table, created_cells);
   // Delete all the records from a table
-  EXPECT_STATUS_OK(table_admin_->DropAllRows(
-      bigtable::testing::TableTestEnvironment::table_id()));
+  google::bigtable::admin::v2::DropRowRangeRequest drop_all_rows;
+  drop_all_rows.set_name(table.table_name());
+  drop_all_rows.set_delete_all_data_from_table(true);
+  EXPECT_STATUS_OK(table_admin_->DropRowRange(drop_all_rows));
   auto actual_cells = ReadRows(table, bigtable::Filter::PassAllFilter());
-
   ASSERT_TRUE(actual_cells.empty());
 }
 
@@ -156,6 +159,7 @@ TEST_F(TableAdminIntegrationTest, CreateListGetDeleteTable) {
   auto const table_id = RandomTableId();
   auto const table_name =
       bigtable::TableName(project_id(), instance_id(), table_id);
+  auto const instance_name = InstanceName(project_id(), instance_id());
 
   // Create table config
   bigtable::TableConfig table_config(
@@ -164,17 +168,28 @@ TEST_F(TableAdminIntegrationTest, CreateListGetDeleteTable) {
       {"a1000", "a2000", "b3000", "m5000"});
 
   // Create table
-  ASSERT_STATUS_OK(table_admin_->CreateTable(table_id, table_config));
+  google::bigtable::admin::v2::CreateTableRequest create_request =
+      std::move(table_config).as_proto();
+  create_request.set_parent(instance_name);
+  create_request.set_table_id(table_id);
+  ASSERT_STATUS_OK(table_admin_->CreateTable(create_request));
   bigtable::Table table(MakeDataConnection(),
                         TableResource(project_id(), instance_id(), table_id));
 
   // List tables
-  auto tables = table_admin_->ListTables(btadmin::Table::NAME_ONLY);
-  ASSERT_STATUS_OK(tables);
-  EXPECT_THAT(TableNames(*tables), Contains(table_name));
+  google::bigtable::admin::v2::ListTablesRequest list_request;
+  list_request.set_parent(instance_name);
+  list_request.set_view(btadmin::Table::NAME_ONLY);
+  auto tables = table_admin_->ListTables(list_request);
+  auto table_list = TableNames(tables);
+  ASSERT_STATUS_OK(table_list);
+  EXPECT_THAT(*table_list, Contains(table_name));
 
   // Get table
-  auto table_detailed = table_admin_->GetTable(table_id, btadmin::Table::FULL);
+  google::bigtable::admin::v2::GetTableRequest get_request;
+  get_request.set_name(table_name);
+  get_request.set_view(btadmin::Table::FULL);
+  auto table_detailed = table_admin_->GetTable(get_request);
   ASSERT_STATUS_OK(table_detailed);
 
   // Verify new table was created
@@ -195,15 +210,20 @@ TEST_F(TableAdminIntegrationTest, CreateListGetDeleteTable) {
   EXPECT_EQ(1, count_matching_families(*table_detailed, "foo"));
 
   // Update table
-  std::vector<bigtable::ColumnFamilyModification> column_modification_list = {
-      bigtable::ColumnFamilyModification::Create(
-          "newfam", GC::Intersection(GC::MaxAge(std::chrono::hours(7 * 24)),
-                                     GC::MaxNumVersions(1))),
-      bigtable::ColumnFamilyModification::Update("fam", GC::MaxNumVersions(2)),
-      bigtable::ColumnFamilyModification::Drop("foo")};
+  std::vector<
+      google::bigtable::admin::v2::ModifyColumnFamiliesRequest::Modification>
+      column_modification_list = {
+          bigtable::ColumnFamilyModification::Create(
+              "newfam", GC::Intersection(GC::MaxAge(std::chrono::hours(7 * 24)),
+                                         GC::MaxNumVersions(1)))
+              .as_proto(),
+          bigtable::ColumnFamilyModification::Update("fam",
+                                                     GC::MaxNumVersions(2))
+              .as_proto(),
+          bigtable::ColumnFamilyModification::Drop("foo").as_proto()};
 
   auto table_modified =
-      table_admin_->ModifyColumnFamilies(table_id, column_modification_list);
+      table_admin_->ModifyColumnFamilies(table_name, column_modification_list);
   ASSERT_STATUS_OK(table_modified);
   EXPECT_EQ(1, count_matching_families(*table_modified, "fam"));
   EXPECT_EQ(0, count_matching_families(*table_modified, "foo"));
@@ -216,10 +236,12 @@ TEST_F(TableAdminIntegrationTest, CreateListGetDeleteTable) {
   EXPECT_STATUS_OK(table_admin_->DeleteTable(table_id));
 
   // List to verify it is no longer there
-  tables = table_admin_->ListTables(btadmin::Table::NAME_ONLY);
-  ASSERT_STATUS_OK(tables);
-  EXPECT_THAT(TableNames(*tables), Not(Contains(table_name)));
+  tables = table_admin_->ListTables(list_request);
+  table_list = TableNames(tables);
+  ASSERT_STATUS_OK(table_list);
+  EXPECT_THAT(*table_list, Not(Contains(table_name)));
 }
+#if 0
 
 /// @test Verify that `bigtable::TableAdmin` WaitForConsistencyCheck works as
 /// expected.