Merge pull request #1252 from zhaoguoquan94/new_standardize_macro

Standardize macro names. PL_* -> PELOTON_*.

Author: pervazea

script/coding_style.md

@@ -21,7 +21,7 @@ Another measure of the function is the number of local variables.  They shouldn'
 
 **PRINTF** Refrain from using `printf` and `std::cout`. Instead use the logging macros, such as LOG_LEVEL_INFO, in `common/logger.h`.
 
-**DON'T REINVENT THE MACROS** Use `PL_ASSERT` in `common/macros.h` instead of regular `assert`. This header file icontains a number of macros that you should use, rather than explicitly coding some variant of them yourself.
+**DON'T REINVENT THE MACROS** Use `PELOTON_ASSERT` in `common/macros.h` instead of regular `assert`. This header file icontains a number of macros that you should use, rather than explicitly coding some variant of them yourself.
 
 **PLAFORM-SPECIFIC CODE** Add platform-specific code only to `common/platform.h`.
 
@@ -53,7 +53,7 @@ The example above illustrates a valid use of the `inline` keyword for the defini
 
 **EDITOR MODELINES** Some editors can interpret configuration information embedded in source files, indicated with special markers.  For example, emacs interprets lines marked like this:	-*- mode: c -*-. Do NOT include any of these in source files. People have their own personal editor configurations, and your source files should not override them.
 
-**ALLOCATING MEMORY** Use `PL_MEMCPY` macro in `common/macros.h`. Always use smart pointers, such as `std::unique_ptr`, to simplify memory management.
+**ALLOCATING MEMORY** Use `PELOTON_MEMCPY` macro in `common/macros.h`. Always use smart pointers, such as `std::unique_ptr`, to simplify memory management.
 
 **PRINTING PELOTON MESSAGES** Peloton developers like to be seen as literate. Do mind the spelling of messages to make a good impression. Do not use crippled words like "dont"; use "do not" or "don't" instead.  Make the messages concise, clear, and unambiguous. Use appropriate log levels, such as LOG_LEVEL_TRACE, in `common/logger.h`. Coming up with good debugging messages can be quite a challenge; and once you have them, they can be a huge help for troubleshooting.
 

src/binder/bind_node_visitor.cpp

@@ -233,7 +233,7 @@ void BindNodeVisitor::Visit(expression::TupleValueExpression *expr) {
                    context_, table_name, col_name, value_type, depth))
         throw Exception("Invalid table reference " + expr->GetTableName());
     }
-    PL_ASSERT(!expr->GetIsBound());
+    PELOTON_ASSERT(!expr->GetIsBound());
     expr->SetDepth(depth);
     expr->SetColName(col_name);
     expr->SetValueType(value_type);

src/brain/cluster.cpp

