Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit a402c4e

Browse files
committed
Revert name changes of PelotonTest and PelotonCodeGenTest
1 parent 3d74f74 commit a402c4e

File tree

159 files changed

+176
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+176
-176
lines changed

Diff for: test/binder/binder_test.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ using std::vector;
3737
namespace peloton {
3838
namespace test {
3939

40-
class BinderCorrectnessTests : public PelotonTests {
40+
class BinderCorrectnessTests : public PelotonTest {
4141
virtual void SetUp() override {
42-
PelotonTests::SetUp();
42+
PelotonTest::SetUp();
4343
catalog::Catalog::GetInstance();
4444
// NOTE: Catalog::GetInstance()->Bootstrap(), you can only call it once!
4545
TestingExecutorUtil::InitializeDatabase(DEFAULT_DB_NAME);
4646
}
4747

4848
virtual void TearDown() override {
4949
TestingExecutorUtil::DeleteDatabase(DEFAULT_DB_NAME);
50-
PelotonTests::TearDown();
50+
PelotonTest::TearDown();
5151
}
5252
};
5353

Diff for: test/brain/query_clusterer_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ bool ClusterCorrectness(std::set<brain::Cluster *> clusters,
5252
return check;
5353
}
5454

55-
class QueryClustererTests : public PelotonTests {};
55+
class QueryClustererTests : public PelotonTest {};
5656

5757
TEST_F(QueryClustererTests, ClusterTest) {
5858
int num_features = 5;

Diff for: test/brain/query_logger_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace peloton {
2020
namespace test {
2121

22-
class QueryLoggerTests : public PelotonTests {
22+
class QueryLoggerTests : public PelotonTest {
2323
protected:
2424
void SetUp() override {
2525
settings::SettingsManager::SetBool(settings::SettingId::brain, true);

Diff for: test/brain/tensorflow_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace test {
2626
// Tensorflow Tests
2727
//===--------------------------------------------------------------------===//
2828

29-
class TensorflowTests : public PelotonTests {};
29+
class TensorflowTests : public PelotonTest {};
3030

3131
TEST_F(TensorflowTests, BasicTFTest) {
3232
// Check that the tensorflow library imports and prints version info correctly

Diff for: test/catalog/catalog_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace test {
3333
// Catalog Tests
3434
//===--------------------------------------------------------------------===//
3535

36-
class CatalogTests : public PelotonTests {};
36+
class CatalogTests : public PelotonTest {};
3737

3838
TEST_F(CatalogTests, BootstrappingCatalogTest) {
3939
auto catalog = catalog::Catalog::GetInstance();

Diff for: test/catalog/constraints_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace test {
3838
// Constraints Tests
3939
//===--------------------------------------------------------------------===//
4040

41-
class ConstraintsTests : public PelotonTests {};
41+
class ConstraintsTests : public PelotonTest {};
4242

4343
#ifdef CONSTRAINT_NOTNULL_TEST
4444
TEST_F(ConstraintsTests, NOTNULLTest) {

Diff for: test/catalog/manager_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace test {
2626
// Manager Tests
2727
//===--------------------------------------------------------------------===//
2828

29-
class ManagerTests : public PelotonTests {};
29+
class ManagerTests : public PelotonTest {};
3030

3131
void AddTileGroup(UNUSED_ATTRIBUTE uint64_t thread_id) {
3232
// TILES

Diff for: test/catalog/tuple_schema_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace test {
2121
// Tuple Schema Tests
2222
//===--------------------------------------------------------------------===//
2323

24-
class TupleSchemaTests : public PelotonTests {};
24+
class TupleSchemaTests : public PelotonTest {};
2525

2626
TEST_F(TupleSchemaTests, ColumnInfoTest) {
2727
std::vector<catalog::Column> columns;

Diff for: test/codegen/bloom_filter_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
namespace peloton {
3737
namespace test {
3838

39-
class BloomFilterCodegenTests : public PelotonTests {
39+
class BloomFilterCodegenTests : public PelotonTest {
4040
public:
4141
BloomFilterCodegenTests() {
4242
// Create test db

Diff for: test/codegen/function_builder_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
namespace peloton {
1919
namespace test {
2020

21-
class FunctionBuilderTests : public PelotonTests {};
21+
class FunctionBuilderTests : public PelotonTest {};
2222

2323
TEST_F(FunctionBuilderTests, ConstructSingleFunctionTest) {
2424
// Generate a function like so:

Diff for: test/codegen/if_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
namespace peloton {
2424
namespace test {
2525

26-
class IfTests : public PelotonTests {};
26+
class IfTests : public PelotonTest {};
2727

2828
TEST_F(IfTests, IfOnlyTest) {
2929
const std::string func_name = "TestIfOnly";

Diff for: test/codegen/oa_hash_table_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
namespace peloton {
2323
namespace test {
2424

25-
class OAHashTableTests : public PelotonTests {
25+
class OAHashTableTests : public PelotonTest {
2626
public:
2727
// The key and value object we store in the hash table
2828
struct Key {

Diff for: test/codegen/sorter_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static int CompareTuplesForAscending(const char *a, const char *b) {
3434
return at->col_b - bt->col_b;
3535
}
3636

37-
class SorterTests : public PelotonTests {
37+
class SorterTests : public PelotonTest {
3838
public:
3939
SorterTests() {
4040
// Init

Diff for: test/common/cache_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace test {
2626
// Cache Test
2727
//===--------------------------------------------------------------------===//
2828

29-
class CacheTests : public PelotonTests {};
29+
class CacheTests : public PelotonTest {};
3030

3131
#define CACHE_SIZE 5
3232

Diff for: test/common/container_tuple_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
namespace peloton {
2424
namespace test {
2525

26-
class ContainerTupleTests : public PelotonTests {};
26+
class ContainerTupleTests : public PelotonTest {};
2727

2828
TEST_F(ContainerTupleTests, VectorValueTest) {
2929
std::vector<type::Value> values;

Diff for: test/common/cuckoo_map_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace test {
2121
// Cuckoo Map Test
2222
//===--------------------------------------------------------------------===//
2323

24-
class CuckooMapTests : public PelotonTests {};
24+
class CuckooMapTests : public PelotonTest {};
2525

2626
// Test basic functionality
2727
TEST_F(CuckooMapTests, BasicTest) {

Diff for: test/common/internal_types_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace test {
2424
// Internal Types Test
2525
//===--------------------------------------------------------------------===//
2626

27-
class InternalTypesTests : public PelotonTests {};
27+
class InternalTypesTests : public PelotonTest {};
2828

2929
TEST_F(InternalTypesTests, DatePartTypeTest) {
3030
std::vector<DatePartType> list = {

Diff for: test/common/lock_free_array_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace test {
2121
// LockFreeArray Test
2222
//===--------------------------------------------------------------------===//
2323

24-
class LockFreeArrayTests : public PelotonTests {};
24+
class LockFreeArrayTests : public PelotonTest {};
2525

2626
// Test basic functionality
2727
TEST_F(LockFreeArrayTests, BasicTest) {

Diff for: test/common/logger_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace test {
2020
// Logger Tests
2121
//===--------------------------------------------------------------------===//
2222

23-
class LoggerTests : public PelotonTests {};
23+
class LoggerTests : public PelotonTest {};
2424

2525
TEST_F(LoggerTests, BasicTest) {
2626
LOG_TRACE("trace message");

Diff for: test/common/statement_cache_manager_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace peloton {
2020
namespace test {
2121
// Tests for both statement cache
22-
class StatementCacheTests : public PelotonTests {};
22+
class StatementCacheTests : public PelotonTest {};
2323

2424
TEST_F(StatementCacheTests, InvalidateOneTest) {
2525
// Register the statement cache to the statement cache manager

Diff for: test/common/statement_cache_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
namespace peloton {
1919
namespace test {
2020
// Tests for both statement cache
21-
class StatementCacheTests : public PelotonTests {};
21+
class StatementCacheTests : public PelotonTest {};
2222

2323
// Test statementCache add and get statement
2424
TEST_F(StatementCacheTests, AddGetTest) {

Diff for: test/common/thread_pool_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace test {
2020
// Thread Pool Test
2121
//===--------------------------------------------------------------------===//
2222

23-
class ThreadPoolTests : public PelotonTests {};
23+
class ThreadPoolTests : public PelotonTest {};
2424

2525
TEST_F(ThreadPoolTests, BasicTest) {
2626
ThreadPool thread_pool;

Diff for: test/concurrency/anomaly_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace test {
2222
// These test cases are based on the paper:
2323
// -- "A Critique of ANSI SQL Isolation Levels"
2424

25-
class AnomalyTests : public PelotonTests {};
25+
class AnomalyTests : public PelotonTest {};
2626

2727
static std::vector<ProtocolType> PROTOCOL_TYPES = {
2828
ProtocolType::TIMESTAMP_ORDERING};

Diff for: test/concurrency/decentralized_epoch_manager_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace test {
2121
// TransactionContext Tests
2222
//===--------------------------------------------------------------------===//
2323

24-
class DecentralizedEpochManagerTests : public PelotonTests {};
24+
class DecentralizedEpochManagerTests : public PelotonTest {};
2525

2626
TEST_F(DecentralizedEpochManagerTests, Test) {
2727
concurrency::EpochManagerFactory::Configure(EpochType::DECENTRALIZED_EPOCH);

Diff for: test/concurrency/local_epoch_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace test {
2020
// TransactionContext Tests
2121
//===--------------------------------------------------------------------===//
2222

23-
class LocalEpochTests : public PelotonTests {};
23+
class LocalEpochTests : public PelotonTest {};
2424

2525
TEST_F(LocalEpochTests, EpochCompareTest) {
2626
concurrency::EpochCompare comp;

Diff for: test/concurrency/multi_granularity_access_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace test {
2020
// Multi-Granularity Access Tests
2121
//===--------------------------------------------------------------------===//
2222

23-
class MultiGranularityAccessTests : public PelotonTests {};
23+
class MultiGranularityAccessTests : public PelotonTest {};
2424

2525
static std::vector<ProtocolType> PROTOCOL_TYPES = {
2626
ProtocolType::TIMESTAMP_ORDERING};

Diff for: test/concurrency/mvcc_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace test {
2323
// TransactionContext Tests
2424
//===--------------------------------------------------------------------===//
2525

26-
class MVCCTests : public PelotonTests {};
26+
class MVCCTests : public PelotonTest {};
2727

2828
static std::vector<ProtocolType> PROTOCOL_TYPES = {
2929
ProtocolType::TIMESTAMP_ORDERING};

Diff for: test/concurrency/serializable_transaction_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace test {
2020
// Serializable TransactionContext Tests
2121
//===--------------------------------------------------------------------===//
2222

23-
class SerializableTransactionTests : public PelotonTests {};
23+
class SerializableTransactionTests : public PelotonTest {};
2424

2525
static std::vector<ProtocolType> PROTOCOL_TYPES = {
2626
ProtocolType::TIMESTAMP_ORDERING};

Diff for: test/concurrency/timestamp_ordering_transaction_manager_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace test {
2222
// TransactionContext Tests
2323
//===--------------------------------------------------------------------===//
2424

25-
class TimestampOrderingTransactionManagerTests : public PelotonTests {};
25+
class TimestampOrderingTransactionManagerTests : public PelotonTest {};
2626

2727
TEST_F(TimestampOrderingTransactionManagerTests, Test) {
2828
concurrency::TransactionManagerFactory::Configure(

Diff for: test/executor/aggregate_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ using ::testing::Return;
3838
namespace peloton {
3939
namespace test {
4040

41-
class AggregateTests : public PelotonTests {};
41+
class AggregateTests : public PelotonTest {};
4242

4343
TEST_F(AggregateTests, SortedDistinctTest) {
4444
// SELECT d, a, b, c FROM table GROUP BY a, b, c, d;

Diff for: test/executor/append_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace test {
3434

3535
namespace {
3636

37-
class AppendTests : public PelotonTests {};
37+
class AppendTests : public PelotonTest {};
3838

3939
void RunTest(executor::AppendExecutor &executor, size_t expected_num_tuples) {
4040
EXPECT_TRUE(executor.Init());

Diff for: test/executor/copy_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace test {
3636
// Copy Tests
3737
//===--------------------------------------------------------------------===//
3838

39-
class CopyTests : public PelotonTests {};
39+
class CopyTests : public PelotonTest {};
4040

4141
TEST_F(CopyTests, CopyingTest) {
4242
auto catalog = catalog::Catalog::GetInstance();

Diff for: test/executor/create_index_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace test {
4343
// Catalog Tests
4444
//===--------------------------------------------------------------------===//
4545

46-
class CreateIndexTests : public PelotonTests {};
46+
class CreateIndexTests : public PelotonTest {};
4747

4848
TEST_F(CreateIndexTests, CreatingIndexTest) {
4949
LOG_INFO("Bootstrapping...");

Diff for: test/executor/create_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace test {
3939
// Catalog Tests
4040
//===--------------------------------------------------------------------===//
4141

42-
class CreateTests : public PelotonTests {};
42+
class CreateTests : public PelotonTest {};
4343

4444
TEST_F(CreateTests, CreatingDBTest) {
4545
// Bootstrap

Diff for: test/executor/delete_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace test {
4242
// Catalog Tests
4343
//===--------------------------------------------------------------------===//
4444

45-
class DeleteTests : public PelotonTests {};
45+
class DeleteTests : public PelotonTest {};
4646

4747
void ShowTable(std::string database_name, std::string table_name) {
4848
// auto table =

Diff for: test/executor/drop_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace test {
3535
// Catalog Tests
3636
//===--------------------------------------------------------------------===//
3737

38-
class DropTests : public PelotonTests {};
38+
class DropTests : public PelotonTest {};
3939

4040
TEST_F(DropTests, DroppingDatabaseTest) {
4141
auto catalog = catalog::Catalog::GetInstance();

Diff for: test/executor/hash_set_op_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ using ::testing::Return;
3232
namespace peloton {
3333
namespace test {
3434

35-
class HashSetOptTests : public PelotonTests {};
35+
class HashSetOptTests : public PelotonTest {};
3636

3737
namespace {
3838

Diff for: test/executor/index_scan_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ using ::testing::Return;
4141
namespace peloton {
4242
namespace test {
4343

44-
class IndexScanTests : public PelotonTests {};
44+
class IndexScanTests : public PelotonTest {};
4545

4646
// Index scan of table with index predicate.
4747
TEST_F(IndexScanTests, IndexPredicateTest) {

Diff for: test/executor/insert_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace test {
3131
// Catalog Tests
3232
//===--------------------------------------------------------------------===//
3333

34-
class InsertTests : public PelotonTests {};
34+
class InsertTests : public PelotonTest {};
3535

3636
TEST_F(InsertTests, InsertRecordTest) {
3737
catalog::Catalog::GetInstance();

Diff for: test/executor/join_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ using ::testing::InSequence;
5252
namespace peloton {
5353
namespace test {
5454

55-
class JoinTests : public PelotonTests {};
55+
class JoinTests : public PelotonTest {};
5656

5757
std::vector<planner::MergeJoinPlan::JoinClause> CreateJoinClauses() {
5858
std::vector<planner::MergeJoinPlan::JoinClause> join_clauses;

Diff for: test/executor/limit_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ using ::testing::Return;
3636
namespace peloton {
3737
namespace test {
3838

39-
class LimitTests : public PelotonTests {};
39+
class LimitTests : public PelotonTest {};
4040

4141
namespace {
4242

Diff for: test/executor/loader_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ namespace test {
4848
// Loader Tests
4949
//===--------------------------------------------------------------------===//
5050

51-
class LoaderTests : public PelotonTests {};
51+
class LoaderTests : public PelotonTest {};
5252

5353
std::atomic<int> loader_tuple_id;
5454

Diff for: test/executor/logical_tile_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace test {
3838
// Logical Tile Tests
3939
//===--------------------------------------------------------------------===//
4040

41-
class LogicalTileTests : public PelotonTests {};
41+
class LogicalTileTests : public PelotonTest {};
4242

4343
TEST_F(LogicalTileTests, TempTableTest) {
4444
const int tuple_count = TESTS_TUPLES_PER_TILEGROUP;

0 commit comments

Comments
 (0)