lineCode
diff --git a/‎bigtable/client/table.cc‎
Lines changed: 1 addition & 1 deletion b/‎bigtable/client/table.cc‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎bigtable/tests/data_integration_test.cc‎
Lines changed: 48 additions & 0 deletions b/‎bigtable/tests/data_integration_test.cc‎
Lines changed: 48 additions & 0 deletions
@@ -159,7 +159,7 @@ void Table::SampleRowsImpl(std::function<void(Table::RowKeySample)> inserter,
       // Assuming collection will be either list or vector.
       Table::RowKeySample row_sample;
       row_sample.offset_bytes = response.offset_bytes();
-      row_sample.row_key = std::move(response.row_key());
+      row_sample.row_key = std::move(*response.mutable_row_key());
       inserter(std::move(row_sample));
     }
     auto status = stream->Finish();
 
@@ -365,3 +365,51 @@ TEST_F(DataIntegrationTest, TableReadModifyWriteRowMultipleTest) {
   DeleteTable(table_name);
   CheckEqualUnordered(expected_ignore_timestamp, actual_ignore_timestamp);
 }
+
+TEST_F(DataIntegrationTest, TableSampleRowKeysTest) {
+  std::string const table_name = "table-sample-row-keys-test";
+  auto table = CreateTable(table_name, table_config);
+
+  // Create BATCH_SIZE * BATCH_COUNT rows.
+  constexpr int BATCH_COUNT = 10;
+  constexpr int BATCH_SIZE = 5000;
+  constexpr int COLUMN_COUNT = 10;
+  int rowid = 0;
+  for (int batch = 0; batch != BATCH_COUNT; ++batch) {
+    bigtable::BulkMutation bulk;
+    for (int row = 0; row != BATCH_SIZE; ++row) {
+      std::ostringstream os;
+      os << "row:" << std::setw(9) << std::setfill('0') << rowid;
+
+      // Build a mutation that creates 10 columns.
+      bigtable::SingleRowMutation mutation(os.str());
+      for (int col = 0; col != COLUMN_COUNT; ++col) {
+        std::string colid = "c" + std::to_string(col);
+        std::string value = colid + "#" + os.str();
+        mutation.emplace_back(
+            bigtable::SetCell(family1, std::move(colid), std::move(value)));
+      }
+      bulk.emplace_back(std::move(mutation));
+      ++rowid;
+    }
+    table->BulkApply(std::move(bulk));
+  }
+  auto samples = table->SampleRows<std::vector>();
+  DeleteTable(table_name);
+
+  // It is somewhat hard to verify that the values returned here are correct.
+  // We cannot check the specific values, not even the format, of the row keys
+  // because Cloud Bigtable might return an empty row key (for "end of table"),
+  // and it might return row keys that have never been written to.
+  // All we can check is that this is not empty, and that the offsets are in
+  // ascending order.
+  EXPECT_FALSE(samples.empty());
+  std::int64_t previous = 0;
+  for (auto const& s : samples) {
+    EXPECT_LE(previous, s.offset_bytes);
+    previous = s.offset_bytes;
+  }
+  // At least one of the samples should have non-zero offset:
+  auto last = samples.back();
+  EXPECT_LT(0, last.offset_bytes);
+}
Original file line number	Diff line number	Diff line change
@@ -159,7 +159,7 @@ void Table::SampleRowsImpl(std::function<void(Table::RowKeySample)> inserter,
159	159	// Assuming collection will be either list or vector.
160	160	Table::RowKeySample row_sample;
161	161	row_sample.offset_bytes = response.offset_bytes();
162		- row_sample.row_key = std::move(response.row_key());
	162	+ row_sample.row_key = std::move(*response.mutable_row_key());
163	163	inserter(std::move(row_sample));
164	164	}
165	165	auto status = stream->Finish();