feat(p3): add more test cases (#432)

* feat(p3): add more test cases

Signed-off-by: Alex Chi <[email protected]>

* add new custom rule

Signed-off-by: Alex Chi <[email protected]>

Author: skyzh

src/execution/mock_scan_executor.cpp

@@ -38,6 +38,7 @@ const char *mock_table_list[] = {"__mock_table_1",
                                  "__mock_agg_input_small",
                                  "__mock_agg_input_big",
                                  "__mock_table_schedule_2022",
+                                 "__mock_table_123",
                                  nullptr};
 
 auto GetMockTableSchemaOf(const std::string &table) -> Schema {
@@ -70,6 +71,10 @@ auto GetMockTableSchemaOf(const std::string &table) -> Schema {
                               {Column{"v6", TypeId::VARCHAR, 128}}}};
   }
 
+  if (table == "__mock_table_123") {
+    return Schema{std::vector{Column{"number", TypeId::INTEGER}}};
+  }
+
   throw bustub::Exception(fmt::format("mock table {} not found", table));
 }
 
@@ -102,6 +107,10 @@ auto GetSizeOf(const MockScanPlanNode *plan) -> size_t {
     return 10000;
   }
 
+  if (plan->GetTable() == "__mock_table_123") {
+    return 3;
+  }
+
   return 100;
 }
 
@@ -187,6 +196,14 @@ auto GetFunctionOf(const MockScanPlanNode *plan) -> std::function<Tuple(size_t)>
     };
   }
 
+  if (plan->GetTable() == "__mock_table_123") {
+    return [plan](size_t cursor) {
+      std::vector<Value> values{};
+      values.push_back(ValueFactory::GetIntegerValue(cursor + 1));
+      return Tuple{values, &plan->OutputSchema()};
+    };
+  }
+
   // By default, return table of all 0.
   return [plan](size_t cursor) {
     std::vector<Value> values{};

src/optimizer/optimizer_custom_rules.cpp

@@ -10,6 +10,7 @@ auto Optimizer::OptimizeCustom(const AbstractPlanNodeRef &plan) -> AbstractPlanN
   p = OptimizeNLJAsIndexJoin(p);
   // p = OptimizeNLJAsHashJoin(p);  // Enable this rule after you have implemented hash join.
   p = OptimizeOrderByAsIndexScan(p);
+  p = OptimizeSortLimitAsTopN(p);
   return p;
 }
 

test/CMakeLists.txt

@@ -58,6 +58,16 @@ set(BUSTUB_SLT_SOURCES
         "${PROJECT_SOURCE_DIR}/test/sql/p3.07-group-agg-1.slt"
         "${PROJECT_SOURCE_DIR}/test/sql/p3.08-group-agg-2.slt"
         "${PROJECT_SOURCE_DIR}/test/sql/p3.09-simple-join.slt"
+        "${PROJECT_SOURCE_DIR}/test/sql/p3.10-multi-way-join.slt"
+        "${PROJECT_SOURCE_DIR}/test/sql/p3.11-repeat-execute.slt"
+        "${PROJECT_SOURCE_DIR}/test/sql/p3.12-nested-index-join.slt"
+        "${PROJECT_SOURCE_DIR}/test/sql/p3.13-sort-limit.slt"
+        "${PROJECT_SOURCE_DIR}/test/sql/p3.14-topn.slt"
+        "${PROJECT_SOURCE_DIR}/test/sql/p3.15-integration-1.slt"
+        "${PROJECT_SOURCE_DIR}/test/sql/p3.16-integration-2.slt"
+        "${PROJECT_SOURCE_DIR}/test/sql/p3.leaderboard-q1.slt"
+        "${PROJECT_SOURCE_DIR}/test/sql/p3.leaderboard-q2.slt"
+        "${PROJECT_SOURCE_DIR}/test/sql/p3.leaderboard-q3.slt"
 )
 
 add_custom_target(test-p3 ${CMAKE_CTEST_COMMAND} -R SQLLogicTest)
@@ -71,7 +81,7 @@ foreach(bustub_test_source ${BUSTUB_SLT_SOURCES})
         string(REPLACE ".slt" "" bustub_filename_wo_suffix "${bustub_test_filename}")
         string(REPLACE ".slt" "" bustub_test_name "SQLLogicTest.${bustub_filename_wo_suffix}")
         add_test(NAME ${bustub_test_name} COMMAND "${CMAKE_BINARY_DIR}/bin/bustub-sqllogictest" ${bustub_test_source} --verbose -d)
-        add_custom_target(${bustub_filename_wo_suffix}_test COMMAND ${CMAKE_CTEST_COMMAND} -R ${bustub_test_name} --verbose)
+        add_custom_target(${bustub_filename_wo_suffix}_test COMMAND "${CMAKE_BINARY_DIR}/bin/bustub-sqllogictest" "${bustub_test_source}" --verbose -d)
         add_dependencies(${bustub_filename_wo_suffix}_test sqllogictest)
 endforeach()
 

test/sql/p3.01-seqscan.slt

@@ -1,3 +1,5 @@
+# 5 pts
+
 query
 select * from test_simple_seq_1;
 ----

test/sql/p3.02-insert.slt

@@ -1,3 +1,5 @@
+# 5 pts
+
 # Create a table
 statement ok
 create table t1(v1 int, v2 varchar(128), v3 int);

test/sql/p3.03-delete.slt

@@ -1,3 +1,5 @@
+# 5 pts
+
 # Create a table
 statement ok
 create table t1(v1 int, v2 varchar(128), v3 int);

test/sql/p3.04-index-scan.slt

@@ -1,3 +1,5 @@
+# 10 pts
+
 # Ensure all order-bys in this file are transformed into index scan
 statement ok
 set force_optimizer_starter_rule=yes

test/sql/p3.05-empty-table.slt

@@ -1,3 +1,5 @@
+# 5 pts
+
 # Create a table
 statement ok
 create table t1(v1 int);

test/sql/p3.06-simple-agg.slt

@@ -1,3 +1,5 @@
+# 5 pts
+
 # How many TAs are there in 2022 Fall?
 query
 select count(*) from __mock_table_tas_2022;

test/sql/p3.07-group-agg-1.slt

@@ -1,3 +1,5 @@
+# 5 pts
+
 # How many TAs are there for OH on each weekday?
 # "rowsort" means that the order of result doesn't matter.