import quincy beta 17.1.0

[ceph.git] / ceph / src / rocksdb / utilities / cassandra / cassandra_row_merge_test.cc

diff --git a/ceph/src/rocksdb/utilities/cassandra/cassandra_row_merge_test.cc b/ceph/src/rocksdb/utilities/cassandra/cassandra_row_merge_test.cc
index 9e9ff14949f57806989148c677ff577196efd62c..33a1b562763eeb00e326bddc0317b8fbf4699b84 100644 (file)
--- a/ceph/src/rocksdb/utilities/cassandra/cassandra_row_merge_test.cc
+++ b/ceph/src/rocksdb/utilities/cassandra/cassandra_row_merge_test.cc
@@ -11,6 +11,8 @@
 namespace ROCKSDB_NAMESPACE {
 namespace cassandra {
 
+class RowValueMergeTest : public testing::Test {};
+
 TEST(RowValueMergeTest, Merge) {
   std::vector<RowValue> row_values;
   row_values.push_back(
@@ -41,12 +43,12 @@ TEST(RowValueMergeTest, Merge) {
 
   RowValue merged = RowValue::Merge(std::move(row_values));
   EXPECT_FALSE(merged.IsTombstone());
-  EXPECT_EQ(merged.columns_.size(), 5);
-  VerifyRowValueColumns(merged.columns_, 0, kExpiringColumn, 0, 6);
-  VerifyRowValueColumns(merged.columns_, 1, kColumn, 1, 8);
-  VerifyRowValueColumns(merged.columns_, 2, kTombstone, 2, 7);
-  VerifyRowValueColumns(merged.columns_, 3, kExpiringColumn, 7, 17);
-  VerifyRowValueColumns(merged.columns_, 4, kTombstone, 11, 11);
+  EXPECT_EQ(merged.get_columns().size(), 5);
+  VerifyRowValueColumns(merged.get_columns(), 0, kExpiringColumn, 0, 6);
+  VerifyRowValueColumns(merged.get_columns(), 1, kColumn, 1, 8);
+  VerifyRowValueColumns(merged.get_columns(), 2, kTombstone, 2, 7);
+  VerifyRowValueColumns(merged.get_columns(), 3, kExpiringColumn, 7, 17);
+  VerifyRowValueColumns(merged.get_columns(), 4, kTombstone, 11, 11);
 }
 
 TEST(RowValueMergeTest, MergeWithRowTombstone) {
@@ -83,10 +85,10 @@ TEST(RowValueMergeTest, MergeWithRowTombstone) {
 
   RowValue merged = RowValue::Merge(std::move(row_values));
   EXPECT_FALSE(merged.IsTombstone());
-  EXPECT_EQ(merged.columns_.size(), 3);
-  VerifyRowValueColumns(merged.columns_, 0, kColumn, 3, 12);
-  VerifyRowValueColumns(merged.columns_, 1, kColumn, 4, 13);
-  VerifyRowValueColumns(merged.columns_, 2, kColumn, 5, 14);
+  EXPECT_EQ(merged.get_columns().size(), 3);
+  VerifyRowValueColumns(merged.get_columns(), 0, kColumn, 3, 12);
+  VerifyRowValueColumns(merged.get_columns(), 1, kColumn, 4, 13);
+  VerifyRowValueColumns(merged.get_columns(), 2, kColumn, 5, 14);
 
   // If the tombstone's timestamp is the latest, then it returns a
   // row tombstone.