Task 7/queries main

.clang-tidy

@@ -1,5 +1,5 @@
 ---
-Checks:          '-*,cppcoreguidelines-avoid-goto,cppcoreguidelines-pro-type-const-cast, google-readability-casting, modernize-replace-random-shuffle, readability-braces-around-statements, readability-container-size-empty, readability-redundant-control-flow, readability-redundant-string-init, modernize-use-nullptr, readability-identifier-naming, google-build-using-namespace'
+Checks: '-*,cppcoreguidelines-avoid-goto,cppcoreguidelines-pro-type-const-cast, google-readability-casting, modernize-replace-random-shuffle, readability-braces-around-statements, readability-container-size-empty, readability-redundant-control-flow, readability-redundant-string-init, modernize-use-nullptr, readability-identifier-naming, google-build-using-namespace'
 HeaderFilterRegex: '\.h$'
 WarningsAsErrors: '*'
 CheckOptions:
@@ -25,17 +25,11 @@ CheckOptions:
     value: lower_case
   - key: readability-identifier-naming.ParameterCase
     value: lower_case
-  - key: readability-identifier-naming.GlobalConstantPrefix
-    value: k
   - key: readability-identifier-naming.GlobalConstantCase
     value: CamelCase
-  - key: readability-identifier-naming.StaticConstantPrefix
-    value: k
   - key: readability-identifier-naming.StaticConstantCase
     value: CamelCase
   - key: readability-identifier-naming.ConstexprVariableCase
     value: CamelCase
-  - key: readability-identifier-naming.ConstexprVariablePrefix
-    value: k
   - key: google-runtime-int.TypeSuffix
     value: _t

.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

.github/workflows/cmake-single-platform.yml

@@ -35,10 +35,16 @@ jobs:
           ./tests/test_columnar
           ./tests/test_columns
           ./tests/test_csv
+          ./tests/test_executor
           ./tests/test_fileio
           ./tests/test_stream
           ./tests/test_tokenizer
 
+      - name: Benchmark Queries
+        run: |
+          cd benchmarks
+          ../build/benchmarks/benchmark_queries
+
   sanitizers:
     runs-on: ubuntu-latest
 
@@ -70,3 +76,11 @@ jobs:
         run: |
           cd build-sanitizers
           ctest --output-on-failure
+
+      - name: Benchmark Queries With Sanitizers
+        env:
+          ASAN_OPTIONS: detect_leaks=1:strict_string_checks=1:check_initialization_order=1
+          UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
+        run: |
+          cd benchmarks
+          ../build-sanitizers/benchmarks/benchmark_queries

.gitignore

@@ -104,7 +104,6 @@ examples/out_columnar
 # benchmarks
 benchmarks/hits_sample.csv
 benchmarks/hits_sample_new.csv
-benchmarks/schema_sample.csv
 benchmarks/schema_sample_new.csv
 benchmarks/hits_sample.columnar
 benchmarks/benchmark_csv_to_columnar

CMakeLists.txt

@@ -14,18 +14,10 @@ include(cmake/dependencies_package.cmake)
 include(cmake/sanitizers.cmake)
 
 set(COLUMNAR_INCLUDE_DIRS
-        ${PROJECT_SOURCE_DIR}/include/convert
-        ${PROJECT_SOURCE_DIR}/include/io
-        ${PROJECT_SOURCE_DIR}/include/model
-        ${PROJECT_SOURCE_DIR}/include/support
-        ${PROJECT_SOURCE_DIR}/include/testing
-        ${PROJECT_SOURCE_DIR}/include/executor
-        ${PROJECT_SOURCE_DIR}/include/sql_parser
-        ${PROJECT_SOURCE_DIR}/include/tl
+        ${PROJECT_SOURCE_DIR}/include
+        ${PROJECT_SOURCE_DIR}/third-party
 )
 
-include_directories(${COLUMNAR_INCLUDE_DIRS})
-
 add_compile_options(-Wall -Wextra -Werror -Wpedantic -O2)
 
 set(COLUMNAR_SANITIZERS "" CACHE STRING "Comma or semicolon separated list of sanitizers: address,undefined,leak,thread,memory")

README.md

@@ -1,3 +1,28 @@
 # columnar-engine
 
