Added more tests.

Author: poojanilangekar

src/executor/update_executor.cpp

@@ -63,10 +63,6 @@ bool UpdateExecutor::PerformUpdatePrimaryKey(
     storage::TileGroupHeader *tile_group_header, oid_t physical_tuple_id,
     ItemPointer &old_location) {
 
-  /* if (statement_write_set_.find(old_location) != statement_write_set_.end()) {
-    return true;
-  } */
-
   auto &transaction_manager =
       concurrency::TransactionManagerFactory::GetInstance();
 

test/sql/update_sql_test.cpp

@@ -278,7 +278,10 @@ TEST_F(UpdateSQLTests, UpdateSQLCastTest) {
   txn_manager.CommitTransaction(txn);
 }
 
-TEST_F(UpdateSQLTests, HalloweenTest) {
+TEST_F(UpdateSQLTests, HalloweenProblemTest) {
+  // This SQL Test verifies that executor does not cause the Halloween Problem
+  // This test checks for tables without Primary Keys
+
   LOG_DEBUG("Bootstrapping...");
 
   auto catalog = catalog::Catalog::GetInstance();
@@ -289,6 +292,12 @@ TEST_F(UpdateSQLTests, HalloweenTest) {
 
   LOG_DEBUG("Bootstrapping completed!");
 
+  // Setting ActiveTileGroupCount to 3 in order to trigger the case where
+  // the executor scans TileGroup 0, inserts an empty version in TileGroup 1.
+  // It then inserts the updated version of the tuple in TileGroup 2.
+  // When it scans TileGroup 2, without the statement level WriteSet,
+  // it would have caused a second update on an already updated Tuple.
+
   size_t active_tilegroup_count = 3;
   storage::DataTable::SetActiveTileGroupCount(active_tilegroup_count);
 
@@ -310,9 +319,80 @@ TEST_F(UpdateSQLTests, HalloweenTest) {
   TestingSQLUtil::ExecuteSQLQuery("INSERT INTO test VALUES (10, 1000);");
   LOG_DEBUG("Tuple inserted!");
 
+  // Update a tuple in the table
+  LOG_DEBUG("Updating a tuple...");
+  LOG_DEBUG("Query: UPDATE test SET a = a/2");
+
+  std::vector<ResultValue> result;
+  std::vector<FieldInfo> tuple_descriptor;
+  std::string error_message;
+  int rows_affected;
+
+  TestingSQLUtil::ExecuteSQLQuery("UPDATE test SET a = a/2;", result,
+                                  tuple_descriptor, rows_affected,
+                                  error_message);
+
+  // Check the return value
+  EXPECT_EQ(1, rows_affected);
+  LOG_DEBUG("Tuple Updated!");
   txn_manager.CommitTransaction(txn);
 
-  // Update a tuple into table
+  LOG_DEBUG("Selecting updated value.");
+  txn = txn_manager.BeginTransaction();
+  // Check value of column a after updating
+  TestingSQLUtil::ExecuteSQLQuery("SELECT a from test", result,
+                                  tuple_descriptor, rows_affected,
+                                  error_message);
+  // Check the return value
+  txn_manager.CommitTransaction(txn);
+
+  EXPECT_EQ(TestingSQLUtil::GetResultValueAsString(result, 0), "5");
+  LOG_DEBUG("Successfully updated tuple.");
+
+  // free the database just created
+  txn = txn_manager.BeginTransaction();
+  catalog::Catalog::GetInstance()->DropDatabaseWithName(DEFAULT_DB_NAME, txn);
+  txn_manager.CommitTransaction(txn);
+}
+
+TEST_F(UpdateSQLTests, HalloweenProblemTestWithPK) {
+  // This SQL Test verifies that executor does not cause the Halloween Problem
+  // This test checks for tables with Primary Keys
+  // It checks for updates on both Non-Primary Key column & Primary Key column
+
+  LOG_DEBUG("Bootstrapping...");
+
+  auto catalog = catalog::Catalog::GetInstance();
+  auto &txn_manager = concurrency::TransactionManagerFactory::GetInstance();
+  auto txn = txn_manager.BeginTransaction();
+  catalog->CreateDatabase(DEFAULT_DB_NAME, txn);
+  txn_manager.CommitTransaction(txn);
+
+  LOG_DEBUG("Bootstrapping completed!");
+
+  // active_tilegroup_count set to 3, [Reason: Refer to HalloweenProblemTest]
+  size_t active_tilegroup_count = 3;
+  storage::DataTable::SetActiveTileGroupCount(active_tilegroup_count);
+
+  LOG_DEBUG("Active tile group count = %zu",
+            storage::DataTable::GetActiveTileGroupCount());
+  // Create a table first
+  LOG_DEBUG("Creating a table...");
+  LOG_DEBUG("Query: CREATE TABLE test(a INT PRIMARY KEY, b INT)");
+
+  TestingSQLUtil::ExecuteSQLQuery("CREATE TABLE test(a INT PRIMARY KEY, b INT);");
+
+  LOG_DEBUG("Table created!");
+
+  txn = txn_manager.BeginTransaction();
+  // Insert a tuple into table
+  LOG_DEBUG("Inserting a tuple...");
+
+  LOG_DEBUG("Query: INSERT INTO test VALUES (10, 100)");
+  TestingSQLUtil::ExecuteSQLQuery("INSERT INTO test VALUES (10, 1000);");
+  LOG_DEBUG("Tuple inserted!");
+
+  // Update a tuple in table
   LOG_DEBUG("Updating a tuple...");
   LOG_DEBUG("Query: UPDATE test SET a = a/2");
 
@@ -321,19 +401,18 @@ TEST_F(UpdateSQLTests, HalloweenTest) {
   std::string error_message;
   int rows_affected;
 
-  txn = txn_manager.BeginTransaction();
   TestingSQLUtil::ExecuteSQLQuery("UPDATE test SET a = a/2;", result,
                                   tuple_descriptor, rows_affected,
                                   error_message);
 
   // Check the return value
   EXPECT_EQ(1, rows_affected);
-  LOG_DEBUG("Tuple Updated!");
+  LOG_DEBUG("Tuple Primary Key column Updated!");
   txn_manager.CommitTransaction(txn);
 
   LOG_DEBUG("Selecting updated value.");
   txn = txn_manager.BeginTransaction();
-  // Check value of column salary after updating
+  // Check value of column a after updating
   TestingSQLUtil::ExecuteSQLQuery("SELECT a from test", result,
                                   tuple_descriptor, rows_affected,
                                   error_message);
@@ -343,6 +422,34 @@ TEST_F(UpdateSQLTests, HalloweenTest) {
   EXPECT_EQ(TestingSQLUtil::GetResultValueAsString(result, 0), "5");
   LOG_DEBUG("Successfully updated tuple.");
 
+  txn = txn_manager.BeginTransaction();
+
+  LOG_DEBUG("Updating a tuple...");
+  LOG_DEBUG("Query: UPDATE test SET b = b/2");
+
+  TestingSQLUtil::ExecuteSQLQuery("UPDATE test SET b = b/2;", result,
+                                  tuple_descriptor, rows_affected,
+                                  error_message);
+
+  EXPECT_EQ(1, rows_affected);
+  LOG_DEBUG("Tuple Non-Primary Key column Updated!");
+  txn_manager.CommitTransaction(txn);
+
+  LOG_DEBUG("Selecting updated value.");
+  txn = txn_manager.BeginTransaction();
+  // Check value of column b after updating
+  TestingSQLUtil::ExecuteSQLQuery("SELECT b from test", result,
+                                  tuple_descriptor, rows_affected,
+                                  error_message);
+  // Check the return value
+  txn_manager.CommitTransaction(txn);
+
+  EXPECT_EQ(TestingSQLUtil::GetResultValueAsString(result, 0), "500");
+  LOG_DEBUG("Successfully updated tuple.");
+
+
+
+
   // free the database just created
   txn = txn_manager.BeginTransaction();
   catalog::Catalog::GetInstance()->DropDatabaseWithName(DEFAULT_DB_NAME, txn);
@@ -360,6 +467,7 @@ TEST_F(UpdateSQLTests, MultiTileGroupUpdateSQLTest) {
 
   LOG_DEBUG("Bootstrapping completed!");
 
+  // active_tilegroup_count set to 3, [Reason: Refer to HalloweenProblemTest]
   size_t active_tilegroup_count = 3;
   storage::DataTable::SetActiveTileGroupCount(active_tilegroup_count);
 
@@ -382,7 +490,7 @@ TEST_F(UpdateSQLTests, MultiTileGroupUpdateSQLTest) {
 
   LOG_DEBUG("Tuple inserted!");
 
-  // Update a tuple into table
+  // Update a tuple in the table
   LOG_DEBUG("Updating a tuple...");
   LOG_DEBUG("Query: UPDATE test SET a = 10 WHERE b = 100");
 
@@ -398,15 +506,20 @@ TEST_F(UpdateSQLTests, MultiTileGroupUpdateSQLTest) {
   LOG_DEBUG("Query: UPDATE test SET a = 1 WHERE b = 100");
   // Check the return value
   EXPECT_EQ(1, rows_affected);
-  LOG_DEBUG("Tuple Updated!");
+  LOG_DEBUG("Tuple Update successful!");
 
   TestingSQLUtil::ExecuteSQLQuery("UPDATE test SET a = 1 WHERE b = 100;",
                                   result, tuple_descriptor, rows_affected,
                                   error_message);
 
   // Check the return value
+  // Updating the tuple the second time casued the assertion failure
+  // on line 641 of timestamp_ordering_transaction_manager.cpp
+  // This was because it tried to update an already updated version
+  // of the tuple. This was fixed by the statement level WriteSet.
   EXPECT_EQ(1, rows_affected);
-  LOG_DEBUG("Tuple Updated!");
+  LOG_DEBUG("Tuple Update successful, again!");
+
 
   // free the database just created
   txn = txn_manager.BeginTransaction();