refactor: change assigned points to each p3 tasks (#543)

yliang412 · skyzh · web-flow · commit 881e30bb2c21 · 2023-03-21T11:48:09.000-04:00
* change assigned points to each p3 tasks

Signed-off-by: Yuchen Liang &lt;yuchenl3@andrew.cmu.edu&gt;

* upd

Signed-off-by: Alex Chi &lt;iskyzh@gmail.com&gt;

---------

Signed-off-by: Yuchen Liang &lt;yuchenl3@andrew.cmu.edu&gt;
Signed-off-by: Alex Chi &lt;iskyzh@gmail.com&gt;
Co-authored-by: Alex Chi &lt;iskyzh@gmail.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -318,7 +318,6 @@ set(P3_FILES
         "src/include/execution/executors/index_scan_executor.h"
         "src/include/execution/executors/insert_executor.h"
         "src/include/execution/executors/limit_executor.h"
-        "src/include/execution/executors/nested_index_join_executor.h"
         "src/include/execution/executors/nested_loop_join_executor.h"
         "src/include/execution/executors/seq_scan_executor.h"
         "src/include/execution/executors/sort_executor.h"
@@ -331,7 +330,6 @@ set(P3_FILES
         "src/execution/index_scan_executor.cpp"
         "src/execution/insert_executor.cpp"
         "src/execution/limit_executor.cpp"
-        "src/execution/nested_index_join_executor.cpp"
         "src/execution/nested_loop_join_executor.cpp"
         "src/execution/seq_scan_executor.cpp"
         "src/execution/sort_executor.cpp"
diff --git a/src/optimizer/optimizer.cpp b/src/optimizer/optimizer.cpp
@@ -11,7 +11,6 @@ auto Optimizer::Optimize(const AbstractPlanNodeRef &plan) -> AbstractPlanNodeRef
     auto p = plan;
     p = OptimizeMergeProjection(p);
     p = OptimizeMergeFilterNLJ(p);
-    p = OptimizeNLJAsIndexJoin(p);
     p = OptimizeOrderByAsIndexScan(p);
     p = OptimizeSortLimitAsTopN(p);
     return p;
diff --git a/src/optimizer/optimizer_custom_rules.cpp b/src/optimizer/optimizer_custom_rules.cpp
@@ -11,8 +11,7 @@ auto Optimizer::OptimizeCustom(const AbstractPlanNodeRef &plan) -> AbstractPlanN
   auto p = plan;
   p = OptimizeMergeProjection(p);
   p = OptimizeMergeFilterNLJ(p);
-  p = OptimizeNLJAsIndexJoin(p);
-  // p = OptimizeNLJAsHashJoin(p);  // Enable this rule after you have implemented hash join.
+  p = OptimizeNLJAsHashJoin(p);
   p = OptimizeOrderByAsIndexScan(p);
   p = OptimizeSortLimitAsTopN(p);
   return p;
diff --git a/test/sql/p3.01-seqscan.slt b/test/sql/p3.01-seqscan.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# 4 pts
 
 query
 select * from test_simple_seq_1;
diff --git a/test/sql/p3.02-insert.slt b/test/sql/p3.02-insert.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# 4 pts
 
 # Create a table
 statement ok
diff --git a/test/sql/p3.03-update.slt b/test/sql/p3.03-update.slt
@@ -1,3 +1,5 @@
+# 4 pts
+
 # Create a table
 statement ok
 create table t1(v1 int, v2 varchar(128), v3 int);
diff --git a/test/sql/p3.04-delete.slt b/test/sql/p3.04-delete.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# 4 pts
 
 # Create a table
 statement ok
diff --git a/test/sql/p3.05-index-scan.slt b/test/sql/p3.05-index-scan.slt
@@ -1,4 +1,4 @@
-# 10 pts
+# 7 pts
 
 # Ensure all order-bys in this file are transformed into index scan
 statement ok
diff --git a/test/sql/p3.06-empty-table.slt b/test/sql/p3.06-empty-table.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# 4 pts
 
 # Create a table
 statement ok
diff --git a/test/sql/p3.07-simple-agg.slt b/test/sql/p3.07-simple-agg.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# 4 pts
 
 # How many TAs are there in 2023 Spring?
 query
diff --git a/test/sql/p3.08-group-agg-1.slt b/test/sql/p3.08-group-agg-1.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# 4 pts
 
 # How many TAs are there for OH on each weekday?
 # "rowsort" means that the order of result doesn't matter.
diff --git a/test/sql/p3.09-group-agg-2.slt b/test/sql/p3.09-group-agg-2.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# 6 pts
 
 query
 -- v1: (cursor + 2) % 10
diff --git a/test/sql/p3.10-simple-join.slt b/test/sql/p3.10-simple-join.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# 4 pts
 
 # Show office hours on lecture days
 # "rowsort" means that the order of result doesn't matter.
diff --git a/test/sql/p3.11-multi-way-join.slt b/test/sql/p3.11-multi-way-join.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# 6 pts
 
 statement ok
 set force_optimizer_starter_rule=yes
diff --git a/test/sql/p3.13-nested-index-join.slt b/test/sql/p3.13-nested-index-join.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# --- NOT TESTED IN SPRING 2023 ---
 
 statement ok
 set force_optimizer_starter_rule=yes
diff --git a/test/sql/p3.15-multi-way-hash-join.slt b/test/sql/p3.15-multi-way-hash-join.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# 8 pts
 
 statement ok
 create table t1(v1 int);
diff --git a/test/sql/p3.16-sort-limit.slt b/test/sql/p3.16-sort-limit.slt
@@ -1,4 +1,4 @@
-# 5 pts
+# 4 pts
 
 # Simple sort
 
diff --git a/test/sql/p3.17-topn.slt b/test/sql/p3.17-topn.slt
@@ -1,4 +1,4 @@
-# 10 pts
+# 6 pts
 
 query +ensure:topn
 select * from test_simple_seq_2 order by col1 desc limit 5;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# 5 pts`
	`1`	`+# 4 pts`
`2`	`2`
`3`	`3`	`query`
`4`	`4`	`select * from test_simple_seq_1;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# 4 pts`
	`2`	`+`
`1`	`3`	`# Create a table`
`2`	`4`	`statement ok`
`3`	`5`	`create table t1(v1 int, v2 varchar(128), v3 int);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# 10 pts`
	`1`	`+# 7 pts`
`2`	`2`
`3`	`3`	`# Ensure all order-bys in this file are transformed into index scan`
`4`	`4`	`statement ok`