diff options
| author | Geir Storli <geirst@vespa.ai> | 2024-04-02 14:30:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-02 14:30:11 +0200 |
| commit | 1ab300e96d41a603de4f63ef934107a25d98b8ca (patch) | |
| tree | 0e489935d31d476b8e2e2d74c714335b9a0d968d | |
| parent | 6d78aece9c6f4960e3a8a04d95d2336165e28603 (diff) | |
| parent | 10f1b07c05d38c652730dba9753d5a9110cbcef4 (diff) | |
Merge pull request #30782 from vespa-engine/havardpe/dump-blueprint-strictness
dump strictness for blueprints
4 files changed, 15 insertions, 2 deletions
diff --git a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp index d556d997206..bb79ad85cc0 100644 --- a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp +++ b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp @@ -658,6 +658,7 @@ getExpectedBlueprint() " strict_cost: 0\n" " sourceId: 4294967295\n" " docid_limit: 0\n" + " strict: false\n" " children: std::vector {\n" " [0]: (anonymous namespace)::MyTerm {\n" " isTermLike: true\n" @@ -680,6 +681,7 @@ getExpectedBlueprint() " strict_cost: 0\n" " sourceId: 4294967295\n" " docid_limit: 0\n" + " strict: false\n" " }\n" " }\n" "}\n"; @@ -712,6 +714,7 @@ getExpectedSlimeBlueprint() { " strict_cost: 0.0," " sourceId: 4294967295," " docid_limit: 0," + " strict: false," " children: {" " '[type]': 'std::vector'," " '[0]': {" @@ -738,7 +741,8 @@ getExpectedSlimeBlueprint() { " cost: 0.0," " strict_cost: 0.0," " sourceId: 4294967295," - " docid_limit: 0" + " docid_limit: 0," + " strict: false" " }" " }" "}"; diff --git a/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp b/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp index d3b6a90e5db..72dd2b5a4ad 100644 --- a/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp +++ b/searchlib/src/tests/queryeval/blueprint/intermediate_blueprints_test.cpp @@ -555,6 +555,13 @@ void compare(const Blueprint &bp1, const Blueprint &bp2, bool expect_eq) { check_value(a.asDouble()); check_value(b.asDouble()); return true; + } else if (field == "strict") { + // ignore strict-tagging differences between optimized and unoptimized blueprint trees + if (a.type().getId() == vespalib::slime::BOOL::ID && + b.type().getId() == vespalib::slime::BOOL::ID) + { + return true; + } } } if (expect_eq) { diff --git a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp index 992ac320385..2bd560637d2 100644 --- a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp +++ b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp @@ -635,6 +635,7 @@ TEST(ParallelWeakAndTest, require_that_asString_on_blueprint_works) " strict_cost: 0\n" " sourceId: 4294967295\n" " docid_limit: 0\n" + " strict: false\n" " _weights: std::vector {\n" " [0]: 5\n" " }\n" @@ -660,6 +661,7 @@ TEST(ParallelWeakAndTest, require_that_asString_on_blueprint_works) " strict_cost: 0\n" " sourceId: 4294967295\n" " docid_limit: 0\n" + " strict: false\n" " }\n" " }\n" "}\n"; diff --git a/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp b/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp index 1d323bf298f..73f99d28eda 100644 --- a/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp @@ -398,7 +398,7 @@ Blueprint::visitMembers(vespalib::ObjectVisitor &visitor) const visitor.visitFloat("strict_cost", strict_cost()); visitor.visitInt("sourceId", _sourceId); visitor.visitInt("docid_limit", _docid_limit); - // visitor.visitBool("strict", _strict); + visitor.visitBool("strict", _strict); } namespace blueprint { |