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

Commit b9b54a4

Browse files
committed
fix merged PL_ASSERT
1 parent 21baed6 commit b9b54a4

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/include/common/macros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ namespace peloton {
7676
// we'll never return
7777
#define PELOTON_UNIMPLEMENTED(what) \
7878
do { \
79-
PL_ASSERT(false); \
79+
PELOTON_ASSERT(false); \
8080
throw ::std::runtime_error(what); \
8181
} while (0)
8282

src/main/logger/logger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
// //===--------------------------------------------------------------------===//
8080
// else if (logging::LoggingUtil::IsBasedOnWriteBehindLogging(peloton_logging_mode)) {
8181
// LOG_ERROR("currently, we do not support write behind logging.");
82-
// PL_ASSERT(false);
82+
// PELOTON_ASSERT(false);
8383
// // Test a simple log process
8484
// PrepareLogFile();
8585

src/main/logger/logger_workload.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
// logging::WriteAheadFrontendLogger::wal_directory_path);
258258
// } else {
259259
// LOG_ERROR("currently, we do not support write behind logging.");
260-
// PL_ASSERT(false);
260+
// PELOTON_ASSERT(false);
261261
// }
262262

263263
// UNUSED_ATTRIBUTE auto& checkpoint_manager =

src/optimizer/memo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ GroupExpression *Memo::InsertExpression(std::shared_ptr<GroupExpression> gexpr,
3333
// If leaf, then just return
3434
if (gexpr->Op().GetType() == OpType::Leaf) {
3535
const LeafOperator *leaf = gexpr->Op().As<LeafOperator>();
36-
PL_ASSERT(target_group == UNDEFINED_GROUP ||
36+
PELOTON_ASSERT(target_group == UNDEFINED_GROUP ||
3737
target_group == leaf->origin_group);
3838
gexpr->SetGroupID(leaf->origin_group);
3939
return nullptr;
@@ -43,7 +43,7 @@ GroupExpression *Memo::InsertExpression(std::shared_ptr<GroupExpression> gexpr,
4343
auto it = group_expressions_.find(gexpr.get());
4444

4545
if (it != group_expressions_.end()) {
46-
PL_ASSERT(target_group == UNDEFINED_GROUP ||
46+
PELOTON_ASSERT(target_group == UNDEFINED_GROUP ||
4747
target_group == (*it)->GetGroupID());
4848
gexpr->SetGroupID((*it)->GetGroupID());
4949
return *it;

src/optimizer/operators.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ Operator PhysicalSeqScan::make(
426426
oid_t get_id, std::shared_ptr<catalog::TableCatalogObject> table,
427427
std::string alias, std::vector<AnnotatedExpression> predicates,
428428
bool update) {
429-
PL_ASSERT(table != nullptr);
429+
PELOTON_ASSERT(table != nullptr);
430430
PhysicalSeqScan *scan = new PhysicalSeqScan;
431431
scan->table_ = table;
432432
scan->table_alias = alias;
@@ -465,7 +465,7 @@ Operator PhysicalIndexScan::make(
465465
oid_t index_id, std::vector<oid_t> key_column_id_list,
466466
std::vector<ExpressionType> expr_type_list,
467467
std::vector<type::Value> value_list) {
468-
PL_ASSERT(table != nullptr);
468+
PELOTON_ASSERT(table != nullptr);
469469
PhysicalIndexScan *scan = new PhysicalIndexScan;
470470
scan->table_ = table;
471471
scan->is_for_update = update;

0 commit comments

Comments
 (0)