-Колононый движок с нуля (in progress)
+Колононый движок с нуля (in progress)
+
+<!-- benchmark-table:start -->
+## Dashboard
+
+
+| Query | First run, ms | Warm avg, ms | Warm median, ms | Warm min, ms | Warm max, ms | Status |
+| --- | ---: | ---: | ---: | ---: | ---: | --- |
+| [0](benchmarks/queries/query_0.sql) | 1076.34 | 11.43 | 11.67 | 9.57 | 12.81 | ok |
+| [1](benchmarks/queries/query_1.sql) | 41.93 | 27.20 | 27.21 | 27.19 | 27.22 | ok |
+| [2](benchmarks/queries/query_2.sql) | 64.18 | 51.76 | 51.70 | 51.57 | 52.08 | ok |
+| [3](benchmarks/queries/query_3.sql) | 69.35 | 51.94 | 52.19 | 51.02 | 52.38 | ok |
+| [4](benchmarks/queries/query_4.sql) | 44.52 | 43.83 | 43.77 | 43.72 | 44.07 | ok |
+| [5](benchmarks/queries/query_5.sql) | 59.39 | 48.10 | 45.38 | 44.72 | 56.93 | ok |
+| [6](benchmarks/queries/query_6.sql) | 757.49 | 679.54 | 678.98 | 676.05 | 684.13 | ok |
+| [7](benchmarks/queries/query_7.sql) | 28.79 | 28.27 | 28.27 | 28.13 | 28.44 | ok |
+| [8](benchmarks/queries/query_8.sql) | 126.09 | 112.90 | 112.57 | 111.87 | 114.58 | ok |
+| [9](benchmarks/queries/query_9.sql) | 164.71 | 166.90 | 166.97 | 164.56 | 169.11 | ok |
+| [10](benchmarks/queries/query_10.sql) | 51.34 | 37.20 | 37.17 | 37.06 | 37.38 | ok |
+| [11](benchmarks/queries/query_11.sql) | 50.58 | 38.50 | 38.49 | 38.39 | 38.65 | ok |
+| [12](benchmarks/queries/query_12.sql) | 63.54 | 64.18 | 64.19 | 63.69 | 64.67 | ok |
+| [13](benchmarks/queries/query_13.sql) | 96.63 | 83.26 | 76.40 | 76.12 | 104.12 | ok |
+| [14](benchmarks/queries/query_14.sql) | 83.27 | 113.13 | 87.14 | 72.80 | 205.45 | ok |
+| [15](benchmarks/queries/query_15.sql) | 105.19 | 108.28 | 108.08 | 104.50 | 112.46 | ok |
+| [16](benchmarks/queries/query_16.sql) | 204.87 | 201.82 | 200.27 | 199.42 | 207.34 | ok |
+<!-- benchmark-table:end -->

benchmarks/CMakeLists.txt