@@ -39,7 +39,7 @@ void Cluster::UpdateCentroid(
     std::map<std::string, std::vector<double>> &features) {
   int num_features = centroid_.size();
   std::fill(centroid_.begin(), centroid_.end(), 0);
-  PL_ASSERT(templates_.size() != 0);
+  PELOTON_ASSERT(templates_.size() != 0);
 
   for (auto fingerprint : templates_) {
     auto feature = features[fingerprint];

src/brain/tf_session_entity/tf_session_entity.cpp

@@ -56,7 +56,7 @@ void TFSE_TYPE::ImportGraph(const std::string &filename) {
   TF_GraphImportGraphDef(graph_, graph_def, opts, status_);
   TF_DeleteImportGraphDefOptions(opts);
   TF_DeleteBuffer(graph_def);
-  PL_ASSERT(IsStatusOk());
+  PELOTON_ASSERT(IsStatusOk());
 }
 
 TFSE_TEMPLATE_ARGUMENTS
@@ -118,7 +118,7 @@ OutputType *TFSE_TYPE::Eval(
                 &(outs.at(0)), &(out_vals.at(0)), outs.size(),  // Outputs
                 nullptr, 0,                                     // Operations
                 nullptr, status_);
-  PL_ASSERT(TF_GetCode(status_) == TF_OK);
+  PELOTON_ASSERT(TF_GetCode(status_) == TF_OK);
   return static_cast<OutputType *>(TF_TensorData(out_vals.at(0)));
 }
 
@@ -140,7 +140,7 @@ void TFSE_TYPE::Eval(const std::vector<TfSessionEntityInput<InputType>>& helper_
                 nullptr, nullptr, 0,  // Outputs
                 &op, 1,               // Operations
                 nullptr, status_);
-  PL_ASSERT(TF_GetCode(status_) == TF_OK);
+  PELOTON_ASSERT(TF_GetCode(status_) == TF_OK);
 }
 
 /*

src/brain/tf_session_entity/tf_session_entity_input.cpp

@@ -22,7 +22,7 @@ TFSEIN_TYPE::TfSessionEntityInput(const InputType& input, const std::string &op)
   this->tensor_ =
       TF_AllocateTensor(this->data_type_, nullptr, 0, sizeof(InputType));
   auto buff = (InputType *)TF_TensorData(this->tensor_);
-  PL_MEMCPY(buff, &input_for_tf, sizeof(InputType));
+  PELOTON_MEMCPY(buff, &input_for_tf, sizeof(InputType));
 }
 
 // 1d vector
@@ -36,7 +36,7 @@ TFSEIN_TYPE::TfSessionEntityInput(const std::vector<InputType> &input,
   this->tensor_ =
       TF_AllocateTensor(this->data_type_, dims, 1, dims[0] * sizeof(InputType));
   auto buff = (InputType *)TF_TensorData(this->tensor_);
-  PL_MEMCPY(buff, input_for_tf, dims[0] * sizeof(InputType));
+  PELOTON_MEMCPY(buff, input_for_tf, dims[0] * sizeof(InputType));
 }
 
 // 2d vector
@@ -51,7 +51,7 @@ TFSEIN_TYPE::TfSessionEntityInput(const std::vector<std::vector<InputType>>& inp
   this->tensor_ = TF_AllocateTensor(this->data_type_, dims, 2,
                                     dims[0] * dims[1] * sizeof(InputType));
   auto buff = (InputType *)TF_TensorData(this->tensor_);
-  PL_MEMCPY(buff, input_for_tf, dims[0] * dims[1] * sizeof(InputType));
+  PELOTON_MEMCPY(buff, input_for_tf, dims[0] * dims[1] * sizeof(InputType));
 }
 
 // raw flattened input
@@ -68,7 +68,7 @@ TFSEIN_TYPE::TfSessionEntityInput(InputType *input, const std::vector<int64_t>&
   this->tensor_ = TF_AllocateTensor(this->data_type_, dims.data(), dims.size(),
                                     num_elems * sizeof(InputType));
   auto buff = (InputType *)TF_TensorData(this->tensor_);
-  PL_MEMCPY(buff, input_for_tf, num_elems * sizeof(InputType));
+  PELOTON_MEMCPY(buff, input_for_tf, num_elems * sizeof(InputType));
 }
 
 // Flattens 2d inputs

src/catalog/abstract_catalog.cpp

@@ -125,10 +125,10 @@ bool AbstractCatalog::DeleteWithIndexScan(
   // Index scan as child node
   std::vector<oid_t> column_offsets;  // No projection
   auto index = catalog_table_->GetIndex(index_offset);
-  PL_ASSERT(index != nullptr);
+  PELOTON_ASSERT(index != nullptr);
   std::vector<oid_t> key_column_offsets =
       index->GetMetadata()->GetKeySchema()->GetIndexedColumns();
-  PL_ASSERT(values.size() == key_column_offsets.size());
+  PELOTON_ASSERT(values.size() == key_column_offsets.size());
   std::vector<ExpressionType> expr_types(values.size(),
                                          ExpressionType::COMPARE_EQUAL);
   std::vector<expression::AbstractExpression *> runtime_keys;
@@ -173,7 +173,7 @@ AbstractCatalog::GetResultWithIndexScan(
   auto index = catalog_table_->GetIndex(index_offset);
   std::vector<oid_t> key_column_offsets =
       index->GetMetadata()->GetKeySchema()->GetIndexedColumns();
-  PL_ASSERT(values.size() == key_column_offsets.size());
+  PELOTON_ASSERT(values.size() == key_column_offsets.size());
   std::vector<ExpressionType> expr_types(values.size(),
                                          ExpressionType::COMPARE_EQUAL);
   std::vector<expression::AbstractExpression *> runtime_keys;

src/catalog/catalog.cpp

@@ -639,7 +639,7 @@ ResultType Catalog::DropIndex(const std::string &index_name,
 storage::Database *Catalog::GetDatabaseWithName(
     const std::string &database_name,
     concurrency::TransactionContext *txn) const {
-  PL_ASSERT(txn != nullptr);
+  PELOTON_ASSERT(txn != nullptr);
 
   // Check in pg_database using txn
   auto database_object =
@@ -660,7 +660,7 @@ storage::Database *Catalog::GetDatabaseWithName(
 storage::DataTable *Catalog::GetTableWithName(
     const std::string &database_name, const std::string &table_name,
     concurrency::TransactionContext *txn) {
-  PL_ASSERT(txn != nullptr);
+  PELOTON_ASSERT(txn != nullptr);
 
   LOG_TRACE("Looking for table %s in database %s", table_name.c_str(),
             database_name.c_str());

src/catalog/catalog_cache.cpp

@@ -62,7 +62,7 @@ bool CatalogCache::EvictDatabaseObject(oid_t database_oid) {
   }
 
   auto database_object = it->second;
-  PL_ASSERT(database_object);
+  PELOTON_ASSERT(database_object);
   database_objects_cache.erase(it);
   database_name_cache.erase(database_object->GetDatabaseName());
   return true;
@@ -79,7 +79,7 @@ bool CatalogCache::EvictDatabaseObject(const std::string &database_name) {
   }
 
   auto database_object = it->second;
-  PL_ASSERT(database_object);
+  PELOTON_ASSERT(database_object);
   database_name_cache.erase(it);
   database_objects_cache.erase(database_object->GetDatabaseOid());
   return true;

src/catalog/column_catalog.cpp

@@ -226,7 +226,7 @@ ColumnCatalog::GetColumnObjects(oid_t table_oid,
   // try get from cache
   auto table_object =
       TableCatalog::GetInstance()->GetTableObject(table_oid, txn);
-  PL_ASSERT(table_object && table_object->GetTableOid() == table_oid);
+  PELOTON_ASSERT(table_object && table_object->GetTableOid() == table_oid);
   auto column_objects = table_object->GetColumnObjects(true);
   if (column_objects.size() != 0) return column_objects;
 

src/catalog/column_stats_catalog.cpp

@@ -140,13 +140,13 @@ std::unique_ptr<std::vector<type::Value>> ColumnStatsCatalog::GetColumnStats(
   auto result_tiles =
       GetResultWithIndexScan(column_ids, index_offset, values, txn);
 
-  PL_ASSERT(result_tiles->size() <= 1);  // unique
+  PELOTON_ASSERT(result_tiles->size() <= 1);  // unique
   if (result_tiles->size() == 0) {
     return nullptr;
   }
 
   auto tile = (*result_tiles)[0].get();
-  PL_ASSERT(tile->GetTupleCount() <= 1);
+  PELOTON_ASSERT(tile->GetTupleCount() <= 1);
   if (tile->GetTupleCount() == 0) {
     return nullptr;
   }
@@ -190,7 +190,7 @@ size_t ColumnStatsCatalog::GetTableStats(
   auto result_tiles =
       GetResultWithIndexScan(column_ids, index_offset, values, txn);
 
-  PL_ASSERT(result_tiles->size() <= 1);  // unique
+  PELOTON_ASSERT(result_tiles->size() <= 1);  // unique
   if (result_tiles->size() == 0) {
     return 0;
   }