Merge pull request #36604 from vespa-engine/johsol/spec-remove

Remove Spec and make builder of blueprint factories

Author: johansolbakken

searchlib/src/tests/queryeval/iterator_benchmark/CMakeLists.txt

@@ -3,7 +3,7 @@ vespa_add_executable(searchlib_iterator_benchmark_test_app TEST
     SOURCES
     attribute_ctx_builder.cpp
     benchmark_blueprint_factory.cpp
-    benchmark_spec.cpp
+    blueprint_factory_builder.cpp
     common.cpp
     disk_index_builder.cpp
     intermediate_blueprint_factory.cpp

searchlib/src/tests/queryeval/iterator_benchmark/benchmark_spec.cpp

@@ -0,0 +1,11 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include "blueprint_factory_builder.h"
+
+namespace search::queryeval::test {
+
+FactoryPtr term(FieldConfig field, uint32_t num_docs, uint32_t default_values_per_document, double hit_ratio) {
+    return make_blueprint_factory(field, QueryOperator::Term, num_docs, default_values_per_document, hit_ratio, 1, false);
+}
+
+}

searchlib/src/tests/queryeval/iterator_benchmark/benchmark_spec.h

@@ -0,0 +1,26 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#pragma once
+
+/*
+ * Ergonomic builder pattern over blueprint factories.
+ */
+
+#include "benchmark_blueprint_factory.h"
+#include "common.h"
+#include "intermediate_blueprint_factory.h"
+
+namespace search::queryeval::test {
+
+using FactoryPtr = std::shared_ptr<BenchmarkBlueprintFactory>;
+
+FactoryPtr term(FieldConfig field, uint32_t num_docs, uint32_t default_values_per_document, double hit_ratio);
+
+template <class... Cs>
+FactoryPtr and_(Cs&&... cs) {
+    auto up = std::make_unique<AndBlueprintFactory>();
+    (up->add_child(std::forward<Cs>(cs)), ...);
+    return up;
+}
+
+}

searchlib/src/tests/queryeval/iterator_benchmark/blueprint_factory_builder.cpp

@@ -1,7 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "benchmark_blueprint_factory.h"
-#include "benchmark_spec.h"
+#include "blueprint_factory_builder.h"
 #include "common.h"
 #include "intermediate_blueprint_factory.h"
 
@@ -1102,20 +1102,18 @@ TEST(IteratorBenchmark, btree_vs_array_nonstrict_crossover) {
 
 TEST(IteratorBenchmark, spec_factory_test) {
     auto tree = and_(
-        term(int32_fs, 0.01),
-        or_(term(str_fs, 0.1), term(str_fs, 0.3)));
+        term(int32_fs, num_docs, 0, 0.01),
+        term(str_fs, num_docs, 0, 0.3));
 
-    SpecBlueprintFactory factory(std::move(tree), num_docs);
-
-    auto res = benchmark_search(factory,
+    auto res = benchmark_search(*tree,
                                 num_docs + 1,
                                 /*strict*/ true,
                                 /*force_strict*/ false,
                                 /*unpack_iterator*/ false,
                                 /*filter_hit_ratio*/ 1.0,
                                 PlanningAlgo::Cost);
 
-    std::cout << factory.get_name(/*unused*/ *factory.make_blueprint()) << "\n";
+    std::cout << tree->get_name(/*unused*/ *tree->make_blueprint()) << "\n";
     std::cout << "time_ms=" << res.time_ms
               << " seeks=" << res.seeks
               << " hits=" << res.hits