refactor: add typedef aliases to declutter some repeated statement of generic vectors (Predicate, Expression, Operator)

Author: taepper

src/silo/query_engine/actions/action.cpp

@@ -308,8 +308,7 @@ std::vector<schema::ColumnIdentifier> columnNamesToFields(
 
 arrow::Result<QueryPlan> Action::toQueryPlanImpl(
    std::shared_ptr<const storage::Table> table,
-   std::shared_ptr<std::vector<std::unique_ptr<filter::operators::Operator>>>
-      partition_filter_operators,
+   std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators,
    const config::QueryOptions& query_options
 ) {
    ARROW_ASSIGN_OR_RAISE(auto arrow_plan, arrow::acero::ExecPlan::Make());
@@ -326,8 +325,7 @@ arrow::Result<QueryPlan> Action::toQueryPlanImpl(
 
 QueryPlan Action::toQueryPlan(
    std::shared_ptr<const storage::Table> table,
-   std::shared_ptr<std::vector<std::unique_ptr<filter::operators::Operator>>>
-      partition_filter_operators,
+   std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators,
    const config::QueryOptions& query_options
 ) {
    auto query_plan = toQueryPlanImpl(table, partition_filter_operators, query_options);

src/silo/query_engine/actions/action.h

@@ -51,8 +51,7 @@ class Action {
 
    QueryPlan toQueryPlan(
       std::shared_ptr<const storage::Table> table,
-      std::shared_ptr<std::vector<std::unique_ptr<filter::operators::Operator>>>
-         partition_filter_operators,
+      std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators,
       const config::QueryOptions& query_options
    );
 
@@ -78,8 +77,7 @@ class Action {
    // If this method is not overloaded, a LegacyResultProducer will be created instead
    virtual arrow::Result<QueryPlan> toQueryPlanImpl(
       std::shared_ptr<const storage::Table> table,
-      std::shared_ptr<std::vector<std::unique_ptr<filter::operators::Operator>>>
-         partition_filter_operators,
+      std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators,
       const config::QueryOptions& query_options
    );
 

src/silo/query_engine/actions/mutations.cpp

@@ -287,7 +287,7 @@ using silo::query_engine::filter::operators::Operator;
 template <typename SymbolType>
 arrow::Result<QueryPlan> Mutations<SymbolType>::toQueryPlanImpl(
    std::shared_ptr<const storage::Table> table,
-   std::shared_ptr<std::vector<std::unique_ptr<Operator>>> partition_filter_operators,
+   std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators,
    const config::QueryOptions& query_options
 ) {
    std::vector<std::string> sequence_names_to_evaluate;

src/silo/query_engine/actions/mutations.h

@@ -102,8 +102,7 @@ class Mutations : public Action {
 
    arrow::Result<QueryPlan> toQueryPlanImpl(
       std::shared_ptr<const storage::Table> table,
-      std::shared_ptr<std::vector<std::unique_ptr<filter::operators::Operator>>>
-         partition_filter_operators,
+      std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators,
       const config::QueryOptions& query_options
    ) override;
 

src/silo/query_engine/actions/simple_select_action.cpp

@@ -33,8 +33,7 @@ void SimpleSelectAction::validateOrderByFields(const schema::TableSchema& schema
 
 arrow::Result<QueryPlan> SimpleSelectAction::toQueryPlanImpl(
    std::shared_ptr<const storage::Table> table,
-   std::shared_ptr<std::vector<std::unique_ptr<filter::operators::Operator>>>
-      partition_filter_operators,
+   std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators,
    const config::QueryOptions& query_options
 ) {
    validateOrderByFields(table->schema);

src/silo/query_engine/actions/simple_select_action.h

@@ -16,8 +16,7 @@ class SimpleSelectAction : public Action {
 
    arrow::Result<QueryPlan> toQueryPlanImpl(
       std::shared_ptr<const storage::Table> table,
-      std::shared_ptr<std::vector<std::unique_ptr<filter::operators::Operator>>>
-         partition_filter_operators,
+      std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators,
       const config::QueryOptions& query_options
    ) override;
 };

src/silo/query_engine/exec_node/legacy_result_producer.cpp

@@ -10,7 +10,7 @@ using filter::expressions::Expression;
 using filter::operators::Operator;
 
 QueryResult createLegacyQueryResult(
-   const std::vector<std::unique_ptr<filter::operators::Operator>>& partition_filter_operators,
+   const filter::operators::OperatorVector& partition_filter_operators,
    const actions::Action* action,
    std::shared_ptr<const storage::Table> table
 ) {
@@ -27,8 +27,7 @@ LegacyResultProducer::LegacyResultProducer(
    arrow::acero::ExecPlan* plan,
    const std::vector<silo::schema::ColumnIdentifier>& columns,
    std::shared_ptr<const storage::Table> table,
-   std::shared_ptr<std::vector<std::unique_ptr<filter::operators::Operator>>>
-      partition_filter_operators,
+   std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators,
    const actions::Action* action,
    size_t materialization_cutoff
 )

src/silo/query_engine/exec_node/legacy_result_producer.h

@@ -29,8 +29,7 @@ class LegacyResultProducer : public arrow::acero::ExecNode {
       arrow::acero::ExecPlan* plan,
       const std::vector<silo::schema::ColumnIdentifier>& columns,
       std::shared_ptr<const storage::Table> table,
-      std::shared_ptr<std::vector<std::unique_ptr<filter::operators::Operator>>>
-         partition_filter_operators,
+      std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators,
       const actions::Action* action,
       size_t materialization_cutoff
    );

src/silo/query_engine/exec_node/table_scan.h

@@ -23,8 +23,7 @@ class TableScan : public arrow::acero::ExecNode {
    std::map<schema::ColumnType, std::map<std::string, std::unique_ptr<arrow::ArrayBuilder>>>
       array_builders;
 
-   std::shared_ptr<std::vector<std::unique_ptr<filter::operators::Operator>>>
-      partition_filter_operators;
+   std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators;
 
    std::vector<silo::schema::ColumnIdentifier> output_fields;
    const std::shared_ptr<const storage::Table> table;
@@ -37,8 +36,7 @@ class TableScan : public arrow::acero::ExecNode {
    TableScan(
       arrow::acero::ExecPlan* plan,
       const std::vector<silo::schema::ColumnIdentifier>& columns,
-      std::shared_ptr<std::vector<std::unique_ptr<filter::operators::Operator>>>
-         partition_filter_operators,
+      std::shared_ptr<filter::operators::OperatorVector> partition_filter_operators,
       std::shared_ptr<const storage::Table> table,
       size_t batch_size_cutoff
    )

src/silo/query_engine/filter/expressions/and.cpp

@@ -25,10 +25,10 @@
 
 namespace silo::query_engine::filter::expressions {
 
-using OperatorVector = std::vector<std::unique_ptr<operators::Operator>>;
 using operators::Operator;
+using operators::OperatorVector;
 
-And::And(std::vector<std::unique_ptr<Expression>>&& children)
+And::And(ExpressionVector&& children)
     : children(std::move(children)) {}
 
 std::string And::toString() const {
@@ -56,7 +56,7 @@ void inline appendVectorToVector(
 void logCompiledChildren(
    OperatorVector& non_negated_child_operators,
    OperatorVector& negated_child_operators,
-   std::vector<std::unique_ptr<operators::Predicate>>& predicates
+   operators::PredicateVector& predicates
 ) {
    std::vector<std::string> child_operator_strings;
    std::ranges::transform(
@@ -89,12 +89,11 @@ void logCompiledChildren(
 }
 }  // namespace
 
-std::tuple<OperatorVector, OperatorVector, std::vector<std::unique_ptr<operators::Predicate>>> And::
-   compileChildren(
-      const Database& database,
-      const storage::TablePartition& database_partition,
-      AmbiguityMode mode
-   ) const {
+std::tuple<OperatorVector, OperatorVector, operators::PredicateVector> And::compileChildren(
+   const Database& database,
+   const storage::TablePartition& database_partition,
+   AmbiguityMode mode
+) const {
    OperatorVector all_child_operators;
    std::ranges::transform(
       children,
@@ -105,7 +104,7 @@ std::tuple<OperatorVector, OperatorVector, std::vector<std::unique_ptr<operators
    );
    OperatorVector non_negated_child_operators;
    OperatorVector negated_child_operators;
-   std::vector<std::unique_ptr<operators::Predicate>> predicates;
+   operators::PredicateVector predicates;
    for (auto& child : all_child_operators) {
       if (child->type() == operators::FULL) {
          SPDLOG_TRACE("Skipping full child");
@@ -115,9 +114,7 @@ std::tuple<OperatorVector, OperatorVector, std::vector<std::unique_ptr<operators
          SPDLOG_TRACE("Shortcutting because found empty child");
          OperatorVector empty;
          empty.emplace_back(std::make_unique<operators::Empty>(database_partition.sequence_count));
-         return {
-            std::move(empty), OperatorVector(), std::vector<std::unique_ptr<operators::Predicate>>{}
-         };
+         return {std::move(empty), OperatorVector(), operators::PredicateVector{}};
       }
       if (child->type() == operators::INTERSECTION) {
          auto* intersection_child = dynamic_cast<operators::Intersection*>(child.get());
@@ -224,7 +221,7 @@ void from_json(const nlohmann::json& json, std::unique_ptr<And>& filter) {
    CHECK_SILO_QUERY(
       json["children"].is_array(), "The field 'children' in an And expression needs to be an array"
    );
-   auto children = json.at("children").get<std::vector<std::unique_ptr<Expression>>>();
+   auto children = json.at("children").get<ExpressionVector>();
    filter = std::make_unique<And>(std::move(children));
 }