Merge pull request #1138 from pervazea/cleanup

Small code cleanups

Author: pervazea

src/common/init.cpp

@@ -36,7 +36,6 @@ void PelotonInit::Initialize() {
   LOGGING_THREAD_COUNT = 1;
   GC_THREAD_COUNT = 1;
   EPOCH_THREAD_COUNT = 1;
-  MAX_CONCURRENCY = 10;
 
   // set max thread number.
   thread_pool.Initialize(0, CONNECTION_THREAD_COUNT + 3);

src/common/internal_types.cpp

@@ -37,7 +37,6 @@ size_t CONNECTION_THREAD_COUNT = 1;
 size_t LOGGING_THREAD_COUNT = 1;
 size_t GC_THREAD_COUNT = 1;
 size_t EPOCH_THREAD_COUNT = 1;
-size_t MAX_CONCURRENCY = 10;
 
 //===--------------------------------------------------------------------===//
 // DatePart <--> String Utilities

src/include/catalog/abstract_catalog.h

@@ -81,7 +81,7 @@ class AbstractCatalog {
   //===--------------------------------------------------------------------===//
 
   // Maximum column name size for catalog schemas
-  static const size_t max_name_size = 32;
+  static const size_t max_name_size = 64;
 
   // Local oid (without catalog type mask) starts from START_OID + OID_OFFSET
   std::atomic<oid_t> oid_ = ATOMIC_VAR_INIT(START_OID + OID_OFFSET);

src/include/common/internal_types.h

@@ -1160,7 +1160,6 @@ extern size_t CONNECTION_THREAD_COUNT;
 extern size_t LOGGING_THREAD_COUNT;
 extern size_t GC_THREAD_COUNT;
 extern size_t EPOCH_THREAD_COUNT;
-extern size_t MAX_CONCURRENCY;
 
 //===--------------------------------------------------------------------===//
 // TupleMetadata

src/network/peloton_server.cpp

@@ -120,7 +120,7 @@ void PelotonServer::SSLInit() {
   // load trusted CA certificates (peer authentication)
   if (SSL_CTX_load_verify_locations(ssl_context, certificate_file_.c_str(),
                                     nullptr) != 1) {
-    LOG_ERROR("Exception when loading root_crt!");
+    LOG_WARN("Exception when loading root_crt!");
     SetSSLLevel(SSLLevel::SSL_PREFER);
   }
   // load OpenSSL's default CA certificate location
@@ -133,7 +133,7 @@ void PelotonServer::SSLInit() {
   if (SSL_CTX_use_certificate_chain_file(ssl_context,
                                          certificate_file_.c_str()) != 1) {
     SSL_CTX_free(ssl_context);
-    LOG_ERROR("Exception when loading server certificate!");
+    LOG_WARN("Exception when loading server certificate!");
     ssl_context = nullptr;
     SetSSLLevel(SSLLevel::SSL_DISABLE);
     return;

src/storage/data_table.cpp

@@ -350,7 +350,7 @@ ItemPointer DataTable::InsertTuple(const storage::Tuple *tuple,
 
 bool DataTable::InsertTuple(const AbstractTuple *tuple,
     ItemPointer location, concurrency::TransactionContext *transaction,
-    ItemPointer **index_entry_ptr, UNUSED_ATTRIBUTE bool check_fk) {
+    ItemPointer **index_entry_ptr, bool check_fk) {
   if (CheckConstraints(tuple) == false) {
     LOG_TRACE("InsertTuple(): Constraint violated");
     return false;
@@ -591,7 +591,7 @@ bool DataTable::CheckForeignKeySrcAndCascade(storage::Tuple *prev_tuple,
                                              storage::Tuple *new_tuple,
                                              concurrency::TransactionContext *current_txn,
                                              executor::ExecutorContext *context,
-                                             bool is_update UNUSED_ATTRIBUTE)
+                                             bool is_update)
 {
   size_t fk_count = GetForeignKeySrcCount();
 
@@ -739,6 +739,8 @@ bool DataTable::CheckForeignKeySrcAndCascade(storage::Tuple *prev_tuple,
   return true;
 }
 
+// PA - looks like the FIXME has been done. We check to see if the key
+// is visible
 /**
  * @brief Check if all the foreign key constraints on this table
  * is satisfied by checking whether the key exist in the referred table
@@ -753,8 +755,8 @@ bool DataTable::CheckForeignKeySrcAndCascade(storage::Tuple *prev_tuple,
  * @returns True on success, false if any foreign key constraints fail
  */
 bool DataTable::CheckForeignKeyConstraints(
-    const AbstractTuple *tuple UNUSED_ATTRIBUTE,
-    concurrency::TransactionContext *transaction UNUSED_ATTRIBUTE) {
+    const AbstractTuple *tuple,
+    concurrency::TransactionContext *transaction) {
   for (auto foreign_key : foreign_keys_) {
     oid_t sink_table_id = foreign_key->GetSinkTableOid();
     storage::DataTable *ref_table = nullptr;
@@ -774,7 +776,6 @@ bool DataTable::CheckForeignKeyConstraints(
 
       // The foreign key constraints only refer to the primary key
       if (index->GetIndexType() == IndexConstraintType::PRIMARY_KEY) {
-
         std::vector<oid_t> key_attrs = foreign_key->GetSinkColumnIds();
         std::unique_ptr<catalog::Schema> foreign_key_schema(
             catalog::Schema::CopySchema(ref_table->schema, key_attrs));
@@ -783,11 +784,10 @@ bool DataTable::CheckForeignKeyConstraints(
         key->SetFromTuple(tuple, foreign_key->GetSourceColumnIds(), index->GetPool());
 
         LOG_TRACE("check key: %s", key->GetInfo().c_str());
-
         std::vector<ItemPointer *> location_ptrs;
         index->ScanKey(key.get(), location_ptrs);
 
-        // if this key doesn't exist in the refered column
+        // if this key doesn't exist in the referred column
         if (location_ptrs.size() == 0) {
           LOG_DEBUG("The key: %s does not exist in table %s\n",
                     key->GetInfo().c_str(),

src/storage/temp_table.cpp

@@ -80,6 +80,7 @@ ItemPointer TempTable::InsertTuple(
 
   return (location);
 }
+
 ItemPointer TempTable::InsertTuple(const Tuple *tuple) {
   return (this->InsertTuple(tuple, nullptr, nullptr));
 }