Renamed 'PlannerResult' to 'StatementResult'. I still don't know what…

… this thing is supposed to be used for or what it contains
cmu-db · Jan 16, 2017 · 413d49c · 413d49c
1 parent ebf31f4
commit 413d49c
Show file tree

Hide file tree

Showing 26 changed files with 46 additions and 45 deletions.
diff --git a/src/executor/plan_executor.cpp b/src/executor/plan_executor.cpp
@@ -44,7 +44,7 @@ void CleanExecutorTree(executor::AbstractExecutor *root);
  */
 peloton_status PlanExecutor::ExecutePlan(
     const planner::AbstractPlan *plan, concurrency::Transaction *txn,
-    const std::vector<type::Value> &params, std::vector<PlannerResult> &result,
+    const std::vector<type::Value> &params, std::vector<StatementResult> &result,
     const std::vector<int> &result_format) {
   peloton_status p_status;
   if (plan == nullptr) return p_status;
@@ -94,7 +94,7 @@ peloton_status PlanExecutor::ExecutePlan(
         for (auto &tuple : answer_tuples) {
           unsigned int col_index = 0;
           for (unsigned int i = 0; i < logical_tile->GetColumnCount(); i++) {
-            auto res = PlannerResult();
+            auto res = StatementResult();
             PlanExecutor::copyFromTo(tuple[col_index++], res.second);
             if (tuple[col_index - 1].c_str() != nullptr) {
               LOG_TRACE("column content: %s", tuple[col_index - 1].c_str());

diff --git a/src/include/common/statement.h b/src/include/common/statement.h
@@ -25,8 +25,9 @@ namespace planner {
 class AbstractPlan;
 }
 
+// TODO: Somebody needs to define what the hell this is???
 typedef std::pair<std::vector<unsigned char>, std::vector<unsigned char>>
-    PlannerResult;
+    StatementResult;
 
 // FIELD INFO TYPE : field name, oid (data type), size
 typedef std::tuple<std::string, oid_t, size_t> FieldInfo;

diff --git a/src/include/executor/plan_executor.h b/src/include/executor/plan_executor.h
@@ -81,7 +81,7 @@ class PlanExecutor {
   static peloton_status ExecutePlan(const planner::AbstractPlan *plan,
                                     concurrency::Transaction* txn,
                                     const std::vector<type::Value> &params,
-                                    std::vector<PlannerResult> &result,
+                                    std::vector<StatementResult> &result,
                                     const std::vector<int> &result_format);
 
   /*

diff --git a/src/include/tcop/tcop.h b/src/include/tcop/tcop.h
@@ -49,7 +49,7 @@ class TrafficCop {
 
   // PortalExec - Execute query string
   ResultType ExecuteStatement(const std::string &query,
-                          std::vector<PlannerResult> &result,
+                          std::vector<StatementResult> &result,
                           std::vector<FieldInfo> &tuple_descriptor,
                           int &rows_changed, std::string &error_message);
 
@@ -58,14 +58,14 @@ class TrafficCop {
       const std::shared_ptr<Statement> &statement,
       const std::vector<type::Value> &params, const bool unnamed,
       std::shared_ptr<stats::QueryMetric::QueryParams> param_stats,
-      const std::vector<int> &result_format, std::vector<PlannerResult> &result,
+      const std::vector<int> &result_format, std::vector<StatementResult> &result,
       int &rows_change, std::string &error_message);
 
   // ExecutePrepStmt - Helper to handle txn-specifics for the plan-tree of a
   // statement
   bridge::peloton_status ExecuteStatementPlan(
       const planner::AbstractPlan *plan, const std::vector<type::Value> &params,
-      std::vector<PlannerResult> &result, const std::vector<int> &result_format);
+      std::vector<StatementResult> &result, const std::vector<int> &result_format);
 
   // InitBindPrepStmt - Prepare and bind a query from a query string
   std::shared_ptr<Statement> PrepareStatement(const std::string &statement_name,

diff --git a/src/include/wire/packet_manager.h b/src/include/wire/packet_manager.h
@@ -112,7 +112,7 @@ class PacketManager {
   void PutTupleDescriptor(const std::vector<FieldInfo>& tuple_descriptor);
 
   // Send each row, one packet at a time, used by SELECT queries
-  void SendDataRows(std::vector<PlannerResult>& results, int colcount,
+  void SendDataRows(std::vector<StatementResult>& results, int colcount,
                     int& rows_affected);
 
   // Used to send a packet that indicates the completion of a query. Also has

diff --git a/src/tcop/tcop.cpp b/src/tcop/tcop.cpp
@@ -130,7 +130,7 @@ ResultType TrafficCop::AbortQueryHelper() {
 }
 
 ResultType TrafficCop::ExecuteStatement(
-    const std::string &query, std::vector<PlannerResult> &result,
+    const std::string &query, std::vector<StatementResult> &result,
     std::vector<FieldInfo> &tuple_descriptor, int &rows_changed,
     std::string &error_message) {
   LOG_TRACE("Received %s", query.c_str());
@@ -165,7 +165,7 @@ ResultType TrafficCop::ExecuteStatement(
     const std::shared_ptr<Statement> &statement,
     const std::vector<type::Value> &params, UNUSED_ATTRIBUTE const bool unnamed,
     std::shared_ptr<stats::QueryMetric::QueryParams> param_stats,
-    const std::vector<int> &result_format, std::vector<PlannerResult> &result,
+    const std::vector<int> &result_format, std::vector<StatementResult> &result,
     int &rows_changed, UNUSED_ATTRIBUTE std::string &error_message) {
   if (FLAGS_stats_mode != STATS_TYPE_INVALID) {
     stats::BackendStatsContext::GetInstance()->InitQueryMetric(statement,
@@ -200,7 +200,7 @@ ResultType TrafficCop::ExecuteStatement(
 
 bridge::peloton_status TrafficCop::ExecuteStatementPlan(
     const planner::AbstractPlan *plan, const std::vector<type::Value> &params,
-    std::vector<PlannerResult> &result, const std::vector<int> &result_format) {
+    std::vector<StatementResult> &result, const std::vector<int> &result_format) {
   concurrency::Transaction *txn;
   bool single_statement_txn = false, init_failure = false;
   bridge::peloton_status p_status;

diff --git a/src/wire/packet_manager.cpp b/src/wire/packet_manager.cpp
@@ -208,7 +208,7 @@ void PacketManager::PutTupleDescriptor(
   responses.push_back(std::move(pkt));
 }
 
-void PacketManager::SendDataRows(std::vector<PlannerResult> &results,
+void PacketManager::SendDataRows(std::vector<StatementResult> &results,
                                  int colcount, int &rows_affected) {
   if (results.empty() || colcount == 0) return;
 
@@ -316,7 +316,7 @@ void PacketManager::ExecQueryMessage(InputPacket *pkt) {
         return;
       }
 
-      std::vector<PlannerResult> result;
+      std::vector<StatementResult> result;
       std::vector<FieldInfo> tuple_descriptor;
       std::string error_message;
       int rows_affected;
@@ -770,7 +770,7 @@ bool PacketManager::ExecDescribeMessage(InputPacket *pkt) {
 
 void PacketManager::ExecExecuteMessage(InputPacket *pkt) {
   // EXECUTE message
-  std::vector<PlannerResult> results;
+  std::vector<StatementResult> results;
   std::string error_message, portal_name;
   int rows_affected = 0;
   GetStringToken(pkt, portal_name);

diff --git a/test/executor/copy_test.cpp b/test/executor/copy_test.cpp
@@ -79,7 +79,7 @@ TEST_F(CopyTests, Copying) {
     auto statement = StatsTestsUtil::GetInsertStmt(12345, insert_str);
     std::vector<type::Value> params;
     std::vector<int> result_format(statement->GetTupleDescriptor().size(), 0);
-    std::vector<PlannerResult> result;
+    std::vector<StatementResult> result;
     bridge::peloton_status status = traffic_cop.ExecuteStatementPlan(
         statement->GetPlanTree().get(), params, result, result_format);
     EXPECT_EQ(status.m_result, peloton::ResultType::SUCCESS);

diff --git a/test/executor/create_index_test.cpp b/test/executor/create_index_test.cpp
@@ -77,7 +77,7 @@ TEST_F(CreateIndexTests, CreatingIndex) {
   LOG_INFO("Building plan tree completed!");
 
   std::vector<type::Value> params;
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   LOG_INFO("Executing plan...\n%s",
            planner::PlanUtil::GetInfo(statement->GetPlanTree().get()).c_str());
   std::vector<int> result_format;

diff --git a/test/executor/delete_test.cpp b/test/executor/delete_test.cpp
@@ -46,7 +46,7 @@ void ShowTable(std::string database_name, std::string table_name) {
   auto& peloton_parser = parser::Parser::GetInstance();
   bridge::peloton_status status;
   std::vector<type::Value> params;
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   optimizer::SimpleOptimizer optimizer;
   auto& traffic_cop = tcop::TrafficCop::GetInstance();
 
@@ -120,7 +120,7 @@ TEST_F(DeleteTests, VariousOperations) {
   statement->SetPlanTree(optimizer.BuildPelotonPlanTree(insert_stmt));
   LOG_INFO("Building plan tree completed!");
   std::vector<type::Value> params;
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   LOG_INFO("Executing plan...\n%s",
            planner::PlanUtil::GetInfo(statement->GetPlanTree().get()).c_str());
   std::vector<int> result_format;

diff --git a/test/executor/update_test.cpp b/test/executor/update_test.cpp
@@ -207,7 +207,7 @@ TEST_F(UpdateTests, UpdatingOld) {
   statement->SetPlanTree(optimizer.BuildPelotonPlanTree(insert_stmt));
   LOG_INFO("Building plan tree completed!");
   std::vector<type::Value> params;
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   LOG_INFO("Executing plan...\n%s",
            planner::PlanUtil::GetInfo(statement->GetPlanTree().get()).c_str());
 

diff --git a/test/include/sql/sql_tests_util.h b/test/include/sql/sql_tests_util.h
@@ -40,7 +40,7 @@ class SQLTestsUtil {
 
   // Execute a SQL query end-to-end
   static ResultType ExecuteSQLQuery(const std::string query,
-                                std::vector<PlannerResult> &result,
+                                std::vector<StatementResult> &result,
                                 std::vector<FieldInfo> &tuple_descriptor,
                                 int &rows_affected, std::string &error_message);
 
@@ -50,7 +50,7 @@ class SQLTestsUtil {
   // the refactor by Siddharth
   static ResultType ExecuteSQLQueryWithOptimizer(
       std::unique_ptr<optimizer::AbstractOptimizer> &optimizer,
-      const std::string query, std::vector<PlannerResult> &result,
+      const std::string query, std::vector<StatementResult> &result,
       std::vector<FieldInfo> &tuple_descriptor, int &rows_changed,
       std::string &error_message);
 
@@ -61,7 +61,7 @@ class SQLTestsUtil {
 
   // A simpler wrapper around ExecuteSQLQuery
   static ResultType ExecuteSQLQuery(const std::string query,
-                                std::vector<PlannerResult> &result);
+                                std::vector<StatementResult> &result);
 
   // A another simpler wrapper around ExecuteSQLQuery
   static ResultType ExecuteSQLQuery(const std::string query);
@@ -70,7 +70,7 @@ class SQLTestsUtil {
   // NOTE: Result columns across different rows are unfolded into a single
   // vector (vector<ResultType>).
   static std::string GetResultValueAsString(
-      const std::vector<PlannerResult> &result, size_t index) {
+      const std::vector<StatementResult> &result, size_t index) {
     std::string value(result[index].second.begin(), result[index].second.end());
 
     return std::move(value);

diff --git a/test/optimizer/hash_join_test.cpp b/test/optimizer/hash_join_test.cpp
@@ -56,7 +56,7 @@ TEST_F(OptimizerTests, HashJoinTest) {
   statement->SetPlanTree(optimizer.BuildPelotonPlanTree(create_stmt));
 
   std::vector<type::Value> params;
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<int> result_format;
   result_format =
       std::move(std::vector<int>(statement->GetTupleDescriptor().size(), 0));

diff --git a/test/optimizer/simple_optimizer_test.cpp b/test/optimizer/simple_optimizer_test.cpp
@@ -62,7 +62,7 @@ TEST_F(SimpleOptimizerTests, UpdateDelWithIndexScanTest) {
   statement->SetPlanTree(optimizer.BuildPelotonPlanTree(create_stmt));
 
   std::vector<type::Value> params;
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   LOG_TRACE("Query Plan:\n%s",
             planner::PlanUtil::GetInfo(statement->GetPlanTree().get()).c_str());
   std::vector<int> result_format;

diff --git a/test/sql/aggregate_sql_test.cpp b/test/sql/aggregate_sql_test.cpp
@@ -31,7 +31,7 @@ TEST_F(AggregateSQLTests, EmptyTableTest) {
   // Create a table first
   SQLTestsUtil::ExecuteSQLQuery("CREATE TABLE xxx(a INT PRIMARY KEY, b INT);");
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_affected;
@@ -95,7 +95,7 @@ TEST_F(AggregateSQLTests, MinMaxTest) {
 
   SQLTestsUtil::ShowTable(DEFAULT_DB_NAME, "test");
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_affected;

diff --git a/test/sql/drop_sql_test.cpp b/test/sql/drop_sql_test.cpp
@@ -41,7 +41,7 @@ TEST_F(DropSQLTests, DropTableTest) {
   }
   EXPECT_NE(table, nullptr);
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_affected;

diff --git a/test/sql/index_scan_sql_test.cpp b/test/sql/index_scan_sql_test.cpp
@@ -37,7 +37,7 @@ TEST_F(IndexScanSQLTests, SQLTest) {
       "VARCHAR);");
   LOG_INFO("Table created!");
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   // Inserting a tuple end-to-end
   LOG_INFO("Inserting a tuple...");
   SQLTestsUtil::ExecuteSQLQuery(

diff --git a/test/sql/optimizer_sql_test.cpp b/test/sql/optimizer_sql_test.cpp
@@ -40,7 +40,7 @@ TEST_F(OptimizerSQLTests, SimpleSelectTest) {
 
   CreateAndLoadTable();
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_changed;
@@ -82,7 +82,7 @@ TEST_F(OptimizerSQLTests, SelectProjectionTest) {
 
   CreateAndLoadTable();
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_changed;

diff --git a/test/sql/order_by_queries_sql_test.cpp b/test/sql/order_by_queries_sql_test.cpp
@@ -42,7 +42,7 @@ TEST_F(OrderByQueriesSQLTests, OrderByWithColumnsTest) {
 
   CreateAndLoadTable();
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_changed;
@@ -75,7 +75,7 @@ TEST_F(OrderByQueriesSQLTests, OrderByWithoutColumnsTest) {
 
   CreateAndLoadTable();
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_changed;
@@ -109,7 +109,7 @@ TEST_F(OrderByQueriesSQLTests, OrderByWithColumnsAndLimitTest) {
 
   CreateAndLoadTable();
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_changed;
@@ -141,7 +141,7 @@ TEST_F(OrderByQueriesSQLTests, OrderByWithoutColumnsAndLimitTest) {
 
   CreateAndLoadTable();
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_changed;

diff --git a/test/sql/order_by_sql_test.cpp b/test/sql/order_by_sql_test.cpp
@@ -52,7 +52,7 @@ TEST_F(OrderBySQLTests, PerformanceTest) {
 
   SQLTestsUtil::ShowTable(DEFAULT_DB_NAME, "test");
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_affected;

diff --git a/test/sql/projection_sql_test.cpp b/test/sql/projection_sql_test.cpp
@@ -35,7 +35,7 @@ TEST_F(ProjectionSQLTests, ProjectionSQLTest) {
   // Insert tuples into table
   SQLTestsUtil::ExecuteSQLQuery("INSERT INTO test VALUES (1, 10, 100);");
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_affected;

diff --git a/test/sql/sql_tests_util.cpp b/test/sql/sql_tests_util.cpp
@@ -52,7 +52,7 @@ void SQLTestsUtil::ShowTable(std::string database_name,
 
 // Execute a SQL query end-to-end
 ResultType SQLTestsUtil::ExecuteSQLQuery(
-    const std::string query, std::vector<PlannerResult> &result,
+    const std::string query, std::vector<StatementResult> &result,
     std::vector<FieldInfo> &tuple_descriptor, int &rows_changed,
     std::string &error_message) {
   LOG_INFO("Query: %s", query.c_str());
@@ -66,7 +66,7 @@ ResultType SQLTestsUtil::ExecuteSQLQuery(
 // Execute a SQL query end-to-end with the specific optimizer
 ResultType SQLTestsUtil::ExecuteSQLQueryWithOptimizer(
     std::unique_ptr<optimizer::AbstractOptimizer> &optimizer,
-    const std::string query, std::vector<PlannerResult> &result,
+    const std::string query, std::vector<StatementResult> &result,
     std::vector<FieldInfo> &tuple_descriptor, int &rows_changed,
     std::string &error_message) {
   auto &peloton_parser = parser::Parser::GetInstance();
@@ -104,7 +104,7 @@ std::shared_ptr<planner::AbstractPlan> SQLTestsUtil::GeneratePlanWithOptimizer(
 }
 
 ResultType SQLTestsUtil::ExecuteSQLQuery(const std::string query,
-                                         std::vector<PlannerResult> &result) {
+                                         std::vector<StatementResult> &result) {
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_changed;
@@ -117,7 +117,7 @@ ResultType SQLTestsUtil::ExecuteSQLQuery(const std::string query,
 }
 
 ResultType SQLTestsUtil::ExecuteSQLQuery(const std::string query) {
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_changed;

diff --git a/test/sql/update_primary_index_sql_test.cpp b/test/sql/update_primary_index_sql_test.cpp
@@ -38,7 +38,7 @@ TEST_F(UpdatePrimaryIndexSQLTests, UpdatePrimaryIndexTest) {
 
   SQLTestsUtil::ShowTable(DEFAULT_DB_NAME, "test");
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_affected;

diff --git a/test/sql/update_secondary_index_sql_test.cpp b/test/sql/update_secondary_index_sql_test.cpp
@@ -41,7 +41,7 @@ TEST_F(UpdateSecondaryIndexSQLTests, UpdateSecondaryIndexTest) {
 
   SQLTestsUtil::ShowTable(DEFAULT_DB_NAME, "test");
 
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<FieldInfo> tuple_descriptor;
   std::string error_message;
   int rows_affected;

diff --git a/test/statistics/stats_test.cpp b/test/statistics/stats_test.cpp
@@ -386,7 +386,7 @@ TEST_F(StatsTest, PerQueryStatsTest) {
 
   // Execute insert
   std::vector<type::Value> params;
-  std::vector<PlannerResult> result;
+  std::vector<StatementResult> result;
   std::vector<int> result_format(statement->GetTupleDescriptor().size(), 0);
   bridge::peloton_status status = traffic_cop.ExecuteStatementPlan(
       statement->GetPlanTree().get(), params, result, result_format);