@@ -9,6 +9,9 @@ target_link_libraries(benchmark_csv_to_columnar
 
 add_executable(benchmark_queries
         benchmark_queries.cpp
+        support/query_result_checks.cpp
+        support/query_result_checks.h
+        support/query_runners.h
 )
 
 target_link_libraries(benchmark_queries
@@ -19,7 +22,7 @@ target_link_libraries(benchmark_queries
 target_compile_definitions(benchmark_csv_to_columnar
         PRIVATE
         COLUMNAR_BENCHMARK_DEFAULT_DATA="${PROJECT_SOURCE_DIR}/benchmarks/hits_sample.csv"
-        COLUMNAR_BENCHMARK_DEFAULT_SCHEMA="${PROJECT_SOURCE_DIR}/benchmarks/schema_sample.csv"
+        COLUMNAR_BENCHMARK_DEFAULT_SCHEMA="${PROJECT_SOURCE_DIR}/benchmarks/scheme.csv"
         COLUMNAR_BENCHMARK_DEFAULT_OUTPUT="${PROJECT_SOURCE_DIR}/benchmarks/hits_sample.columnar"
         COLUMNAR_BENCHMARK_DEFAULT_ROUNDTRIP_DATA="${PROJECT_SOURCE_DIR}/benchmarks/hits_sample_new.csv"
         COLUMNAR_BENCHMARK_DEFAULT_ROUNDTRIP_SCHEMA="${PROJECT_SOURCE_DIR}/benchmarks/schema_sample_new.csv"

benchmarks/benchmark_csv_to_columnar.cpp

@@ -4,9 +4,9 @@
 #include <iostream>
 #include <vector>
 
-#include "csv.h"
-#include "csv_columnar.h"
-#include "error.h"
+#include "io/csv.h"
+#include "convert/csv_columnar.h"
+#include "common/error.h"
 
 #ifndef COLUMNAR_BENCHMARK_DEFAULT_DATA
 #define COLUMNAR_BENCHMARK_DEFAULT_DATA "benchmarks/hits_sample.csv"
@@ -28,7 +28,7 @@
 #define COLUMNAR_BENCHMARK_DEFAULT_ROUNDTRIP_SCHEMA "benchmarks/schema_sample_new.csv"
 #endif
 
-static constexpr size_t kRowsPerGroup = 50000;
+static constexpr size_t RowsPerGroup = 50000;
 
 struct CsvCompareResult {
     bool equal = true;
@@ -64,7 +64,7 @@ static CsvCompareResult CompareCsvFiles(const std::filesystem::path& lhs_path, c
 
 int main(const int argc, char** argv) {
     try {
-        size_t rows_per_group = kRowsPerGroup;
+        size_t rows_per_group = RowsPerGroup;
         if (argc == 2) {
             rows_per_group = std::stoull(argv[1]);
         }

benchmarks/benchmark_queries.cpp

@@ -1,46 +1,112 @@
+#include <algorithm>
+#include <chrono>
 #include <filesystem>
+#include <fstream>
 #include <iostream>
 #include <string>
 
-#include "fileio.h"
+#include "executor/executor.h"
+#include "io/file.h"
+#include "support/query_result_checks.h"
+#include "support/query_runners.h"
 
 #ifndef COLUMNAR_BENCHMARK_QUERIES_DIR
 #define COLUMNAR_BENCHMARK_QUERIES_DIR "benchmarks/queries"
 #endif
 
-static constexpr int kFirstQueryId = 0;
-static constexpr int kLastQueryId = 42;
+static constexpr int FirstQueryId = 0;
+static constexpr int LastQueryId = 16;
 
-void RunQuerySkeleton(const std::filesystem::path& path, const int query_id) {
-    const std::string sql = ReadTextFile(path);
-    std::cout << "query_" << query_id << ": found, bytes=" << sql.size() << ", status=skeleton_only" << std::endl;
+void RunQuery(const Executor& executor, const std::filesystem::path& path, const int query_id, bool record = false) {
+    const auto& runners = GetQueryRunners();
+    const auto it = runners.find(query_id);
+    const std::string query_sql = std::filesystem::exists(path) ? ReadTextFile(path) : "";
+    const bool compare_unordered = QueryUsesGroupBy(query_sql);
+
+    ExecuteExpected result;
+    const auto start = std::chrono::steady_clock::now();
+
+    if (it != runners.end()) {
+        result = it->second(executor);
+    } else if (std::filesystem::exists(path)) {
+        result = executor.Execute(query_sql);
+    } else {
+        std::cout << "query_" << query_id << ": missing, status=skipped" << std::endl;
+        return;
+    }
+
+    const auto end = std::chrono::steady_clock::now();
+    const auto duration_ms = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
+
+    if (!result.has_value()) {
+        std::cout << "query_" << query_id << ": error=\"" << result.error().GetMessage() << "\", status=failed"
+                  << std::endl;
+        return;
+    }
+
+    const std::string actual_result = BatchToString(*result);
+    const std::filesystem::path ref_path =
+        std::filesystem::path(COLUMNAR_BENCHMARK_QUERIES_DIR) / ("query_" + std::to_string(query_id) + ".csv");
+
+    std::string status;
+
+    if (record) {
+        std::ofstream ref_file(ref_path);
+        ref_file << actual_result;
+        status = "recorded";
+    } else if (std::filesystem::exists(ref_path)) {
+        const std::string expected_result = ReadTextFile(ref_path);
+        if (compare_unordered ? EqualAsRowMultisets(actual_result, expected_result)
+                              : actual_result == expected_result) {
+            status = "passed";
+        } else {
+            status = "failed";
+            std::cout << "query_" << query_id << ": expected:\n" << expected_result;
+            if (!expected_result.empty() && expected_result.back() != '\n') {
+                std::cout << std::endl;
+            }
+            std::cout << "query_" << query_id << ": actual:\n" << actual_result;
+            if (!actual_result.empty() && actual_result.back() != '\n') {
+                std::cout << std::endl;
+            }
+        }
+    } else {
+        status = "no_reference";
+    }
+
+    std::cout << "query_" << query_id << ": rows=" << result->RowsCount() << ", time=" << duration_ms
+              << "ms, status=" << status << std::endl;
 }
 
-int main() {
+int main(const int argc, char** argv) {
     try {
+        bool record = false;
+        for (int i = 1; i < argc; ++i) {
+            if (std::string(argv[i]) == "--record") {
+                record = true;
+            }
+        }
+
         const std::filesystem::path queries_dir = COLUMNAR_BENCHMARK_QUERIES_DIR;
+        const std::filesystem::path data_path = queries_dir.parent_path() / "hits_sample.columnar";
+
+        Executor executor;
+        executor.RegisterTable("hits", data_path);
 
         size_t found_queries = 0;
-        size_t missing_queries = 0;
 
         std::cout << "queries_dir=" << queries_dir << std::endl;
 
-        for (int query_id = kFirstQueryId; query_id <= kLastQueryId; ++query_id) {
+        for (int query_id = FirstQueryId; query_id <= LastQueryId; ++query_id) {
             const std::filesystem::path query_path = queries_dir / ("query_" + std::to_string(query_id) + ".sql");
 
-            if (!std::filesystem::exists(query_path)) {
-                ++missing_queries;
-                std::cout << "query_" << query_id << ": missing, status=skipped" << std::endl;
-                continue;
+            if (GetQueryRunners().contains(query_id) || std::filesystem::exists(query_path)) {
+                ++found_queries;
+                RunQuery(executor, query_path, query_id, record);
             }
-
-            ++found_queries;
-
-            RunQuerySkeleton(query_path, query_id);
         }
 
-        std::cout << "found_queries=" << found_queries << std::endl;
-        std::cout << "missing_queries=" << missing_queries << std::endl;
+        std::cout << "total_executed=" << found_queries << std::endl;
     } catch (const std::exception& ex) {
         std::cerr << ex.what() << std::endl;
         return 1;