feat(p3): finalize tests (#446)

skyzh · web-flow · commit 746c07d6a5c5 · 2022-10-24T21:25:45.000-04:00
Signed-off-by: Alex Chi &lt;iskyzh@gmail.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -18,35 +18,35 @@ add_custom_target(check-public-ci-tests COMMAND ${CMAKE_CTEST_COMMAND} --verbose
 # #########################################
 # "make XYZ_test"
 # #########################################
-foreach(bustub_test_source ${BUSTUB_TEST_SOURCES})
-        # Create a human readable name.
-        get_filename_component(bustub_test_filename ${bustub_test_source} NAME)
-        string(REPLACE ".cpp" "" bustub_test_name ${bustub_test_filename})
+foreach (bustub_test_source ${BUSTUB_TEST_SOURCES})
+    # Create a human readable name.
+    get_filename_component(bustub_test_filename ${bustub_test_source} NAME)
+    string(REPLACE ".cpp" "" bustub_test_name ${bustub_test_filename})
 
-        # Add the test target separately and as part of "make check-tests".
-        add_executable(${bustub_test_name} EXCLUDE_FROM_ALL ${bustub_test_source})
-        add_dependencies(build-tests ${bustub_test_name})
-        add_dependencies(check-tests ${bustub_test_name})
+    # Add the test target separately and as part of "make check-tests".
+    add_executable(${bustub_test_name} EXCLUDE_FROM_ALL ${bustub_test_source})
+    add_dependencies(build-tests ${bustub_test_name})
+    add_dependencies(check-tests ${bustub_test_name})
 
-        gtest_discover_tests(${bustub_test_name}
-                EXTRA_ARGS
-                --gtest_color=auto
-                --gtest_output=xml:${CMAKE_BINARY_DIR}/test/${bustub_test_name}.xml
-                --gtest_catch_exceptions=0
-                DISCOVERY_TIMEOUT 120
-                PROPERTIES
-                TIMEOUT 60
-        )
+    gtest_discover_tests(${bustub_test_name}
+            EXTRA_ARGS
+            --gtest_color=auto
+            --gtest_output=xml:${CMAKE_BINARY_DIR}/test/${bustub_test_name}.xml
+            --gtest_catch_exceptions=0
+            DISCOVERY_TIMEOUT 120
+            PROPERTIES
+            TIMEOUT 120
+            )
 
-        target_link_libraries(${bustub_test_name} bustub gtest gmock_main)
+    target_link_libraries(${bustub_test_name} bustub gtest gmock_main)
 
-        # Set test target properties and dependencies.
-        set_target_properties(${bustub_test_name}
-                PROPERTIES
-                RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/test"
-                COMMAND ${bustub_test_name}
-        )
-endforeach()
+    # Set test target properties and dependencies.
+    set_target_properties(${bustub_test_name}
+            PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/test"
+            COMMAND ${bustub_test_name}
+            )
+endforeach ()
 
 set(BUSTUB_SLT_SOURCES
         "${PROJECT_SOURCE_DIR}/test/sql/p3.01-seqscan.slt"
@@ -68,22 +68,22 @@ set(BUSTUB_SLT_SOURCES
         "${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)
 
 # #########################################
 # "make XYZ_test"
 # #########################################
-foreach(bustub_test_source ${BUSTUB_SLT_SOURCES})
-        # Create a human readable name.
-        get_filename_component(bustub_test_filename ${bustub_test_source} NAME)
-        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_BINARY_DIR}/bin/bustub-sqllogictest" "${bustub_test_source}" --verbose -d)
-        add_dependencies(${bustub_filename_wo_suffix}_test sqllogictest)
-endforeach()
+foreach (bustub_test_source ${BUSTUB_SLT_SOURCES})
+    # Create a human readable name.
+    get_filename_component(bustub_test_filename ${bustub_test_source} NAME)
+    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_BINARY_DIR}/bin/bustub-sqllogictest" "${bustub_test_source}" --verbose -d)
+    add_dependencies(${bustub_filename_wo_suffix}_test sqllogictest)
+endforeach ()
 
 add_dependencies(test-p3 sqllogictest)
 
diff --git a/test/sql/p3.07-group-agg-1.slt b/test/sql/p3.07-group-agg-1.slt
@@ -25,6 +25,10 @@ statement ok
 -- v6: some magic string
 create table t1(v1 int, v2 int, v3 int, v4 int, v5 int, v6 varchar(128));
 
+query
+select v5, min(v1), sum(v2), count(*) from t1 group by v5; -- no groups, no output
+----
+
 query
 insert into t1 select * from __mock_agg_input_small;
 ----
diff --git a/test/sql/p3.09-simple-join.slt b/test/sql/p3.09-simple-join.slt
@@ -391,7 +391,7 @@ select * from temp_3 t3 inner join temp_2 t2 on t3.colB = t2.colA;
 
 query rowsort
 select * from
-    temp_2 t2 inner join
+    (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
     on t2.colB  < t3.colA;
 ----
diff --git a/test/sql/p3.10-multi-way-join.slt b/test/sql/p3.10-multi-way-join.slt
@@ -334,3 +334,39 @@ select L.colC as colC, L.t1B, L.t2B, R.t3B, R.t4B from
 0 132 917 917 221
 0 132 917 8 8
 0 132 917 8 221
+
+statement ok
+create table t2(v1 int); insert into t2 values (1), (1), (2);
+
+statement ok
+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
+select * from t3 left join t2 on t2.v1 = t3.v1;
+----
+1 1 
+1 1 
+2 2 
+3 integer_null
+
+query rowsort
+select * from (t3 left join t2 on t2.v1 = t3.v1) left join t4 on t3.v1 = t4.v1;
+----
+1 1 integer_null 
+1 1 integer_null 
+2 2 2 
+3 integer_null 3 
+3 integer_null 3 
+
+statement ok
+create table t5(v1 int);
+
+query rowsort
+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 
+2 integer_null integer_null integer_null 
+3 integer_null integer_null integer_null 
diff --git a/test/sql/p3.14-topn.slt b/test/sql/p3.14-topn.slt
@@ -350,3 +350,10 @@ select * from
 84 711 4 9 92192 84 4626
 69 603 9 8 20385 69 755
 33 701 3 8 24527 33 991
+
+query rowsort +explain +ensure:topn*2
+select * from (select * from test_simple_seq_2 order by col1 desc limit 5) order by col1 asc limit 3;
+----
+5 15 
+6 16 
+7 17
diff --git a/test/sql/p3.16-integration-2.slt b/test/sql/p3.16-integration-2.slt
@@ -44,7 +44,7 @@ SELECT * FROM result;
 8 8 008 008 0 0 
 9 9 009 009 0 0
 
-query rowsort
+query rowsort +explain:o
 -- 1st neighbor
 INSERT INTO tmp SELECT * FROM (
     SELECT
@@ -63,7 +63,7 @@ INSERT INTO tmp SELECT * FROM (
 statement ok
 INSERT INTO result SELECT * FROM tmp; DELETE FROM tmp; SELECT count(*) FROM result;
 
-query rowsort
+query rowsort +explain:o
 -- 2nd neighbor
 INSERT INTO tmp SELECT * FROM (
     SELECT
@@ -82,7 +82,7 @@ INSERT INTO tmp SELECT * FROM (
 statement ok
 INSERT INTO result SELECT * FROM tmp; DELETE FROM tmp; SELECT count(*) FROM result;
 
-query rowsort
+query rowsort +explain:o
 -- 3rd neighbor
 INSERT INTO tmp SELECT * FROM (
     SELECT
@@ -101,7 +101,7 @@ INSERT INTO tmp SELECT * FROM (
 statement ok
 INSERT INTO result SELECT * FROM tmp; DELETE FROM tmp; SELECT count(*) FROM result;
 
-query rowsort
+query rowsort +explain:o
 -- 4th neighbor
 INSERT INTO tmp SELECT * FROM (
     SELECT
@@ -120,7 +120,7 @@ INSERT INTO tmp SELECT * FROM (
 statement ok
 INSERT INTO result SELECT * FROM tmp; DELETE FROM tmp; SELECT count(*) FROM result;
 
-query rowsort
+query rowsort +explain:o
 SELECT src, src_label, dst, dst_label, count(*), min(distance), max(distance), min(steps), max(steps) FROM result WHERE src = 1 GROUP BY src, src_label, dst, dst_label ORDER BY dst;
 ----
 1 001 0 000 1000 1 4 1 4 
diff --git a/tools/sqllogictest/sqllogictest.cpp b/tools/sqllogictest/sqllogictest.cpp
@@ -77,6 +77,11 @@ auto ProcessExtraOptions(const std::string &sql, bustub::BustubInstance &instanc
           fmt::print("TopN not found\n");
           return false;
         }
+      } else if (opt == "ensure:topn*2") {
+        if (bustub::StringUtil::Split(result.str(), "TopN").size() != 3) {
+          fmt::print("TopN should appear exactly twice\n");
+          return false;
+        }
       } else if (opt == "ensure:index_join") {
         if (!bustub::StringUtil::Contains(result.str(), "NestedIndexJoin")) {
           fmt::print("NestedIndexJoin not found\n");
@@ -116,6 +121,14 @@ auto ProcessExtraOptions(const std::string &sql, bustub::BustubInstance &instanc
       }
       fmt::print("\n");
       fmt::print(">>>END\n");
+    } else if (bustub::StringUtil::StartsWith(opt, "explain")) {
+      auto writer = bustub::SimpleStreamWriter(std::cout);
+      auto x = bustub::StringUtil::Split(opt, "explain:");
+      if (!x.empty() && !x[0].empty()) {
+        instance.ExecuteSql(fmt::format("explain ({}) {}", x[0], sql), writer);
+      } else {
+        instance.ExecuteSql("explain " + sql, writer);
+      }
     } else {
       throw bustub::NotImplementedException(fmt::format("unsupported extra option: {}", opt));
     }
@@ -195,7 +208,7 @@ auto main(int argc, char **argv) -> int {  // NOLINT
           }
 
           std::stringstream result;
-          auto writer = bustub::SimpleStreamWriter(result);
+          auto writer = bustub::SimpleStreamWriter(result, true);
           bustub->ExecuteSql(statement.sql_, writer);
           if (verbose) {
             fmt::print("----\n{}\n", result.str());
