Change NeedsPlan to NeedsReplan for statement

Author: Tianyi Chen

src/common/statement_cache.cpp

@@ -56,7 +56,7 @@ void StatementCache::UpdateFromInvalidTableQueue() {
 
   if (invalid_set.size()) {
     for (oid_t id : invalid_set)
-      for (auto &statement : table_ref_[id]) statement->SetNeedsPlan(true);
+      for (auto &statement : table_ref_[id]) statement->SetNeedsReplan(true);
   }
 }
 

src/include/common/statement.h

@@ -81,9 +81,9 @@ class Statement : public Printable {
 
   std::unique_ptr<parser::SQLStatementList> PassStmtParseTreeList() {return std::move(sql_stmt_list_);}
 
-  inline bool GetNeedsPlan() const { return (needs_replan_); }
+  inline bool GetNeedsReplan() const { return (needs_replan_); }
 
-  inline void SetNeedsPlan(bool replan) { needs_replan_ = replan; }
+  inline void SetNeedsReplan(bool replan) { needs_replan_ = replan; }
 
   // Get a string representation for debugging
   const std::string GetInfo() const;

src/traffic_cop/traffic_cop.cpp

@@ -565,12 +565,13 @@ ResultType TrafficCop::ExecuteStatement(
       default:
         // The statement may be out of date
         // It needs to be replan
-        if (statement->GetNeedsPlan()) {
+        if (statement->GetNeedsReplan()) {
           // TODO(Tianyi) Move Statement Replan into Statement's method
           // to increase coherence
           auto plan =
               optimizer_->BuildPelotonPlanTree(statement->GetStmtParseTreeList(), default_database_name_, tcop_txn_state_.top().first);
           statement->SetPlanTree(plan);
+          statement->SetNeedsReplan(true);
         }
 
         ExecuteHelper(statement->GetPlanTree(), params, result,

test/common/statement_cache_manager_test.cpp

@@ -34,23 +34,23 @@ TEST_F(StatementCacheTests, InvalidateOneTest) {
   auto statement = std::make_shared<Statement>(string_name, query);
   statement->SetReferencedTables(ref_table);
 
-  EXPECT_TRUE(!statement->GetNeedsPlan());
+  EXPECT_TRUE(!statement->GetNeedsReplan());
   statement_cache.AddStatement(statement);
 
   // Invalidate table oid 0
   statement_cache_manager->InvalidateTableOid(0);
 
   // The plan need to replan now
   statement = statement_cache.GetStatement(string_name);
-  EXPECT_TRUE(statement->GetNeedsPlan());
+  EXPECT_TRUE(statement->GetNeedsReplan());
 
   // Unregister the statement cache and invalidate again
-  statement->SetNeedsPlan(false);
+  statement->SetNeedsReplan(false);
   statement_cache_manager->UnRegisterStatementCache(&statement_cache);
   statement_cache_manager->InvalidateTableOids(ref_table);
   statement = statement_cache.GetStatement(string_name);
   // This one should not be affected, since the cache is already un-registered
-  EXPECT_TRUE(!statement->GetNeedsPlan());
+  EXPECT_TRUE(!statement->GetNeedsReplan());
 }
 
 TEST_F(StatementCacheTests, InvalidateManyTest) {
@@ -69,7 +69,7 @@ TEST_F(StatementCacheTests, InvalidateManyTest) {
     cur_ref_table.insert(oid);
     statement->SetReferencedTables(cur_ref_table);
 
-    EXPECT_TRUE(!statement->GetNeedsPlan());
+    EXPECT_TRUE(!statement->GetNeedsReplan());
     statement_cache.AddStatement(statement);
   }
 
@@ -81,7 +81,7 @@ TEST_F(StatementCacheTests, InvalidateManyTest) {
     std::string string_name = "foo" + oid;
     auto statement = statement_cache.GetStatement(string_name);
 
-    EXPECT_TRUE(statement->GetNeedsPlan());
+    EXPECT_TRUE(statement->GetNeedsReplan());
   }
 }
 }  // namespace test

test/common/statement_cache_test.cpp

@@ -27,7 +27,7 @@ TEST_F(StatementCacheTests, AddGetTest) {
   auto statement = std::make_shared<Statement>(string_name, query);
   EXPECT_EQ(string_name, statement->GetStatementName());
   EXPECT_EQ(query, statement->GetQueryString());
-  EXPECT_TRUE(!statement->GetNeedsPlan());
+  EXPECT_TRUE(!statement->GetNeedsReplan());
 
   auto statement_cache = std::make_shared<StatementCache>();
   statement_cache->AddStatement(statement);
@@ -76,7 +76,7 @@ TEST_F(StatementCacheTests, DisableTableTest) {
       EXPECT_EQ(t_i != table, stmt->GetReferencedTables().count(t_i));
     }
     table++;
-    EXPECT_TRUE(!stmt->GetNeedsPlan());
+    EXPECT_TRUE(!stmt->GetNeedsReplan());
 
     cache->AddStatement(stmt);
   }
@@ -90,9 +90,9 @@ TEST_F(StatementCacheTests, DisableTableTest) {
     auto stmt = cache->GetStatement(name);
     EXPECT_NE(nullptr, stmt);
     if (i != 2) {
-      EXPECT_TRUE(stmt->GetNeedsPlan());
+      EXPECT_TRUE(stmt->GetNeedsReplan());
     } else {
-      EXPECT_FALSE(stmt->GetNeedsPlan());
+      EXPECT_FALSE(stmt->GetNeedsReplan());
     }
   }
 }