Skip to content

Commit bfc9737

Browse files
siyingfacebook-github-bot
siying
authored and
facebook-github-bot
committed
Remove gtest dependency in non-test code under utilities/cassandra (facebook#6908)
Summary: production code under utilities/cassandra depends on gtest.h. Remove them. Pull Request resolved: facebook#6908 Test Plan: Run all existing tests. Reviewed By: ajkr Differential Revision: D21842606 fbshipit-source-id: a098e0b49c9aeac51cc90a79562ad9897a36122c
1 parent 38f988d commit bfc9737

File tree

6 files changed

+68
-64
lines changed

6 files changed

+68
-64
lines changed

‎utilities/cassandra/cassandra_format_test.cc

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ TEST(TombstoneTest, Tombstone) {
184184
== 0);
185185
}
186186

187+
class RowValueTest : public testing::Test {};
188+
187189
TEST(RowValueTest, RowTombstone) {
188190
int32_t local_deletion_time = 1494022807;
189191
int64_t marked_for_delete_at = 1494022807044;
@@ -327,10 +329,13 @@ TEST(RowValueTest, PurgeTtlShouldRemvoeAllColumnsExpired) {
327329
bool changed = false;
328330
auto purged = row_value.RemoveExpiredColumns(&changed);
329331
EXPECT_TRUE(changed);
330-
EXPECT_EQ(purged.columns_.size(), 3);
331-
VerifyRowValueColumns(purged.columns_, 0, kColumn, 0, ToMicroSeconds(now));
332-
VerifyRowValueColumns(purged.columns_, 1, kExpiringColumn, 2, ToMicroSeconds(now));
333-
VerifyRowValueColumns(purged.columns_, 2, kTombstone, 3, ToMicroSeconds(now));
332+
EXPECT_EQ(purged.get_columns().size(), 3);
333+
VerifyRowValueColumns(purged.get_columns(), 0, kColumn, 0,
334+
ToMicroSeconds(now));
335+
VerifyRowValueColumns(purged.get_columns(), 1, kExpiringColumn, 2,
336+
ToMicroSeconds(now));
337+
VerifyRowValueColumns(purged.get_columns(), 2, kTombstone, 3,
338+
ToMicroSeconds(now));
334339

335340
purged.RemoveExpiredColumns(&changed);
336341
EXPECT_FALSE(changed);
@@ -349,11 +354,15 @@ TEST(RowValueTest, ExpireTtlShouldConvertExpiredColumnsToTombstones) {
349354
bool changed = false;
350355
auto compacted = row_value.ConvertExpiredColumnsToTombstones(&changed);
351356
EXPECT_TRUE(changed);
352-
EXPECT_EQ(compacted.columns_.size(), 4);
353-
VerifyRowValueColumns(compacted.columns_, 0, kColumn, 0, ToMicroSeconds(now));
354-
VerifyRowValueColumns(compacted.columns_, 1, kTombstone, 1, ToMicroSeconds(now - 10));
355-
VerifyRowValueColumns(compacted.columns_, 2, kExpiringColumn, 2, ToMicroSeconds(now));
356-
VerifyRowValueColumns(compacted.columns_, 3, kTombstone, 3, ToMicroSeconds(now));
357+
EXPECT_EQ(compacted.get_columns().size(), 4);
358+
VerifyRowValueColumns(compacted.get_columns(), 0, kColumn, 0,
359+
ToMicroSeconds(now));
360+
VerifyRowValueColumns(compacted.get_columns(), 1, kTombstone, 1,
361+
ToMicroSeconds(now - 10));
362+
VerifyRowValueColumns(compacted.get_columns(), 2, kExpiringColumn, 2,
363+
ToMicroSeconds(now));
364+
VerifyRowValueColumns(compacted.get_columns(), 3, kTombstone, 3,
365+
ToMicroSeconds(now));
357366

358367
compacted.ConvertExpiredColumnsToTombstones(&changed);
359368
EXPECT_FALSE(changed);

‎utilities/cassandra/cassandra_functional_test.cc

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,17 @@ TEST_F(CassandraFunctionalTest, SimpleMergeTest) {
164164

165165
ASSERT_TRUE(std::get<0>(ret));
166166
RowValue& merged = std::get<1>(ret);
167-
EXPECT_EQ(merged.columns_.size(), 5);
168-
VerifyRowValueColumns(merged.columns_, 0, kExpiringColumn, 0, ToMicroSeconds(now + 6));
169-
VerifyRowValueColumns(merged.columns_, 1, kColumn, 1, ToMicroSeconds(now + 8));
170-
VerifyRowValueColumns(merged.columns_, 2, kTombstone, 2, ToMicroSeconds(now + 7));
171-
VerifyRowValueColumns(merged.columns_, 3, kExpiringColumn, 7, ToMicroSeconds(now + 17));
172-
VerifyRowValueColumns(merged.columns_, 4, kTombstone, 11, ToMicroSeconds(now + 11));
167+
EXPECT_EQ(merged.get_columns().size(), 5);
168+
VerifyRowValueColumns(merged.get_columns(), 0, kExpiringColumn, 0,
169+
ToMicroSeconds(now + 6));
170+
VerifyRowValueColumns(merged.get_columns(), 1, kColumn, 1,
171+
ToMicroSeconds(now + 8));
172+
VerifyRowValueColumns(merged.get_columns(), 2, kTombstone, 2,
173+
ToMicroSeconds(now + 7));
174+
VerifyRowValueColumns(merged.get_columns(), 3, kExpiringColumn, 7,
175+
ToMicroSeconds(now + 17));
176+
VerifyRowValueColumns(merged.get_columns(), 4, kTombstone, 11,
177+
ToMicroSeconds(now + 11));
173178
}
174179

175180
TEST_F(CassandraFunctionalTest,
@@ -196,11 +201,15 @@ TEST_F(CassandraFunctionalTest,
196201
auto ret = store.Get("k1");
197202
ASSERT_TRUE(std::get<0>(ret));
198203
RowValue& merged = std::get<1>(ret);
199-
EXPECT_EQ(merged.columns_.size(), 4);
200-
VerifyRowValueColumns(merged.columns_, 0, kTombstone, 0, ToMicroSeconds(now - 10));
201-
VerifyRowValueColumns(merged.columns_, 1, kExpiringColumn, 1, ToMicroSeconds(now - kTtl + 10));
202-
VerifyRowValueColumns(merged.columns_, 2, kColumn, 2, ToMicroSeconds(now));
203-
VerifyRowValueColumns(merged.columns_, 3, kTombstone, 3, ToMicroSeconds(now));
204+
EXPECT_EQ(merged.get_columns().size(), 4);
205+
VerifyRowValueColumns(merged.get_columns(), 0, kTombstone, 0,
206+
ToMicroSeconds(now - 10));
207+
VerifyRowValueColumns(merged.get_columns(), 1, kExpiringColumn, 1,
208+
ToMicroSeconds(now - kTtl + 10));
209+
VerifyRowValueColumns(merged.get_columns(), 2, kColumn, 2,
210+
ToMicroSeconds(now));
211+
VerifyRowValueColumns(merged.get_columns(), 3, kTombstone, 3,
212+
ToMicroSeconds(now));
204213
}
205214

206215

@@ -229,10 +238,13 @@ TEST_F(CassandraFunctionalTest,
229238
auto ret = store.Get("k1");
230239
ASSERT_TRUE(std::get<0>(ret));
231240
RowValue& merged = std::get<1>(ret);
232-
EXPECT_EQ(merged.columns_.size(), 3);
233-
VerifyRowValueColumns(merged.columns_, 0, kExpiringColumn, 1, ToMicroSeconds(now));
234-
VerifyRowValueColumns(merged.columns_, 1, kColumn, 2, ToMicroSeconds(now));
235-
VerifyRowValueColumns(merged.columns_, 2, kTombstone, 3, ToMicroSeconds(now));
241+
EXPECT_EQ(merged.get_columns().size(), 3);
242+
VerifyRowValueColumns(merged.get_columns(), 0, kExpiringColumn, 1,
243+
ToMicroSeconds(now));
244+
VerifyRowValueColumns(merged.get_columns(), 1, kColumn, 2,
245+
ToMicroSeconds(now));
246+
VerifyRowValueColumns(merged.get_columns(), 2, kTombstone, 3,
247+
ToMicroSeconds(now));
236248
}
237249

238250
TEST_F(CassandraFunctionalTest,
@@ -284,8 +296,8 @@ TEST_F(CassandraFunctionalTest,
284296
auto ret = store.Get("k1");
285297
ASSERT_TRUE(std::get<0>(ret));
286298
RowValue& gced = std::get<1>(ret);
287-
EXPECT_EQ(gced.columns_.size(), 1);
288-
VerifyRowValueColumns(gced.columns_, 0, kColumn, 1, ToMicroSeconds(now));
299+
EXPECT_EQ(gced.get_columns().size(), 1);
300+
VerifyRowValueColumns(gced.get_columns(), 0, kColumn, 1, ToMicroSeconds(now));
289301
}
290302

291303
TEST_F(CassandraFunctionalTest, CompactionShouldRemoveTombstoneFromPut) {

‎utilities/cassandra/cassandra_row_merge_test.cc

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
namespace ROCKSDB_NAMESPACE {
1212
namespace cassandra {
1313

14+
class RowValueMergeTest : public testing::Test {};
15+
1416
TEST(RowValueMergeTest, Merge) {
1517
std::vector<RowValue> row_values;
1618
row_values.push_back(
@@ -41,12 +43,12 @@ TEST(RowValueMergeTest, Merge) {
4143

4244
RowValue merged = RowValue::Merge(std::move(row_values));
4345
EXPECT_FALSE(merged.IsTombstone());
44-
EXPECT_EQ(merged.columns_.size(), 5);
45-
VerifyRowValueColumns(merged.columns_, 0, kExpiringColumn, 0, 6);
46-
VerifyRowValueColumns(merged.columns_, 1, kColumn, 1, 8);
47-
VerifyRowValueColumns(merged.columns_, 2, kTombstone, 2, 7);
48-
VerifyRowValueColumns(merged.columns_, 3, kExpiringColumn, 7, 17);
49-
VerifyRowValueColumns(merged.columns_, 4, kTombstone, 11, 11);
46+
EXPECT_EQ(merged.get_columns().size(), 5);
47+
VerifyRowValueColumns(merged.get_columns(), 0, kExpiringColumn, 0, 6);
48+
VerifyRowValueColumns(merged.get_columns(), 1, kColumn, 1, 8);
49+
VerifyRowValueColumns(merged.get_columns(), 2, kTombstone, 2, 7);
50+
VerifyRowValueColumns(merged.get_columns(), 3, kExpiringColumn, 7, 17);
51+
VerifyRowValueColumns(merged.get_columns(), 4, kTombstone, 11, 11);
5052
}
5153

5254
TEST(RowValueMergeTest, MergeWithRowTombstone) {
@@ -83,10 +85,10 @@ TEST(RowValueMergeTest, MergeWithRowTombstone) {
8385

8486
RowValue merged = RowValue::Merge(std::move(row_values));
8587
EXPECT_FALSE(merged.IsTombstone());
86-
EXPECT_EQ(merged.columns_.size(), 3);
87-
VerifyRowValueColumns(merged.columns_, 0, kColumn, 3, 12);
88-
VerifyRowValueColumns(merged.columns_, 1, kColumn, 4, 13);
89-
VerifyRowValueColumns(merged.columns_, 2, kColumn, 5, 14);
88+
EXPECT_EQ(merged.get_columns().size(), 3);
89+
VerifyRowValueColumns(merged.get_columns(), 0, kColumn, 3, 12);
90+
VerifyRowValueColumns(merged.get_columns(), 1, kColumn, 4, 13);
91+
VerifyRowValueColumns(merged.get_columns(), 2, kColumn, 5, 14);
9092

9193
// If the tombstone's timestamp is the latest, then it returns a
9294
// row tombstone.

‎utilities/cassandra/format.h

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
#include <vector>
6161
#include "rocksdb/merge_operator.h"
6262
#include "rocksdb/slice.h"
63-
#include "test_util/testharness.h"
6463

6564
namespace ROCKSDB_NAMESPACE {
6665
namespace cassandra {
@@ -172,25 +171,13 @@ class RowValue {
172171
// Merge multiple rows according to their timestamp.
173172
static RowValue Merge(std::vector<RowValue>&& values);
174173

175-
private:
174+
const Columns& get_columns() { return columns_; }
175+
176+
private:
176177
int32_t local_deletion_time_;
177178
int64_t marked_for_delete_at_;
178179
Columns columns_;
179180
int64_t last_modified_time_;
180-
181-
FRIEND_TEST(RowValueTest, PurgeTtlShouldRemvoeAllColumnsExpired);
182-
FRIEND_TEST(RowValueTest, ExpireTtlShouldConvertExpiredColumnsToTombstones);
183-
FRIEND_TEST(RowValueMergeTest, Merge);
184-
FRIEND_TEST(RowValueMergeTest, MergeWithRowTombstone);
185-
FRIEND_TEST(CassandraFunctionalTest, SimpleMergeTest);
186-
FRIEND_TEST(
187-
CassandraFunctionalTest, CompactionShouldConvertExpiredColumnsToTombstone);
188-
FRIEND_TEST(
189-
CassandraFunctionalTest, CompactionShouldPurgeExpiredColumnsIfPurgeTtlIsOn);
190-
FRIEND_TEST(
191-
CassandraFunctionalTest, CompactionShouldRemoveRowWhenAllColumnExpiredIfPurgeTtlIsOn);
192-
FRIEND_TEST(CassandraFunctionalTest,
193-
CompactionShouldRemoveTombstoneExceedingGCGracePeriod);
194181
};
195182

196183
} // namepsace cassandrda

‎utilities/cassandra/test_utils.cc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,9 @@ RowValue CreateRowTombstone(int64_t timestamp) {
5353
}
5454

5555
void VerifyRowValueColumns(
56-
std::vector<std::shared_ptr<ColumnBase>> &columns,
57-
std::size_t index_of_vector,
58-
int8_t expected_mask,
59-
int8_t expected_index,
60-
int64_t expected_timestamp
61-
) {
56+
const std::vector<std::shared_ptr<ColumnBase>> &columns,
57+
std::size_t index_of_vector, int8_t expected_mask, int8_t expected_index,
58+
int64_t expected_timestamp) {
6259
EXPECT_EQ(expected_timestamp, columns[index_of_vector]->Timestamp());
6360
EXPECT_EQ(expected_mask, columns[index_of_vector]->Mask());
6461
EXPECT_EQ(expected_index, columns[index_of_vector]->Index());

‎utilities/cassandra/test_utils.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@ RowValue CreateTestRowValue(
3333
RowValue CreateRowTombstone(int64_t timestamp);
3434

3535
void VerifyRowValueColumns(
36-
std::vector<std::shared_ptr<ColumnBase>> &columns,
37-
std::size_t index_of_vector,
38-
int8_t expected_mask,
39-
int8_t expected_index,
40-
int64_t expected_timestamp
41-
);
36+
const std::vector<std::shared_ptr<ColumnBase>> &columns,
37+
std::size_t index_of_vector, int8_t expected_mask, int8_t expected_index,
38+
int64_t expected_timestamp);
4239

4340
int64_t ToMicroSeconds(int64_t seconds);
4441
int32_t ToSeconds(int64_t microseconds);

0 commit comments

Comments
 (0)