test(p3): add nlj and hash join checks (#529)

Author: christopherlim98

src/execution/mock_scan_executor.cpp

@@ -26,14 +26,21 @@ static const char *ta_list_2022[] = {"amstqq",      "durovo",     "joyceliaoo",
                                      "kush789",     "lmwnshn",    "mkpjnx",     "skyzh",
                                      "thepinetree", "timlee0119", "yliang412"};
 
+static const char *ta_list_2023[] = {"abigalekim",      "arvinwu168", "christopherlim98", "David-Lyons", "fanyuex2",
+                                     "Mayank-Baranwal", "skyzh",      "yarkhinephyo",     "yliang412"};
+
 static const char *ta_oh_2022[] = {"Tuesday",   "Wednesday", "Monday",  "Wednesday", "Thursday", "Friday",
                                    "Wednesday", "Randomly",  "Tuesday", "Monday",    "Tuesday"};
 
+static const char *ta_oh_2023[] = {"Friday",  "Thursday", "Tuesday",   "Monday",  "Tuesday",
+                                   "Tuesday", "Randomly", "Wednesday", "Thursday"};
+
 static const char *course_on_date[] = {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"};
 
 const char *mock_table_list[] = {"__mock_table_1", "__mock_table_2", "__mock_table_3", "__mock_table_tas_2022",
-                                 "__mock_agg_input_small", "__mock_agg_input_big", "__mock_table_schedule_2022",
-                                 "__mock_table_schedule_2023", "__mock_table_123", "__mock_graph",
+                                 "__mock_table_tas_2023", "__mock_agg_input_small", "__mock_agg_input_big",
+                                 "__mock_table_schedule_2022", "__mock_table_schedule_2023", "__mock_table_123",
+                                 "__mock_graph",
                                  // For leaderboard Q1
                                  "__mock_t1_50k", "__mock_t2_100k", "__mock_t3_1k",
                                  // For leaderboard Q2
@@ -60,6 +67,10 @@ auto GetMockTableSchemaOf(const std::string &table) -> Schema {
     return Schema{std::vector{Column{"github_id", TypeId::VARCHAR, 128}, Column{"office_hour", TypeId::VARCHAR, 128}}};
   }
 
+  if (table == "__mock_table_tas_2023") {
+    return Schema{std::vector{Column{"github_id", TypeId::VARCHAR, 128}, Column{"office_hour", TypeId::VARCHAR, 128}}};
+  }
+
   if (table == "__mock_table_schedule_2022") {
     return Schema{std::vector{Column{"day_of_week", TypeId::VARCHAR, 128}, Column{"has_lecture", TypeId::INTEGER}}};
   }
@@ -120,6 +131,10 @@ auto GetSizeOf(const MockScanPlanNode *plan) -> size_t {
     return sizeof(ta_list_2022) / sizeof(ta_list_2022[0]);
   }
 
+  if (table == "__mock_table_tas_2023") {
+    return sizeof(ta_list_2023) / sizeof(ta_list_2023[0]);
+  }
+
   if (table == "__mock_table_schedule_2022") {
     return sizeof(course_on_date) / sizeof(course_on_date[0]);
   }
@@ -236,6 +251,15 @@ auto GetFunctionOf(const MockScanPlanNode *plan) -> std::function<Tuple(size_t)>
     };
   }
 
+  if (table == "__mock_table_tas_2023") {
+    return [plan](size_t cursor) {
+      std::vector<Value> values{};
+      values.push_back(ValueFactory::GetVarcharValue(ta_list_2023[cursor]));
+      values.push_back(ValueFactory::GetVarcharValue(ta_oh_2023[cursor]));
+      return Tuple{values, &plan->OutputSchema()};
+    };
+  }
+
   if (table == "__mock_table_schedule_2022") {
     return [plan](size_t cursor) {
       std::vector<Value> values{};

test/sql/p3.00-primer.slt

@@ -1,14 +1,12 @@
 query rowsort
-select github_id from __mock_table_tas_2022;
+select github_id from __mock_table_tas_2023;
 ----
-amstqq 
-durovo 
-joyceliaoo 
-karthik-ramanathan-3006 
-kush789 
-lmwnshn 
-mkpjnx 
-skyzh 
-thepinetree 
-timlee0119 
-yliang412
+abigalekim
+arvinwu168
+christopherlim98
+David-Lyons
+fanyuex2
+Mayank-Baranwal
+skyzh
+yarkhinephyo
+yliang412     

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

@@ -1,10 +1,10 @@
 # 5 pts
 
-# How many TAs are there in 2022 Fall?
+# How many TAs are there in 2023 Spring?
 query
-select count(*) from __mock_table_tas_2022;
+select count(*) from __mock_table_tas_2023;
 ----
-11
+9
 
 # The real test process begins...
 

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

@@ -4,12 +4,12 @@
 # "rowsort" means that the order of result doesn't matter.
 
 query rowsort
-select office_hour, count(*) from __mock_table_tas_2022 group by office_hour;
+select office_hour, count(*) from __mock_table_tas_2023 group by office_hour;
 ----
-Monday 2
+Monday 1
 Tuesday 3
-Wednesday 3
-Thursday 1
+Wednesday 1
+Thursday 2
 Friday 1
 Randomly 1
 

test/sql/p3.09-simple-join.slt

@@ -3,20 +3,21 @@
 # Show office hours on lecture days
 # "rowsort" means that the order of result doesn't matter.
 
+statement ok
+set force_optimizer_starter_rule=yes
+
 query rowsort
 select * from
-    __mock_table_tas_2022 inner join __mock_table_schedule_2022
+    __mock_table_tas_2023 inner join __mock_table_schedule_2023
     on office_hour = day_of_week
     where has_lecture = 1;
 ----
-amstqq Tuesday Tuesday 1 
-thepinetree Tuesday Tuesday 1 
-yliang412 Tuesday Tuesday 1 
-kush789 Thursday Thursday 1 
+David-Lyons Monday Monday 1 
+yarkhinephyo Wednesday Wednesday 1 
 
 # The real test begins...
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from test_simple_seq_1 s1 inner join test_simple_seq_2 s2 on s1.col1 + 5 = s2.col1;
 ----
 0 5 15
@@ -26,7 +27,7 @@ select * from test_simple_seq_1 s1 inner join test_simple_seq_2 s2 on s1.col1 +
 4 9 19
 
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from test_simple_seq_1 s1 left join test_simple_seq_2 s2 on s1.col1 + 5 = s2.col1;
 ----
 0 5 15
@@ -304,7 +305,7 @@ insert into temp_3 values
     (19, 974),
     (20, 739);
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from temp_1 t1 inner join test_simple_seq_2 seq on t1.colA = seq.col2 ;
 ----
 10 8 398 60977 0 10
@@ -324,14 +325,14 @@ select * from __mock_table_1 m1 inner join temp_1 t1 on t1.colA = m1.colB;
 0 0 0 1 6113 48270
 
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from temp_1 t1 inner join temp_2 t2 on t1.colD = t2.colA;
 ----
 60 5 4347 34 34 311 4
 
 
 # Non-eq condition
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from temp_2 t2 inner join test_simple_seq_2 s2 on t2.colB < s2.col2;
 ----
 15 2 5 0 10
@@ -362,7 +363,7 @@ create table t2(v1 int, v2 int);
 statement ok
 insert into t2 values (0, 45), (0, 45), (0, 65), (1, 45), (1, 45), (1, 65), (2, 45);
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from temp_2 inner join t2 on v2 = colA;
 ----
 45 518 5 0 45
@@ -374,7 +375,7 @@ select * from temp_2 inner join t2 on v2 = colA;
 45 518 5 2 45
 
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from temp_3 t3 inner join temp_2 t2 on t3.colB = t2.colA;
 ----
 5 29 29 538 9
@@ -389,7 +390,7 @@ select * from temp_3 t3 inner join temp_2 t2 on t3.colB = t2.colA;
 16 52 52 276 2
 18 38 38 194 8
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from
     (select * from temp_2 where colB < 10) t2 inner join
     (select distinct(temp_2.colA) from temp_1 inner join temp_2 on temp_1.colC = temp_2.colA) t3

test/sql/p3.10-multi-way-join.slt

@@ -1,12 +1,15 @@
 # 5 pts
 
+statement ok
+set force_optimizer_starter_rule=yes
+
 statement ok
 create table t1(v1 int);
 
 statement ok
 insert into t1 values (1), (1);
 
-query
+query +ensure:nlj_init_check
 select * from (t1 a inner join t1 b on a.v1 = b.v1) inner join t1 c on a.v1 = c.v1;
 ----
 1 1 1
@@ -18,7 +21,7 @@ select * from (t1 a inner join t1 b on a.v1 = b.v1) inner join t1 c on a.v1 = c.
 1 1 1
 1 1 1
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from __mock_table_123 a, __mock_table_123 b, __mock_table_123 c;
 ----
 1 1 1
@@ -344,15 +347,15 @@ create table t3(v1 int); insert into t3 values (1), (2), (3);
 statement ok
 create table t4(v1 int); insert into t4 values (2), (3), (3);
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from t3 left join t2 on t2.v1 = t3.v1;
 ----
 1 1 
 1 1 
 2 2 
 3 integer_null
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from (t3 left join t2 on t2.v1 = t3.v1) left join t4 on t3.v1 = t4.v1;
 ----
 1 1 integer_null 
@@ -364,7 +367,7 @@ select * from (t3 left join t2 on t2.v1 = t3.v1) left join t4 on t3.v1 = t4.v1;
 statement ok
 create table t5(v1 int);
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from ((t3 left join t5 on t3.v1 < t5.v1) left join t5 as t52 on t3.v1 < t52.v1) left join t5 as t53 on t3.v1 < t53.v1;
 ----
 1 integer_null integer_null integer_null 

test/sql/p3.11-repeat-execute.slt

@@ -11,7 +11,7 @@ insert into t1 values (0, '🥰'), (1, '🥰🥰');
 
 # SeqScan as the right child
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from __mock_table_123, t1;
 ----
 1 0 🥰 
@@ -23,7 +23,7 @@ select * from __mock_table_123, t1;
 
 # SimpleAgg as the right child
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from __mock_table_123, (select count(*) as cnt from t1);
 ----
 1 2
@@ -32,7 +32,7 @@ select * from __mock_table_123, (select count(*) as cnt from t1);
 
 # GroupAgg as the right child
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from __mock_table_123, (select distinct v2 from t1);
 ----
 1 🥰🥰 
@@ -47,7 +47,7 @@ select * from __mock_table_123, (select distinct v2 from t1);
 statement ok
 create index t1v1 on t1(v1);
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from __mock_table_123, (select * from t1 order by v1);
 ----
 1 0 🥰 

test/sql/p3.13-sort-limit.slt

@@ -4,51 +4,45 @@
 
 # Default
 query
-select * from  __mock_table_tas_2022 order by office_hour, github_id;
+select * from  __mock_table_tas_2023 order by office_hour, github_id;
 ----
-lmwnshn Friday
-joyceliaoo Monday
-timlee0119 Monday
+abigalekim Friday
+David-Lyons Monday
 skyzh Randomly
-kush789 Thursday
-amstqq Tuesday
-thepinetree Tuesday
-yliang412 Tuesday
-durovo Wednesday
-karthik-ramanathan-3006 Wednesday
-mkpjnx Wednesday
+arvinwu168 Thursday
+yliang412 Thursday
+Mayank-Baranwal Tuesday
+christopherlim98 Tuesday
+fanyuex2 Tuesday
+yarkhinephyo Wednesday
 
 # ASC
 query
-select * from  __mock_table_tas_2022 order by office_hour asc, github_id desc;
+select * from  __mock_table_tas_2023 order by office_hour asc, github_id desc;
 ----
-lmwnshn Friday
-timlee0119 Monday
-joyceliaoo Monday
-skyzh Randomly
-kush789 Thursday
-yliang412 Tuesday
-thepinetree Tuesday
-amstqq Tuesday
-mkpjnx Wednesday
-karthik-ramanathan-3006 Wednesday
-durovo Wednesday
+abigalekim Friday        
+David-Lyons Monday        
+skyzh Randomly      
+yliang412 Thursday      
+arvinwu168 Thursday      
+fanyuex2 Tuesday       
+christopherlim98 Tuesday       
+Mayank-Baranwal Tuesday       
+yarkhinephyo Wednesday     
 
 
 query
-select * from  __mock_table_tas_2022 order by github_id desc;
+select * from  __mock_table_tas_2023 order by github_id desc;
 ----
-yliang412 Tuesday
-timlee0119 Monday
-thepinetree Tuesday
+yliang412 Thursday
+yarkhinephyo Wednesday
 skyzh Randomly
-mkpjnx Wednesday
-lmwnshn Friday
-kush789 Thursday
-karthik-ramanathan-3006 Wednesday
-joyceliaoo Monday
-durovo Wednesday
-amstqq Tuesday
+fanyuex2 Tuesday
+christopherlim98 Tuesday
+arvinwu168 Thursday
+abigalekim Friday
+Mayank-Baranwal Tuesday
+David-Lyons Monday
 
 
 # Simple limit
@@ -381,7 +375,7 @@ select * from __mock_table_123, (select * from temp_1 order by colA desc limit 3
 3 98 3 1394 17139
 3 97 1 2273 63790
 
-query rowsort
+query rowsort +ensure:nlj_init_check
 select * from
     temp_2 t2 inner join
     (select colB, colD, colA, colC from temp_1 order by colB desc, colD, colA desc limit 10 ) t1