Skip to content

Add multi value integer attribute to attribute builder in iterator benchmark #37265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johansolbakken wants to merge 1 commit into
base: master
Choose a base branch
from
+50 −21
Open

Add multi value integer attribute to attribute builder in iterator benchmark #37265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 37 additions & 15 deletions searchlib/src/tests/queryeval/iterator_benchmark/attribute_ctx_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@
#include <vespa/searchlib/queryeval/blueprint.h>
#include <vespa/searchlib/queryeval/fake_requestcontext.h>
#include <vespa/searchlib/tensor/tensor_attribute.h>
#include <vespa/vespalib/util/require.h>

using namespace search::attribute;
using namespace search::attribute::test;

using search::fef::MatchDataLayout;
using search::query::Node;
using search::tensor::TensorAttribute;

namespace search::queryeval::test {

namespace {
Expand Down Expand Up @@ -109,12 +114,11 @@ class AttributeSearchable : public BenchmarkSearchable {

public:
AttributeSearchable(std::unique_ptr<MockAttributeContext> attr_ctx) : _attr_ctx(std::move(attr_ctx)) {}
std::unique_ptr<Blueprint> create_blueprint(const FieldSpec& field_spec,
const search::query::Node& term) override {
AttributeBlueprintFactory factory;
FakeRequestContext req_ctx(_attr_ctx.get());
search::fef::MatchDataLayout mdl;
auto bp = factory.createBlueprint(req_ctx, field_spec, term, mdl);
std::unique_ptr<Blueprint> create_blueprint(const FieldSpec& field_spec, const Node& term) override {
AttributeBlueprintFactory factory;
FakeRequestContext req_ctx(_attr_ctx.get());
MatchDataLayout mdl;
auto bp = factory.createBlueprint(req_ctx, field_spec, term, mdl);
assert(mdl.empty());
return bp;
}
Expand All @@ -125,19 +129,19 @@ class AttributeSearchable : public BenchmarkSearchable {
AttributeContextBuilder::AttributeContextBuilder() : _ctx(std::make_unique<MockAttributeContext>()) {
}

void AttributeContextBuilder::add(const search::attribute::Config& cfg, std::string_view field_name,
uint32_t num_docs, const HitSpecs& hit_specs, bool disjunct_terms) {
void AttributeContextBuilder::add(const Config& cfg, std::string_view field_name, uint32_t num_docs,
const HitSpecs& hit_specs, bool disjunct_terms) {
auto attr = make_attribute(cfg, field_name, num_docs, hit_specs, disjunct_terms);
_ctx->add(std::move(attr));
}

AttributeVector::SP
AttributeContextBuilder::add_tensor(const search::attribute::Config& cfg, std::string_view field_name,
uint32_t num_docs, std::function<vespalib::eval::Value::UP(uint32_t docid)> gen) {
AttributeVector::SP AttributeContextBuilder::add_tensor(const Config& cfg, std::string_view field_name,
uint32_t num_docs,
std::function<Value::UP(uint32_t docid)> gen) {
auto attr = AttributeFactory::createAttribute(field_name, cfg);
attr->addReservedDoc();
attr->addDocs(num_docs);
auto& real = dynamic_cast<search::tensor::TensorAttribute&>(*attr);
auto& real = dynamic_cast<TensorAttribute&>(*attr);
for (uint32_t docid = 1; docid <= num_docs; ++docid) {
auto v = gen(docid);
if (v) {
Expand All @@ -149,15 +153,33 @@ AttributeContextBuilder::add_tensor(const search::attribute::Config& cfg, std::s
return attr;
}

AttributeVector::SP AttributeContextBuilder::add_integer(const search::attribute::Config& cfg,
std::string_view field_name, uint32_t num_docs,
AttributeVector::SP AttributeContextBuilder::add_integer(const Config& cfg, std::string_view field_name,
uint32_t num_docs,
std::function<int64_t(uint32_t docid)> gen) {
return add_integer_values(cfg, field_name, num_docs,
[gen = std::move(gen)](uint32_t docid) { return std::vector{gen(docid)}; });
}

AttributeVector::SP
AttributeContextBuilder::add_integer_values(const Config& cfg, std::string_view field_name, uint32_t num_docs,
std::function<std::vector<int64_t>(uint32_t docid)> gen) {
auto attr = AttributeFactory::createAttribute(field_name, cfg);
attr->addReservedDoc();
attr->addDocs(num_docs);

auto& real = dynamic_cast<IntegerAttribute&>(*attr);
bool is_multivalue = cfg.collectionType() == CollectionType::SINGLE;

for (uint32_t docid = 1; docid <= num_docs; ++docid) {
real.update(docid, gen(docid));
auto values = gen(docid);
if (is_multivalue) {
for (const auto& value : values) {
real.append(docid, value, /*weight*/ 1);
}
} else {
REQUIRE_EQ(values.size(), 1u);
real.update(docid, values[0]);
}
}
attr->commit(CommitParam::UpdateStats::FORCE);
_ctx->add(attr);
Expand Down
19 changes: 13 additions & 6 deletions searchlib/src/tests/queryeval/iterator_benchmark/attribute_ctx_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,26 @@ namespace search::queryeval::test {
* Class used to build attribute(s), used for benchmarking.
*/
class AttributeContextBuilder {
public:
using Config = search::attribute::Config;
using Value = vespalib::eval::Value;

private:
std::unique_ptr<search::attribute::test::MockAttributeContext> _ctx;

public:
AttributeContextBuilder();
void add(const search::attribute::Config& cfg, std::string_view field_name, uint32_t num_docs,
const HitSpecs& hit_specs, bool disjunct_terms);
void add(const Config& cfg, std::string_view field_name, uint32_t num_docs, const HitSpecs& hit_specs,
bool disjunct_terms);

AttributeVector::SP add_tensor(const Config& cfg, std::string_view field_name, uint32_t num_docs,
std::function<Value::UP(uint32_t docid)> gen);

AttributeVector::SP add_tensor(const search::attribute::Config& cfg, std::string_view field_name,
uint32_t num_docs, std::function<vespalib::eval::Value::UP(uint32_t docid)> gen);
AttributeVector::SP add_integer(const Config& cfg, std::string_view field_name, uint32_t num_docs,
std::function<int64_t(uint32_t docid)> gen);

AttributeVector::SP add_integer(const search::attribute::Config& cfg, std::string_view field_name,
uint32_t num_docs, std::function<int64_t(uint32_t docid)> gen);
AttributeVector::SP add_integer_values(const Config& cfg, std::string_view field_name, uint32_t num_docs,
std::function<std::vector<int64_t>(uint32_t docid)> gen);

std::unique_ptr<BenchmarkSearchable> build();
};
Expand Down