address review request

Author: Tianyi Chen

src/executor/plan_executor.cpp

@@ -63,19 +63,19 @@ static void CompileAndExecutePlan(
     codegen::QueryCache::Instance().Add(plan, std::move(compiled_query));
   }
 
-  auto on_query_result = [&on_complete,
-                          &consumer](executor::ExecutionResult result) {
-    std::vector<ResultValue> values;
-    for (const auto &tuple : consumer.GetOutputTuples()) {
-      for (uint32_t i = 0; i < tuple.tuple_.size(); i++) {
-        auto column_val = tuple.GetValue(i);
-        auto str = column_val.IsNull() ? "" : column_val.ToString();
-        LOG_TRACE("column content: [%s]", str.c_str());
-        values.push_back(std::move(str));
-      }
-    }
-    on_complete(result, std::move(values));
-  };
+  auto on_query_result =
+      [&on_complete, &consumer](executor::ExecutionResult result) {
+        std::vector<ResultValue> values;
+        for (const auto &tuple : consumer.GetOutputTuples()) {
+          for (uint32_t i = 0; i < tuple.tuple_.size(); i++) {
+            auto column_val = tuple.GetValue(i);
+            auto str = column_val.IsNull() ? "" : column_val.ToString();
+            LOG_TRACE("column content: [%s]", str.c_str());
+            values.push_back(std::move(str));
+          }
+        }
+        on_complete(result, std::move(values));
+      };
 
   query->Execute(std::move(executor_context), consumer, on_query_result);
 }
@@ -100,7 +100,7 @@ static void InterpretPlan(
   status = executor_tree->Init();
   if (status != true) {
     result.m_result = ResultType::FAILURE;
-    result.m_error_message = "Executor tree init failed";
+    result.m_error_message = "Failed initialization of query execution tree";
     CleanExecutorTree(executor_tree.get());
     on_complete(result, std::move(values));
     return;
@@ -157,7 +157,8 @@ void PlanExecutor::ExecutePlan(
     ExecutionResult result;
     result.m_result = ResultType::FAILURE;
     result.m_error_message = e.what();
-    LOG_ERROR("error thrown in Execution: %s", result.m_error_message.c_str());
+    LOG_ERROR("Error thrown during execution: %s",
+              result.m_error_message.c_str());
     on_complete(result, {});
   }
 }

src/planner/insert_plan.cpp

@@ -37,9 +37,7 @@ InsertPlan::InsertPlan(storage::DataTable *table,
     for (uint32_t tuple_idx = 0; tuple_idx < insert_values->size();
          tuple_idx++) {
       auto &values = (*insert_values)[tuple_idx];
-      if (values.size() > schema->GetColumnCount()) {
-        throw Exception("Column size does not match");
-      }
+      PL_ASSERT(values.size() <= schema->GetColumnCount());
       uint32_t param_idx = 0;
       for (uint32_t column_id = 0; column_id < values.size(); column_id++) {
         auto &exp = values[column_id];
@@ -68,9 +66,7 @@ InsertPlan::InsertPlan(storage::DataTable *table,
   }
   // INSERT INTO table_name (col1, col2, ...) VALUES (val1, val2, ...);
   else {
-    if (columns->size() > schema->GetColumnCount()) {
-      throw Exception("Column size does not match");
-    }
+    PL_ASSERT(columns->size() <= schema->GetColumnCount());
     for (uint32_t tuple_idx = 0; tuple_idx < insert_values->size();
          tuple_idx++) {
       auto &values = (*insert_values)[tuple_idx];