diff options
6 files changed, 254 insertions, 53 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java index 0fe9a84f5fa..c09fff19d58 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java @@ -378,7 +378,8 @@ public class DeploymentStatus { /** The set of jobs that need to run for the given changes to be considered complete. */ public boolean hasCompleted(InstanceName instance, Change change) { - if ( ! application.deploymentSpec().requireInstance(instance).concerns(prod)) { + DeploymentInstanceSpec spec = application.deploymentSpec().requireInstance(instance); + if ((spec.concerns(test) || spec.concerns(staging)) && ! spec.concerns(prod)) { if (newestTested(instance, run -> run.versions().targetRevision()).map(change::downgrades).orElse(false)) return true; if (newestTested(instance, run -> run.versions().targetPlatform()).map(change::downgrades).orElse(false)) return true; } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java index 6d1e5cebe0e..d9726edc496 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java @@ -1291,6 +1291,9 @@ public class DeploymentTriggerTest { String complicatedDeploymentSpec = """ <deployment version='1.0' athenz-domain='domain' athenz-service='service'> + <instance id='dev'> + <dev /> + </instance> <parallel> <instance id='instance' athenz-service='in-service'> <staging /> diff --git a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java index 7766faf28c7..f68f6816ec8 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java @@ -69,6 +69,12 @@ public class PermanentFlags { "node resources of the host, the maximum number of containers, etc.", "Takes effect on next iteration of DynamicProvisioningMaintainer."); + public static final UnboundStringFlag HOST_FLAVOR = defineStringFlag( + "host-flavor", "", + "Specifies the Vespa flavor name that the hosts of the matching nodes should have.", + "Takes effect on next deployment (including internal redeployment).", + APPLICATION_ID, CLUSTER_TYPE); + public static final UnboundBooleanFlag SKIP_MAINTENANCE_DEPLOYMENT = defineFeatureFlag( "node-repository-skip-maintenance-deployment", false, "Whether PeriodicApplicationMaintainer should skip deployment for an application", diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java index 9557354725b..ff24f627aa4 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java @@ -9,6 +9,8 @@ import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.SystemName; import com.yahoo.net.HostName; +import com.yahoo.vespa.flags.FetchVector; +import com.yahoo.vespa.flags.PermanentFlags; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeList; import com.yahoo.vespa.hosted.provision.NodeRepository; @@ -81,6 +83,7 @@ class NodeAllocation { private final NodeRepository nodeRepository; private final NodeResourceLimits nodeResourceLimits; + private final Optional<String> requiredHostFlavor; NodeAllocation(NodesAndHosts<? extends NodeList> allNodesAndHosts, ApplicationId application, ClusterSpec cluster, NodeSpec requestedNodes, Supplier<Integer> nextIndex, NodeRepository nodeRepository) { @@ -90,7 +93,12 @@ class NodeAllocation { this.requestedNodes = requestedNodes; this.nextIndex = nextIndex; this.nodeRepository = nodeRepository; - nodeResourceLimits = new NodeResourceLimits(nodeRepository); + this.nodeResourceLimits = new NodeResourceLimits(nodeRepository); + this.requiredHostFlavor = Optional.of(PermanentFlags.HOST_FLAVOR.bindTo(nodeRepository.flagSource()) + .with(FetchVector.Dimension.APPLICATION_ID, application.serializedForm()) + .with(FetchVector.Dimension.CLUSTER_TYPE, cluster.type().name()) + .value()) + .filter(s -> !s.isBlank()); } /** @@ -115,6 +123,7 @@ class NodeAllocation { if ( candidate.state() == Node.State.active && allocation.removable()) continue; // don't accept; causes removal if ( candidate.state() == Node.State.active && candidate.wantToFail()) continue; // don't accept; causes failing if ( indexes.contains(membership.index())) continue; // duplicate index (just to be sure) + if ( requiredHostFlavor.isPresent() && ! candidate.parent.map(node -> node.flavor().name()).equals(requiredHostFlavor)) continue; boolean resizeable = requestedNodes.considerRetiring() && candidate.isResizable; boolean acceptToRetire = acceptToRetire(candidate); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java index 3570e56e196..94b525cfe3c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTest.java @@ -11,12 +11,15 @@ import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NodeResources; +import com.yahoo.config.provision.NodeResources.Architecture; import com.yahoo.config.provision.NodeResources.DiskSpeed; import com.yahoo.config.provision.NodeResources.StorageType; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; +import com.yahoo.vespa.flags.InMemoryFlagSource; +import com.yahoo.vespa.flags.PermanentFlags; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeList; import com.yahoo.vespa.hosted.provision.node.Agent; @@ -260,6 +263,49 @@ public class DynamicProvisioningTest { } @Test + public void migrates_nodes_on_host_flavor_flag_change() { + InMemoryFlagSource flagSource = new InMemoryFlagSource(); + List<Flavor> flavors = List.of(new Flavor("x86", new NodeResources(1, 4, 50, 0.1, fast, local, Architecture.x86_64)), + new Flavor("arm", new NodeResources(1, 4, 50, 0.1, fast, local, Architecture.arm64))); + MockHostProvisioner hostProvisioner = new MockHostProvisioner(flavors); + ProvisioningTester tester = new ProvisioningTester.Builder().zone(zone) + .flavors(flavors) + .hostProvisioner(hostProvisioner) + .resourcesCalculator(0, 0) + .nameResolver(nameResolver) + .flagSource(flagSource) + .build(); + + ApplicationId app = ProvisioningTester.applicationId(); + ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, new ClusterSpec.Id("cluster1")).vespaVersion("8").build(); + Capacity capacity = Capacity.from(new ClusterResources(4, 2, new NodeResources(1, 4, 50, 0.1, DiskSpeed.any, StorageType.any, Architecture.any))); + + hostProvisioner.overrideHostFlavor("x86"); + tester.activate(app, cluster, capacity); + NodeList nodes = tester.nodeRepository().nodes().list(); + nodes.forEach(n -> System.out.println(n.hostname() + " " + n.flavor().name())); + assertEquals(4, nodes.owner(app).state(Node.State.active).size()); + assertEquals(Set.of("x86"), nodes.parentsOf(nodes.owner(app).state(Node.State.active)).stream().map(n -> n.flavor().name()).collect(Collectors.toSet())); + + hostProvisioner.overrideHostFlavor("arm"); + flagSource.withStringFlag(PermanentFlags.HOST_FLAVOR.id(), "arm"); + tester.activate(app, cluster, capacity); + nodes = tester.nodeRepository().nodes().list(); + assertEquals(4, nodes.owner(app).state(Node.State.inactive).size()); + assertEquals(4, nodes.owner(app).state(Node.State.active).size()); + assertEquals(Set.of("x86"), nodes.parentsOf(tester.getNodes(app, Node.State.inactive)).stream().map(n -> n.flavor().name()).collect(Collectors.toSet())); + assertEquals(Set.of("arm"), nodes.parentsOf(tester.getNodes(app, Node.State.active)).stream().map(n -> n.flavor().name()).collect(Collectors.toSet())); + + flagSource.removeFlag(PermanentFlags.HOST_FLAVOR.id()); // Resetting flag does not moves the nodes back + tester.activate(app, cluster, capacity); + nodes = tester.nodeRepository().nodes().list(); + assertEquals(4, nodes.owner(app).state(Node.State.inactive).size()); + assertEquals(4, nodes.owner(app).state(Node.State.active).size()); + assertEquals(Set.of("x86"), nodes.parentsOf(tester.getNodes(app, Node.State.inactive)).stream().map(n -> n.flavor().name()).collect(Collectors.toSet())); + assertEquals(Set.of("arm"), nodes.parentsOf(tester.getNodes(app, Node.State.active)).stream().map(n -> n.flavor().name()).collect(Collectors.toSet())); + } + + @Test public void test_changing_limits() { int memoryTax = 3; List<Flavor> flavors = List.of(new Flavor("1x", new NodeResources(1, 10 - memoryTax, 100, 0.1, fast, remote)), diff --git a/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp b/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp index 5741d210079..ecb7ee3b48b 100644 --- a/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp +++ b/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp @@ -5,14 +5,25 @@ #include <vespa/searchlib/queryeval/intermediate_blueprints.h> #include <vespa/searchlib/queryeval/leaf_blueprints.h> #include <vespa/searchlib/queryeval/isourceselector.h> +#include <vespa/searchlib/queryeval/simple_phrase_blueprint.h> +#include <vespa/searchlib/queryeval/equiv_blueprint.h> +#include <vespa/searchlib/queryeval/weighted_set_term_blueprint.h> +#include <vespa/searchlib/queryeval/dot_product_blueprint.h> +#include <vespa/searchlib/queryeval/same_element_blueprint.h> +#include <vespa/searchlib/queryeval/wand/parallel_weak_and_blueprint.h> +#include <vespa/searchlib/fef/matchdatalayout.h> #include <vespa/vespalib/util/trinary.h> #include <vespa/vespalib/util/require.h> #include <vespa/vespalib/gtest/gtest.h> #include <functional> +namespace search::fef { class TermFieldMatchDataArray; } namespace search::fef { class MatchData; } using namespace search::queryeval; +using search::fef::MatchData; +using search::fef::MatchDataLayout; +using search::fef::TermFieldMatchDataArray; using vespalib::Trinary; using Constraint = Blueprint::FilterConstraint; @@ -28,7 +39,12 @@ concept FilterFactory = requires(const T &a, bool strict, Constraint upper_or_lo template <typename T> concept FilterFactoryBuilder = requires(T a, std::unique_ptr<Blueprint> bp) { - { std::move(a).add(std::move(bp)) } -> std::same_as<T&&>; + { a.add(std::move(bp)) } -> std::same_as<T&>; +}; + +template <typename T> +concept ChildCollector = requires(T a, std::unique_ptr<Blueprint> bp) { + a.addChild(std::move(bp)); }; // inherit Blueprint to capture the default filter factory @@ -37,7 +53,22 @@ struct DefaultBlueprint : Blueprint { const State &getState() const override { abort(); } void fetchPostings(const ExecuteInfo &) override { abort(); } void freeze() override { abort(); } - SearchIteratorUP createSearch(search::fef::MatchData &, bool) const override { abort(); } + SearchIteratorUP createSearch(MatchData &, bool) const override { abort(); } +}; + +// add the use of a field to a leaf blueprint (SimplePhraseBlueprint asserts on this) +struct FakeFieldProxy : SimpleLeafBlueprint { + std::unique_ptr<Blueprint> child; + FakeFieldProxy(const FieldSpec &field, std::unique_ptr<Blueprint> child_in) + : SimpleLeafBlueprint(field), child(std::move(child_in)) + { + setParent(child->getParent()); + child->setParent(this); + } + SearchIteratorUP createLeafSearch(const TermFieldMatchDataArray &, bool) const override { abort(); } + SearchIteratorUP createFilterSearch(bool strict, Constraint upper_or_lower) const override { + return child->createFilterSearch(strict, upper_or_lower); + } }; // need one of these to be able to create a SourceBlender @@ -48,7 +79,6 @@ struct NullSelector : ISourceSelector { void compactLidSpace(uint32_t) override { abort(); } std::unique_ptr<sourceselector::Iterator> createIterator() const override { abort(); } }; -NullSelector null_selector; // make a simple result containing the given documents SimpleResult make_result(const std::vector<uint32_t> &docs) { @@ -84,7 +114,7 @@ std::unique_ptr<Blueprint> full() { } // create a leaf blueprint with the specified hits -std::unique_ptr<Blueprint> leaf(const std::vector<uint32_t> &docs) { +std::unique_ptr<Blueprint> hits(const std::vector<uint32_t> &docs) { return std::make_unique<SimpleBlueprint>(make_result(docs)); } @@ -95,24 +125,24 @@ struct Children { std::vector<Factory> list; Children() : list() {} size_t size() const { return list.size(); } - Children &&leaf(const std::vector<uint32_t> &docs) && { - list.push_back([docs](){ return ::leaf(docs); }); - return std::move(*this); + Children &hits(const std::vector<uint32_t> &docs) { + list.push_back([docs](){ return ::hits(docs); }); + return *this; } - Children &&full() && { + Children &full() { list.push_back([](){ return ::full(); }); - return std::move(*this); + return *this; } - Children &&empty() && { + Children &empty() { list.push_back([](){ return ::empty(); }); - return std::move(*this); + return *this; } template <FilterFactoryBuilder Builder> - Builder &&apply(Builder &&builder) const { + Builder &apply(Builder &builder) const { for (const Factory &make_child: list) { - std::move(builder).add(make_child()); + builder.add(make_child()); } - return std::move(builder); + return builder; } }; @@ -123,12 +153,12 @@ struct Combine { factory_fun fun; Blueprint::Children list; Combine(factory_fun fun_in) noexcept : fun(fun_in), list() {} - Combine &&add(std::unique_ptr<Blueprint> child) && { + Combine &add(std::unique_ptr<Blueprint> child) { list.push_back(std::move(child)); - return std::move(*this); + return *this; } - Combine &&add(const Children &children) && { - return children.apply(std::move(*this)); + Combine &add(const Children &children) { + return children.apply(*this); } auto createFilterSearch(bool strict, Constraint upper_or_lower) const { return fun(list, strict, upper_or_lower); @@ -137,19 +167,118 @@ struct Combine { }; Combine::~Combine() = default; -// Make a specific (intermediate) blueprint that you can add children -// to. Satisfies the FilterFactory concept. +// enable Make-ing source blender +struct SourceBlenderAdapter { + NullSelector selector; + SourceBlenderBlueprint blueprint; + SourceBlenderAdapter() : selector(), blueprint(selector) {} + void addChild(std::unique_ptr<Blueprint> child) { + blueprint.addChild(std::move(child)); + } + auto createFilterSearch(bool strict, Constraint upper_or_lower) const { + return blueprint.createFilterSearch(strict, upper_or_lower); + } +}; + +// enable Make-ing simple phrase +struct SimplePhraseAdapter { + FieldSpec field; + SimplePhraseBlueprint blueprint; + SimplePhraseAdapter() : field("foo", 3, 7), blueprint(field, false) {} + void addChild(std::unique_ptr<Blueprint> child) { + auto child_field = blueprint.getNextChildField(field); + auto term = std::make_unique<FakeFieldProxy>(child_field, std::move(child)); + blueprint.addTerm(std::move(term)); + } + auto createFilterSearch(bool strict, Constraint upper_or_lower) const { + return blueprint.createFilterSearch(strict, upper_or_lower); + } +}; + +//enable Make-ing equiv +struct EquivAdapter { + FieldSpecBaseList fields; + EquivBlueprint blueprint; + EquivAdapter() : fields(), blueprint(fields, MatchDataLayout()) {} + void addChild(std::unique_ptr<Blueprint> child) { + blueprint.addTerm(std::move(child), 1.0); + } + auto createFilterSearch(bool strict, Constraint upper_or_lower) const { + return blueprint.createFilterSearch(strict, upper_or_lower); + } +}; + +// enable Make-ing weighted set +struct WeightedSetTermAdapter { + FieldSpec field; + WeightedSetTermBlueprint blueprint; + WeightedSetTermAdapter() : field("foo", 3, 7), blueprint(field) {} + void addChild(std::unique_ptr<Blueprint> child) { + blueprint.addTerm(std::move(child), 100); + } + auto createFilterSearch(bool strict, Constraint upper_or_lower) const { + return blueprint.createFilterSearch(strict, upper_or_lower); + } +}; + +// enable Make-ing dot product +struct DotProductAdapter { + FieldSpec field; + DotProductBlueprint blueprint; + DotProductAdapter() : field("foo", 3, 7), blueprint(field) {} + void addChild(std::unique_ptr<Blueprint> child) { + auto child_field = blueprint.getNextChildField(field); + auto term = std::make_unique<FakeFieldProxy>(child_field, std::move(child)); + blueprint.addTerm(std::move(term), 100); + } + auto createFilterSearch(bool strict, Constraint upper_or_lower) const { + return blueprint.createFilterSearch(strict, upper_or_lower); + } +}; + +// enable Make-ing parallel weak and +struct ParallelWeakAndAdapter { + FieldSpec field; + ParallelWeakAndBlueprint blueprint; + ParallelWeakAndAdapter() : field("foo", 3, 7), blueprint(field, 100, 0.0, 1.0) {} + void addChild(std::unique_ptr<Blueprint> child) { + auto child_field = blueprint.getNextChildField(field); + auto term = std::make_unique<FakeFieldProxy>(child_field, std::move(child)); + blueprint.addTerm(std::move(term), 100); + } + auto createFilterSearch(bool strict, Constraint upper_or_lower) const { + return blueprint.createFilterSearch(strict, upper_or_lower); + } +}; + +// enable Make-ing same element +struct SameElementAdapter { + SameElementBlueprint blueprint; + SameElementAdapter() : blueprint("foo", false) {} + void addChild(std::unique_ptr<Blueprint> child) { + auto child_field = blueprint.getNextChildField("foo", 3); + auto term = std::make_unique<FakeFieldProxy>(child_field, std::move(child)); + blueprint.addTerm(std::move(term)); + } + auto createFilterSearch(bool strict, Constraint upper_or_lower) const { + return blueprint.createFilterSearch(strict, upper_or_lower); + } +}; + +// Make a specific intermediate-ish blueprint that you can add +// children to. Satisfies the FilterFactory concept. template <FilterFactory T> +requires ChildCollector<T> struct Make { T blueprint; template <typename ... Args> Make(Args && ... args) : blueprint(std::forward<Args>(args)...) {} - Make &&add(std::unique_ptr<Blueprint> child) && { + Make &add(std::unique_ptr<Blueprint> child) { blueprint.addChild(std::move(child)); - return std::move(*this); + return *this; } - Make &&add(const Children &children) && { - return children.apply(std::move(*this)); + Make &add(const Children &children) { + return children.apply(*this); } auto createFilterSearch(bool strict, Constraint upper_or_lower) const { return blueprint.createFilterSearch(strict, upper_or_lower); @@ -159,19 +288,20 @@ struct Make { // what kind of results are we expecting from a filter search? struct Expect { Trinary matches_any; - SimpleResult hits; - Expect(const std::vector<uint32_t> &hits_in) - : matches_any(Trinary::Undefined), hits(make_result(hits_in)) {} - Expect(Trinary matches_any_in) : matches_any(matches_any_in), hits() { + SimpleResult docs; + Expect(const std::vector<uint32_t> &docs_in) + : matches_any(Trinary::Undefined), docs(make_result(docs_in)) {} + Expect(Trinary matches_any_in) : matches_any(matches_any_in), docs() { REQUIRE(matches_any != Trinary::Undefined); if (matches_any == Trinary::True) { - hits = make_full_result(); + docs = make_full_result(); } else { - hits = make_empty_result(); + docs = make_empty_result(); } } static Expect empty() { return Expect(Trinary::False); } static Expect full() { return Expect(Trinary::True); } + static Expect hits(const std::vector<uint32_t> &docs) { return Expect(docs); } }; template <FilterFactory Blueprint> @@ -187,7 +317,7 @@ void verify(const Blueprint &blueprint, const Expect &upper, const Expect &lower } else { actual.search(*filter, docid_limit); } - EXPECT_EQ(actual, expect.hits); + EXPECT_EQ(actual, expect.docs); } } } @@ -206,7 +336,7 @@ TEST(FilterSearchTest, full_leaf) { } TEST(FilterSearchTest, custom_leaf) { - verify(*leaf({5,10,20}), Expect({5,10,20})); + verify(*hits({5,10,20}), Expect::hits({5,10,20})); } TEST(FilterSearchTest, default_blueprint) { @@ -215,48 +345,54 @@ TEST(FilterSearchTest, default_blueprint) { TEST(FilterSearchTest, simple_or) { auto child_list = Children() - .leaf({5, 10}) - .leaf({7}) - .leaf({3, 11}); - auto expected = Expect({3, 5, 7, 10, 11}); + .hits({5, 10}) + .hits({7}) + .hits({3, 11}); + auto expected = Expect::hits({3, 5, 7, 10, 11}); verify(Combine(Blueprint::create_or_filter).add(child_list), expected); verify(Make<OrBlueprint>().add(child_list), expected); + verify(Make<EquivAdapter>().add(child_list), expected); + verify(Make<WeightedSetTermAdapter>().add(child_list), expected); + verify(Make<DotProductAdapter>().add(child_list), expected); verify(Combine(Blueprint::create_atmost_or_filter).add(child_list), expected, Expect::empty()); - verify(Make<WeakAndBlueprint>(child_list.size()).add(child_list), expected, Expect::empty()); - verify(Make<SourceBlenderBlueprint>(null_selector).add(child_list), expected, Expect::empty()); + verify(Make<WeakAndBlueprint>(100).add(child_list), expected, Expect::empty()); + verify(Make<SourceBlenderAdapter>().add(child_list), expected, Expect::empty()); + verify(Make<ParallelWeakAndAdapter>().add(child_list), expected, Expect::empty()); } TEST(FilterSearchTest, simple_and) { auto child_list = Children() - .leaf({1, 2, 3, 4, 5, 6}) - .leaf({2, 4, 6, 7}) - .leaf({1, 4, 6, 7, 10}); - auto expected = Expect({4, 6}); + .hits({1, 2, 3, 4, 5, 6}) + .hits({2, 4, 6, 7}) + .hits({1, 4, 6, 7, 10}); + auto expected = Expect::hits({4, 6}); verify(Combine(Blueprint::create_and_filter).add(child_list), expected); verify(Make<AndBlueprint>().add(child_list), expected); verify(Combine(Blueprint::create_atmost_and_filter).add(child_list), expected, Expect::empty()); verify(Make<NearBlueprint>(3).add(child_list), expected, Expect::empty()); verify(Make<ONearBlueprint>(3).add(child_list), expected, Expect::empty()); + verify(Make<SimplePhraseAdapter>().add(child_list), expected, Expect::empty()); + verify(Make<SameElementAdapter>().add(child_list), expected, Expect::empty()); } TEST(FilterSearchTest, simple_andnot) { auto child_list = Children() - .leaf({1, 2, 3, 4, 5, 6}) - .leaf({2, 4, 6}) - .leaf({4, 6, 7}); - auto expected = Expect({1, 3, 5}); + .hits({1, 2, 3, 4, 5, 6}) + .hits({2, 4, 6}) + .hits({4, 6, 7}); + auto expected = Expect::hits({1, 3, 5}); verify(Combine(Blueprint::create_andnot_filter).add(child_list), expected); verify(Make<AndNotBlueprint>().add(child_list), expected); } TEST(FilterSearchTest, rank_filter) { - auto child_list1 = Children().leaf({1,2,3}).empty().full(); - auto child_list2 = Children().empty().leaf({1,2,3}).full(); - auto child_list3 = Children().full().leaf({1,2,3}).empty(); - verify(Combine(Blueprint::create_first_child_filter).add(child_list1), Expect({1,2,3})); + auto child_list1 = Children().hits({1,2,3}).empty().full(); + auto child_list2 = Children().empty().hits({1,2,3}).full(); + auto child_list3 = Children().full().hits({1,2,3}).empty(); + verify(Combine(Blueprint::create_first_child_filter).add(child_list1), Expect::hits({1,2,3})); verify(Combine(Blueprint::create_first_child_filter).add(child_list2), Expect::empty()); verify(Combine(Blueprint::create_first_child_filter).add(child_list3), Expect::full()); - verify(Make<RankBlueprint>().add(child_list1), Expect({1,2,3})); + verify(Make<RankBlueprint>().add(child_list1), Expect::hits({1,2,3})); verify(Make<RankBlueprint>().add(child_list2), Expect::empty()); verify(Make<RankBlueprint>().add(child_list3), Expect::full()); } |