aboutsummaryrefslogtreecommitdiffstats
path: root/searchsummary
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahooinc.com>2022-09-21 12:36:02 +0000
committerGeir Storli <geirst@yahooinc.com>2022-09-21 12:36:02 +0000
commit686fa6fef1bbd8ac12240d774c69ab076747e6a3 (patch)
treece321ca4b420a3ee4e66a32da29ceebeb1667970 /searchsummary
parent034ec90d9277634618454f827ed5095135e1e1ca (diff)
Standardize on using lowercase first letter in function names.
Diffstat (limited to 'searchsummary')
-rw-r--r--searchsummary/src/tests/docsummary/document_id_dfw/document_id_dfw_test.cpp8
-rw-r--r--searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp14
-rw-r--r--searchsummary/src/tests/docsummary/positionsdfw_test.cpp4
-rw-r--r--searchsummary/src/tests/docsummary/result_class/result_class_test.cpp12
-rw-r--r--searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp28
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/attribute_combiner_dfw.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/copy_dfw.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/docsum_field_writer.h4
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h4
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp18
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h4
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/document_id_dfw.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/empty_dfw.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp22
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp26
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h16
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/matched_elements_filter_dfw.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h4
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.cpp2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp12
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/resultclass.h12
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp30
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h12
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp2
-rw-r--r--searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h2
-rw-r--r--searchsummary/src/vespa/searchsummary/test/mock_state_callback.h4
33 files changed, 132 insertions, 132 deletions
diff --git a/searchsummary/src/tests/docsummary/document_id_dfw/document_id_dfw_test.cpp b/searchsummary/src/tests/docsummary/document_id_dfw/document_id_dfw_test.cpp
index 5e49e9e714e..7e54f35ff38 100644
--- a/searchsummary/src/tests/docsummary/document_id_dfw/document_id_dfw_test.cpp
+++ b/searchsummary/src/tests/docsummary/document_id_dfw/document_id_dfw_test.cpp
@@ -54,8 +54,8 @@ make_doc_type_repo()
}
struct MyGetDocsumsStateCallback : GetDocsumsStateCallback {
- virtual void FillSummaryFeatures(GetDocsumsState&) override {}
- virtual void FillRankFeatures(GetDocsumsState&) override {}
+ virtual void fillSummaryFeatures(GetDocsumsState&) override {}
+ virtual void fillRankFeatures(GetDocsumsState&) override {}
std::unique_ptr<MatchingElements> fill_matching_elements(const MatchingElementsFields &) override { abort(); }
};
@@ -84,8 +84,8 @@ DocumentIdDFWTest::DocumentIdDFWTest()
_repo(make_doc_type_repo()),
_document_type(_repo->getDocumentType(doc_type_name))
{
- auto* cfg = _result_config->AddResultClass("default", 0);
- cfg->AddConfigEntry(_field_name.c_str());
+ auto* cfg = _result_config->addResultClass("default", 0);
+ cfg->addConfigEntry(_field_name.c_str());
}
diff --git a/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp b/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp
index b165542e2e2..7eb634f5609 100644
--- a/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp
+++ b/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp
@@ -95,10 +95,10 @@ public:
_doc_type.addField(Field("map2", _map_type));
_doc_type.addField(Field("wset", _wset_type));
- auto* result_class = _config.AddResultClass("test", class_id);
- EXPECT_TRUE(result_class->AddConfigEntry("array"));
- EXPECT_TRUE(result_class->AddConfigEntry("map"));
- EXPECT_TRUE(result_class->AddConfigEntry("map2"));
+ auto* result_class = _config.addResultClass("test", class_id);
+ EXPECT_TRUE(result_class->addConfigEntry("array"));
+ EXPECT_TRUE(result_class->addConfigEntry("map"));
+ EXPECT_TRUE(result_class->addConfigEntry("map2"));
}
~DocsumStore();
std::unique_ptr<IDocsumStoreDocument> getMappedDocsum() {
@@ -190,8 +190,8 @@ public:
{
}
~StateCallback() override;
- void FillSummaryFeatures(GetDocsumsState&) override {}
- void FillRankFeatures(GetDocsumsState&) override {}
+ void fillSummaryFeatures(GetDocsumsState&) override {}
+ void fillRankFeatures(GetDocsumsState&) override {}
std::unique_ptr<MatchingElements> fill_matching_elements(const MatchingElementsFields&) override {
auto result = std::make_unique<MatchingElements>();
result->add_matching_elements(doc_id, _field_name, _matching_elements);
@@ -317,7 +317,7 @@ TEST_F(MatchedElementsFilterTest, matching_elements_fields_is_setup_for_map_fiel
TEST_F(MatchedElementsFilterTest, field_writer_is_not_generated_as_it_depends_on_data_from_document_store)
{
auto writer = make_field_writer("array");
- EXPECT_FALSE(writer->IsGenerated());
+ EXPECT_FALSE(writer->isGenerated());
}
GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
index f23bd2f0437..778a0b145ce 100644
--- a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
+++ b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp
@@ -78,8 +78,8 @@ public:
};
struct MyGetDocsumsStateCallback : GetDocsumsStateCallback {
- virtual void FillSummaryFeatures(GetDocsumsState&) override {}
- virtual void FillRankFeatures(GetDocsumsState&) override {}
+ virtual void fillSummaryFeatures(GetDocsumsState&) override {}
+ virtual void fillRankFeatures(GetDocsumsState&) override {}
std::unique_ptr<MatchingElements> fill_matching_elements(const MatchingElementsFields &) override { abort(); }
};
diff --git a/searchsummary/src/tests/docsummary/result_class/result_class_test.cpp b/searchsummary/src/tests/docsummary/result_class/result_class_test.cpp
index a47786c2a44..f5790c20b80 100644
--- a/searchsummary/src/tests/docsummary/result_class/result_class_test.cpp
+++ b/searchsummary/src/tests/docsummary/result_class/result_class_test.cpp
@@ -12,16 +12,16 @@ private:
bool _generated;
public:
MockWriter(bool generated) : _generated(generated) {}
- bool IsGenerated() const override { return _generated; }
+ bool isGenerated() const override { return _generated; }
virtual void insertField(uint32_t, const IDocsumStoreDocument*, GetDocsumsState&, vespalib::slime::Inserter &) const override {}
};
TEST(ResultClassTest, subset_of_fields_in_class_are_generated)
{
ResultClass rc("test");
- rc.AddConfigEntry("from_disk");
- rc.AddConfigEntry("generated", std::make_unique<MockWriter>(true));
- rc.AddConfigEntry("not_generated", std::make_unique<MockWriter>(false));
+ rc.addConfigEntry("from_disk");
+ rc.addConfigEntry("generated", std::make_unique<MockWriter>(true));
+ rc.addConfigEntry("not_generated", std::make_unique<MockWriter>(false));
EXPECT_FALSE(rc.all_fields_generated({}));
EXPECT_FALSE(rc.all_fields_generated({"from_disk", "generated", "not_generated"}));
@@ -33,8 +33,8 @@ TEST(ResultClassTest, subset_of_fields_in_class_are_generated)
TEST(ResultClassTest, all_fields_in_class_are_generated)
{
ResultClass rc("test");
- rc.AddConfigEntry("generated_1", std::make_unique<MockWriter>(true));
- rc.AddConfigEntry("generated_2", std::make_unique<MockWriter>(true));
+ rc.addConfigEntry("generated_1", std::make_unique<MockWriter>(true));
+ rc.addConfigEntry("generated_2", std::make_unique<MockWriter>(true));
EXPECT_TRUE(rc.all_fields_generated({}));
EXPECT_TRUE(rc.all_fields_generated({"generated_1"}));
diff --git a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
index 9808f46d668..a44d56e894d 100644
--- a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
+++ b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
@@ -88,8 +88,8 @@ struct SlimeSummaryTest : testing::Test, IDocsumStore, GetDocsumsStateCallback {
}
return std::make_unique<DocsumStoreDocument>(std::move(doc));
}
- void FillSummaryFeatures(GetDocsumsState&) override { }
- void FillRankFeatures(GetDocsumsState&) override { }
+ void fillSummaryFeatures(GetDocsumsState&) override { }
+ void fillRankFeatures(GetDocsumsState&) override { }
std::unique_ptr<MatchingElements> fill_matching_elements(const search::MatchingElementsFields &) override { abort(); }
};
@@ -103,19 +103,19 @@ SlimeSummaryTest::SlimeSummaryTest()
empty_get_mapped_docsum(false)
{
auto config = std::make_unique<ResultConfig>();
- ResultClass *cfg = config->AddResultClass("default", 0);
+ ResultClass *cfg = config->addResultClass("default", 0);
EXPECT_TRUE(cfg != nullptr);
- EXPECT_TRUE(cfg->AddConfigEntry("int_field"));
- EXPECT_TRUE(cfg->AddConfigEntry("short_field"));
- EXPECT_TRUE(cfg->AddConfigEntry("byte_field"));
- EXPECT_TRUE(cfg->AddConfigEntry("float_field"));
- EXPECT_TRUE(cfg->AddConfigEntry("double_field"));
- EXPECT_TRUE(cfg->AddConfigEntry("int64_field"));
- EXPECT_TRUE(cfg->AddConfigEntry("string_field"));
- EXPECT_TRUE(cfg->AddConfigEntry("data_field"));
- EXPECT_TRUE(cfg->AddConfigEntry("longstring_field"));
- EXPECT_TRUE(cfg->AddConfigEntry("longdata_field"));
- EXPECT_TRUE(cfg->AddConfigEntry("int_pair_field"));
+ EXPECT_TRUE(cfg->addConfigEntry("int_field"));
+ EXPECT_TRUE(cfg->addConfigEntry("short_field"));
+ EXPECT_TRUE(cfg->addConfigEntry("byte_field"));
+ EXPECT_TRUE(cfg->addConfigEntry("float_field"));
+ EXPECT_TRUE(cfg->addConfigEntry("double_field"));
+ EXPECT_TRUE(cfg->addConfigEntry("int64_field"));
+ EXPECT_TRUE(cfg->addConfigEntry("string_field"));
+ EXPECT_TRUE(cfg->addConfigEntry("data_field"));
+ EXPECT_TRUE(cfg->addConfigEntry("longstring_field"));
+ EXPECT_TRUE(cfg->addConfigEntry("longdata_field"));
+ EXPECT_TRUE(cfg->addConfigEntry("int_pair_field"));
config->set_default_result_class_id(0);
writer = std::make_unique<DynamicDocsumWriter>(std::move(config), std::unique_ptr<KeywordExtractor>());
int_pair_type.addField(Field("foo", *DataType::INT));
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attribute_combiner_dfw.h b/searchsummary/src/vespa/searchsummary/docsummary/attribute_combiner_dfw.h
index 0e1163df5e2..edfeebf55fa 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/attribute_combiner_dfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/attribute_combiner_dfw.h
@@ -35,7 +35,7 @@ protected:
virtual DocsumFieldWriterState* allocFieldWriterState(search::attribute::IAttributeContext &context, vespalib::Stash& stash, const MatchingElements* matching_elements) const = 0;
public:
~AttributeCombinerDFW() override;
- bool IsGenerated() const override { return true; }
+ bool isGenerated() const override { return true; }
bool setFieldWriterStateIndex(uint32_t fieldWriterStateIndex) override;
static std::unique_ptr<DocsumFieldWriter> create(const vespalib::string &fieldName, search::attribute::IAttributeContext &attrCtx,
bool filter_elements, std::shared_ptr<MatchingElementsFields> matching_elems_fields);
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h
index 2b61803ebb3..922c8a81b2a 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h
@@ -33,7 +33,7 @@ protected:
const vespalib::string & getAttributeName() const override { return _attrName; }
public:
explicit AttrDFW(const vespalib::string & attrName);
- bool IsGenerated() const override { return true; }
+ bool isGenerated() const override { return true; }
};
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/copy_dfw.h b/searchsummary/src/vespa/searchsummary/docsummary/copy_dfw.h
index 175bc5b3246..62f3576096d 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/copy_dfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/copy_dfw.h
@@ -20,7 +20,7 @@ public:
explicit CopyDFW(const vespalib::string& inputField);
~CopyDFW() override;
- bool IsGenerated() const override { return false; }
+ bool isGenerated() const override { return false; }
void insertField(uint32_t docid, const IDocsumStoreDocument* doc, GetDocsumsState& state, vespalib::slime::Inserter &target) const override;
};
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsum_field_writer.h b/searchsummary/src/vespa/searchsummary/docsummary/docsum_field_writer.h
index 77dc5d5d2d6..da29d7363cb 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsum_field_writer.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsum_field_writer.h
@@ -12,7 +12,7 @@ class IDocsumStoreDocument;
class GetDocsumsState;
/*
- * Abstract class for writing document summaries.
+ * Abstract class for writing a field in a document summary.
*/
class DocsumFieldWriter
{
@@ -22,7 +22,7 @@ public:
{
}
virtual ~DocsumFieldWriter() = default;
- virtual bool IsGenerated() const = 0;
+ virtual bool isGenerated() const = 0;
virtual void insertField(uint32_t docid, const IDocsumStoreDocument* doc, GetDocsumsState& state, vespalib::slime::Inserter &target) const = 0;
virtual const vespalib::string & getAttributeName() const;
virtual bool isDefaultValue(uint32_t docid, const GetDocsumsState& state) const;
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h
index 0ebcc20ef42..86cc94d69bc 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h
@@ -32,8 +32,8 @@ class DocsumFieldWriterState;
class GetDocsumsStateCallback
{
public:
- virtual void FillSummaryFeatures(GetDocsumsState& state) = 0;
- virtual void FillRankFeatures(GetDocsumsState& state) = 0;
+ virtual void fillSummaryFeatures(GetDocsumsState& state) = 0;
+ virtual void fillRankFeatures(GetDocsumsState& state) = 0;
virtual std::unique_ptr<MatchingElements> fill_matching_elements(const MatchingElementsFields &matching_elems_fields) = 0;
virtual ~GetDocsumsStateCallback() = default;
GetDocsumsStateCallback(const GetDocsumsStateCallback &) = delete;
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
index c31c463f287..88e6951f3b2 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
@@ -24,9 +24,9 @@ DynamicDocsumWriter::resolveClassInfo(vespalib::stringref class_name,
const vespalib::hash_set<vespalib::string>& fields) const
{
DynamicDocsumWriter::ResolveClassInfo result;
- auto id = _resultConfig->LookupResultClassId(class_name);
+ auto id = _resultConfig->lookupResultClassId(class_name);
- const auto* res_class = (id != ResultConfig::NoClassID()) ? _resultConfig->LookupResultClass(id) : nullptr;
+ const auto* res_class = (id != ResultConfig::noClassID()) ? _resultConfig->lookupResultClass(id) : nullptr;
if (res_class == nullptr) {
Issue::report("Illegal docsum class requested: %s, using empty docsum for documents",
vespalib::string(class_name).c_str());
@@ -48,8 +48,8 @@ DynamicDocsumWriter::insertDocsum(const ResolveClassInfo & rci, uint32_t docid,
if (rci.all_fields_generated) {
// generate docsum entry on-the-fly
vespalib::slime::Cursor & docsum = topInserter.insertObject();
- for (uint32_t i = 0; i < rci.res_class->GetNumEntries(); ++i) {
- const ResConfigEntry *resCfg = rci.res_class->GetEntry(i);
+ for (uint32_t i = 0; i < rci.res_class->getNumEntries(); ++i) {
+ const ResConfigEntry *resCfg = rci.res_class->getEntry(i);
const DocsumFieldWriter *writer = resCfg->writer();
if (state._args.need_field(resCfg->name()) && ! writer->isDefaultValue(docid, state)) {
const Memory field_name(resCfg->name().data(), resCfg->name().size());
@@ -65,8 +65,8 @@ DynamicDocsumWriter::insertDocsum(const ResolveClassInfo & rci, uint32_t docid,
}
// insert docsum blob
vespalib::slime::Cursor & docsum = topInserter.insertObject();
- for (uint32_t i = 0; i < rci.res_class->GetNumEntries(); ++i) {
- const ResConfigEntry *outCfg = rci.res_class->GetEntry(i);
+ for (uint32_t i = 0; i < rci.res_class->getNumEntries(); ++i) {
+ const ResConfigEntry *outCfg = rci.res_class->getEntry(i);
if (!state._args.need_field(outCfg->name())) {
continue;
}
@@ -96,7 +96,7 @@ DynamicDocsumWriter::DynamicDocsumWriter(std::unique_ptr<ResultConfig> config, s
DynamicDocsumWriter::~DynamicDocsumWriter() = default;
void
-DynamicDocsumWriter::InitState(const IAttributeManager & attrMan, GetDocsumsState& state, const ResolveClassInfo& rci)
+DynamicDocsumWriter::initState(const IAttributeManager & attrMan, GetDocsumsState& state, const ResolveClassInfo& rci)
{
state._kwExtractor = _keywordExtractor.get();
state._attrCtx = attrMan.createContext();
@@ -104,11 +104,11 @@ DynamicDocsumWriter::InitState(const IAttributeManager & attrMan, GetDocsumsStat
if (result_class == nullptr) {
return;
}
- size_t num_entries = result_class->GetNumEntries();
+ size_t num_entries = result_class->getNumEntries();
state._attributes.resize(num_entries);
state._fieldWriterStates.resize(result_class->get_num_field_writer_states());
for (size_t i(0); i < num_entries; i++) {
- const DocsumFieldWriter *fw = result_class->GetEntry(i)->writer();
+ const DocsumFieldWriter *fw = result_class->getEntry(i)->writer();
if (fw) {
const vespalib::string & attributeName = fw->getAttributeName();
if (!attributeName.empty()) {
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
index b7e21056dba..20d132c150f 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
@@ -38,7 +38,7 @@ public:
};
virtual ~IDocsumWriter() = default;
- virtual void InitState(const search::IAttributeManager & attrMan, GetDocsumsState& state, const ResolveClassInfo& rci) = 0;
+ virtual void initState(const search::IAttributeManager & attrMan, GetDocsumsState& state, const ResolveClassInfo& rci) = 0;
virtual void insertDocsum(const ResolveClassInfo & rci, uint32_t docid, GetDocsumsState& state,
IDocsumStore &docinfos, Inserter & target) = 0;
virtual ResolveClassInfo resolveClassInfo(vespalib::stringref class_name,
@@ -61,7 +61,7 @@ public:
const ResultConfig *GetResultConfig() { return _resultConfig.get(); }
- void InitState(const search::IAttributeManager & attrMan, GetDocsumsState& state, const ResolveClassInfo& rci) override;
+ void initState(const search::IAttributeManager & attrMan, GetDocsumsState& state, const ResolveClassInfo& rci) override;
void insertDocsum(const ResolveClassInfo & outputClassInfo, uint32_t docid, GetDocsumsState& state,
IDocsumStore &docinfos, Inserter & inserter) override;
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/document_id_dfw.h b/searchsummary/src/vespa/searchsummary/docsummary/document_id_dfw.h
index b6a89ff7828..11a69e1ed59 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/document_id_dfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/document_id_dfw.h
@@ -15,7 +15,7 @@ private:
public:
DocumentIdDFW();
~DocumentIdDFW() override;
- bool IsGenerated() const override { return false; }
+ bool isGenerated() const override { return false; }
void insertField(uint32_t docid, const IDocsumStoreDocument* doc, GetDocsumsState& state, vespalib::slime::Inserter &target) const override;
};
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/empty_dfw.h b/searchsummary/src/vespa/searchsummary/docsummary/empty_dfw.h
index 3e05e029722..7f6e2d78cb7 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/empty_dfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/empty_dfw.h
@@ -15,7 +15,7 @@ public:
EmptyDFW();
~EmptyDFW() override;
- bool IsGenerated() const override { return true; }
+ bool isGenerated() const override { return true; }
void insertField(uint32_t docid, GetDocsumsState& state, vespalib::slime::Inserter &target) const override;
};
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp
index a21b3b597ba..db5518ce779 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.cpp
@@ -32,7 +32,7 @@ GetDocsumArgs::initFromDocsumRequest(const engine::DocsumRequest &req)
}
void
-GetDocsumArgs::SetStackDump(uint32_t stackDumpLen, const char *stackDump)
+GetDocsumArgs::setStackDump(uint32_t stackDumpLen, const char *stackDump)
{
_stackDump.resize(stackDumpLen);
memcpy(&_stackDump[0], stackDump, _stackDump.size());
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h
index 975ae5f7592..22de0a42dc6 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h
@@ -29,7 +29,7 @@ public:
void initFromDocsumRequest(const search::engine::DocsumRequest &req);
void setResultClassName(vespalib::stringref name) { _resultClassName = name; }
- void SetStackDump(uint32_t stackDumpLen, const char *stackDump);
+ void setStackDump(uint32_t stackDumpLen, const char *stackDump);
void locations_possible(bool value) { _locations_possible = value; }
bool locations_possible() const { return _locations_possible; }
const vespalib::string &getLocation() const { return _location; }
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp
index a13f65db5ce..455027a1234 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp
@@ -22,7 +22,7 @@ JuniperQueryAdapter::~JuniperQueryAdapter() = default;
// TODO: put this functionality into the stack dump iterator
bool
-JuniperQueryAdapter::SkipItem(search::SimpleQueryStackDumpIterator *iterator) const
+JuniperQueryAdapter::skipItem(search::SimpleQueryStackDumpIterator *iterator) const
{
uint32_t skipCount = iterator->getArity();
@@ -53,19 +53,19 @@ JuniperQueryAdapter::Traverse(juniper::IQueryVisitor *v) const
case search::ParseItem::ITEM_EQUIV:
case search::ParseItem::ITEM_WORD_ALTERNATIVES:
if (!v->VisitOR(&item, iterator.getArity()))
- rc = SkipItem(&iterator);
+ rc = skipItem(&iterator);
break;
case search::ParseItem::ITEM_AND:
if (!v->VisitAND(&item, iterator.getArity()))
- rc = SkipItem(&iterator);
+ rc = skipItem(&iterator);
break;
case search::ParseItem::ITEM_NOT:
if (!v->VisitANDNOT(&item, iterator.getArity()))
- rc = SkipItem(&iterator);
+ rc = skipItem(&iterator);
break;
case search::ParseItem::ITEM_RANK:
if (!v->VisitRANK(&item, iterator.getArity()))
- rc = SkipItem(&iterator);
+ rc = skipItem(&iterator);
break;
case search::ParseItem::ITEM_TERM:
case search::ParseItem::ITEM_EXACTSTRINGTERM:
@@ -98,7 +98,7 @@ JuniperQueryAdapter::Traverse(juniper::IQueryVisitor *v) const
break;
case search::ParseItem::ITEM_PHRASE:
if (!v->VisitPHRASE(&item, iterator.getArity()))
- rc = SkipItem(&iterator);
+ rc = skipItem(&iterator);
break;
case search::ParseItem::ITEM_PREFIXTERM:
case search::ParseItem::ITEM_SUBSTRINGTERM:
@@ -109,15 +109,15 @@ JuniperQueryAdapter::Traverse(juniper::IQueryVisitor *v) const
break;
case search::ParseItem::ITEM_ANY:
if (!v->VisitANY(&item, iterator.getArity()))
- rc = SkipItem(&iterator);
+ rc = skipItem(&iterator);
break;
case search::ParseItem::ITEM_NEAR:
if (!v->VisitNEAR(&item, iterator.getArity(),iterator.getNearDistance()))
- rc = SkipItem(&iterator);
+ rc = skipItem(&iterator);
break;
case search::ParseItem::ITEM_ONEAR:
if (!v->VisitWITHIN(&item, iterator.getArity(),iterator.getNearDistance()))
- rc = SkipItem(&iterator);
+ rc = skipItem(&iterator);
break;
case search::ParseItem::ITEM_TRUE:
case search::ParseItem::ITEM_FALSE:
@@ -134,7 +134,7 @@ JuniperQueryAdapter::Traverse(juniper::IQueryVisitor *v) const
case search::ParseItem::ITEM_NEAREST_NEIGHBOR:
case search::ParseItem::ITEM_GEO_LOCATION_TERM:
if (!v->VisitOther(&item, iterator.getArity())) {
- rc = SkipItem(&iterator);
+ rc = skipItem(&iterator);
}
break;
default:
@@ -158,7 +158,7 @@ JuniperQueryAdapter::UsefulIndex(const juniper::QueryItem* item) const
return true;
}
auto index = item->get_index();
- return _kwExtractor->IsLegalIndex(index);
+ return _kwExtractor->isLegalIndex(index);
}
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.h b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.h
index 18886ca2007..ac6fe0d7c32 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.h
@@ -29,7 +29,7 @@ public:
JuniperQueryAdapter(KeywordExtractor *kwExtractor, vespalib::stringref buf,
const search::fef::Properties *highlightTerms = nullptr);
~JuniperQueryAdapter() override;
- bool SkipItem(search::SimpleQueryStackDumpIterator *iterator) const;
+ bool skipItem(search::SimpleQueryStackDumpIterator *iterator) const;
bool Traverse(juniper::IQueryVisitor *v) const override;
bool UsefulIndex(const juniper::QueryItem* item) const override;
};
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h
index 24c99873f58..312c4ece516 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h
@@ -27,7 +27,7 @@ protected:
std::unique_ptr<juniper::Config> _juniperConfig;
const juniper::Juniper *_juniper;
private:
- bool IsGenerated() const override { return false; }
+ bool isGenerated() const override { return false; }
JuniperDFW(const JuniperDFW &);
JuniperDFW & operator=(const JuniperDFW &);
};
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp
index e8ff3068a4c..333fddf1f68 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp
@@ -28,7 +28,7 @@ KeywordExtractor::KeywordExtractor(const IDocsumEnvironment * env)
KeywordExtractor::~KeywordExtractor() = default;
bool
-KeywordExtractor::IsLegalIndexName(const char *idxName) const
+KeywordExtractor::isLegalIndexName(const char *idxName) const
{
return _legalIndexes.find(idxName) != _legalIndexes.end();
}
@@ -47,7 +47,7 @@ KeywordExtractor::IndexPrefix::Match(const char *idxName) const
}
void
-KeywordExtractor::AddLegalIndexSpec(const char *spec)
+KeywordExtractor::addLegalIndexSpec(const char *spec)
{
if (spec == nullptr)
return;
@@ -66,9 +66,9 @@ KeywordExtractor::AddLegalIndexSpec(const char *spec)
offset = seppos + 1;
if (tok[tok.size() - 1] == '*') {
tok.resize(tok.size() - 1);
- AddLegalIndexPrefix(tok.c_str());
+ addLegalIndexPrefix(tok.c_str());
} else {
- AddLegalIndexName(tok.c_str());
+ addLegalIndexName(tok.c_str());
}
}
}
@@ -76,16 +76,16 @@ KeywordExtractor::AddLegalIndexSpec(const char *spec)
tok = toks.substr(offset);
if (tok[tok.size() - 1] == '*') {
tok.resize(tok.size() - 1);
- AddLegalIndexPrefix(tok.c_str());
+ addLegalIndexPrefix(tok.c_str());
} else {
- AddLegalIndexName(tok.c_str());
+ addLegalIndexName(tok.c_str());
}
}
}
vespalib::string
-KeywordExtractor::GetLegalIndexSpec()
+KeywordExtractor::getLegalIndexSpec()
{
vespalib::string spec;
@@ -110,16 +110,16 @@ KeywordExtractor::GetLegalIndexSpec()
bool
-KeywordExtractor::IsLegalIndex(vespalib::stringref idxS) const
+KeywordExtractor::isLegalIndex(vespalib::stringref idx) const
{
vespalib::string resolvedIdxName;
if (_env != nullptr) {
- resolvedIdxName = _env->lookupIndex(idxS);
+ resolvedIdxName = _env->lookupIndex(idx);
} else {
- if ( ! idxS.empty() ) {
- resolvedIdxName = idxS;
+ if ( ! idx.empty() ) {
+ resolvedIdxName = idx;
} else {
resolvedIdxName = "__defaultindex";
}
@@ -128,8 +128,8 @@ KeywordExtractor::IsLegalIndex(vespalib::stringref idxS) const
if (resolvedIdxName.empty())
return false;
- return (IsLegalIndexPrefix(resolvedIdxName.c_str()) ||
- IsLegalIndexName(resolvedIdxName.c_str()));
+ return (isLegalIndexPrefix(resolvedIdxName.c_str()) ||
+ isLegalIndexName(resolvedIdxName.c_str()));
}
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h
index 9d46f0c8d89..71e27e96ac1 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h
@@ -28,7 +28,7 @@ private:
std::vector<IndexPrefix> _legalPrefixes;
Set _legalIndexes;
- bool IsLegalIndexPrefix(const char *idxName) const {
+ bool isLegalIndexPrefix(const char *idxName) const {
for (auto& prefix : _legalPrefixes ) {
if (prefix.Match(idxName)) {
return true;
@@ -37,14 +37,14 @@ private:
return false;
}
- void AddLegalIndexPrefix(const char *prefix) {
+ void addLegalIndexPrefix(const char *prefix) {
_legalPrefixes.emplace_back(prefix);
}
- void AddLegalIndexName(const char *idxName) {
+ void addLegalIndexName(const char *idxName) {
_legalIndexes.insert(idxName);
}
- bool IsLegalIndexName(const char *idxName) const;
+ bool isLegalIndexName(const char *idxName) const;
public:
explicit KeywordExtractor(const IDocsumEnvironment * env);
KeywordExtractor(const KeywordExtractor &) = delete;
@@ -60,17 +60,17 @@ public:
*
* @param spec list of legal index names and prefixes.
**/
- void AddLegalIndexSpec(const char *spec);
+ void addLegalIndexSpec(const char *spec);
/**
* Create a spec on the same format as accepted by the @ref
- * AddLegalIndexSpec method. Freeing the returned spec is the
+ * addLegalIndexSpec method. Freeing the returned spec is the
* responsibility of the caller of this method.
*
* @return spec defining legal index names and prefixes.
**/
- vespalib::string GetLegalIndexSpec();
+ vespalib::string getLegalIndexSpec();
/**
@@ -80,7 +80,7 @@ public:
*
* @return true if the given index name is legal.
**/
- bool IsLegalIndex(vespalib::stringref idx) const;
+ bool isLegalIndex(vespalib::stringref idx) const;
};
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/matched_elements_filter_dfw.h b/searchsummary/src/vespa/searchsummary/docsummary/matched_elements_filter_dfw.h
index 7dafdbc9e6b..cf631e81e5e 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/matched_elements_filter_dfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/matched_elements_filter_dfw.h
@@ -33,7 +33,7 @@ public:
search::attribute::IAttributeContext& attr_ctx,
std::shared_ptr<MatchingElementsFields> matching_elems_fields);
~MatchedElementsFilterDFW() override;
- bool IsGenerated() const override { return false; }
+ bool isGenerated() const override { return false; }
void insertField(uint32_t docid, const IDocsumStoreDocument* doc, GetDocsumsState& state,
vespalib::slime::Inserter& target) const override;
};
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h
index 5ac5f0fe051..62306be7ded 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.h
@@ -42,7 +42,7 @@ private:
public:
explicit AbsDistanceDFW(const vespalib::string & attrName);
- bool IsGenerated() const override { return true; }
+ bool isGenerated() const override { return true; }
void insertField(uint32_t docid, GetDocsumsState& state,
vespalib::slime::Inserter &target) const override;
@@ -59,7 +59,7 @@ private:
public:
using UP = std::unique_ptr<PositionsDFW>;
PositionsDFW(const vespalib::string & attrName, bool useV8geoPositions);
- bool IsGenerated() const override { return true; }
+ bool isGenerated() const override { return true; }
void insertField(uint32_t docid, GetDocsumsState& state, vespalib::slime::Inserter &target) const override;
static UP create(const char *attribute_name, const IAttributeManager *index_man, bool useV8geoPositions);
};
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
index 08fba307e8f..bad1ad5a6f3 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
@@ -16,7 +16,7 @@ RankFeaturesDFW::insertField(uint32_t docid, GetDocsumsState& state,
vespalib::slime::Inserter &target) const
{
if ( !state._rankFeatures ) {
- state._callback.FillRankFeatures(state);
+ state._callback.fillRankFeatures(state);
if (state._rankFeatures.get() == nullptr) { // still no rank features to write
return;
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h
index dbd5f3ce0b6..469e496af96 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.h
@@ -13,7 +13,7 @@ public:
RankFeaturesDFW(const RankFeaturesDFW &) = delete;
RankFeaturesDFW & operator=(const RankFeaturesDFW &) = delete;
~RankFeaturesDFW() override;
- bool IsGenerated() const override { return true; }
+ bool isGenerated() const override { return true; }
void insertField(uint32_t docid, GetDocsumsState& state, vespalib::slime::Inserter &target) const override;
};
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.cpp b/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.cpp
index 0c07260c1c8..4d00265be0a 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/res_config_entry.cpp
@@ -20,7 +20,7 @@ void
ResConfigEntry::set_writer(std::unique_ptr<DocsumFieldWriter> writer_in)
{
_writer = std::move(writer_in);
- _generated = _writer ? _writer->IsGenerated() : false;
+ _generated = _writer ? _writer->isGenerated() : false;
}
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp
index 998ed9e2ccc..f68c322dafd 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.cpp
@@ -19,14 +19,14 @@ ResultClass::ResultClass(const char *name)
ResultClass::~ResultClass() = default;
int
-ResultClass::GetIndexFromName(const char* name) const
+ResultClass::getIndexFromName(const char* name) const
{
auto found = _nameMap.find(name);
return (found != _nameMap.end()) ? found->second : -1;
}
bool
-ResultClass::AddConfigEntry(const char *name, std::unique_ptr<DocsumFieldWriter> docsum_field_writer)
+ResultClass::addConfigEntry(const char *name, std::unique_ptr<DocsumFieldWriter> docsum_field_writer)
{
if (_nameMap.find(name) != _nameMap.end()) {
return false;
@@ -36,7 +36,7 @@ ResultClass::AddConfigEntry(const char *name, std::unique_ptr<DocsumFieldWriter>
ResConfigEntry e(name);
if (docsum_field_writer) {
docsum_field_writer->setIndex(_entries.size());
- bool generated = docsum_field_writer->IsGenerated();
+ bool generated = docsum_field_writer->isGenerated();
_dynInfo.update_override_counts(generated);
if (docsum_field_writer->setFieldWriterStateIndex(_num_field_writer_states)) {
++_num_field_writer_states;
@@ -48,15 +48,15 @@ ResultClass::AddConfigEntry(const char *name, std::unique_ptr<DocsumFieldWriter>
}
bool
-ResultClass::AddConfigEntry(const char *name)
+ResultClass::addConfigEntry(const char *name)
{
- return AddConfigEntry(name, {});
+ return addConfigEntry(name, {});
}
bool
ResultClass::all_fields_generated(const vespalib::hash_set<vespalib::string>& fields) const
{
- if (_dynInfo._generateCnt == GetNumEntries()) {
+ if (_dynInfo._generateCnt == getNumEntries()) {
return true;
}
if (fields.empty()) {
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h
index 502ff879e3c..9e5533ee196 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/resultclass.h
@@ -72,7 +72,7 @@ public:
*
* @return number of config entries held by this object.
**/
- uint32_t GetNumEntries() const { return _entries.size(); }
+ uint32_t getNumEntries() const { return _entries.size(); }
/**
@@ -86,8 +86,8 @@ public:
* @param name the name of the field to add.
* @param docsum_field_writer field writer for writing field
**/
- bool AddConfigEntry(const char *name, std::unique_ptr<DocsumFieldWriter> docsum_field_writer);
- bool AddConfigEntry(const char *name);
+ bool addConfigEntry(const char *name, std::unique_ptr<DocsumFieldWriter> docsum_field_writer);
+ bool addConfigEntry(const char *name);
/**
* Obtain the field index from the field name. The field index may
@@ -97,19 +97,19 @@ public:
* GeneralResult object, make sure that the
* GeneralResult object has this object as it's result
* class. NOTE2: This method is called by the
- * GeneralResult::GetEntry(string) method; no need to call it
+ * GeneralResult::getEntry(string) method; no need to call it
* directly.
*
* @return field index or -1 if not found
**/
- int GetIndexFromName(const char* name) const;
+ int getIndexFromName(const char* name) const;
/**
* Obtain config entry by field index.
*
* @return config entry or NULL if not found.
**/
- const ResConfigEntry *GetEntry(uint32_t offset) const {
+ const ResConfigEntry *getEntry(uint32_t offset) const {
return (offset < _entries.size()) ? &_entries[offset] : nullptr;
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp
index 8a70b5b7782..f620dcb1df5 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.cpp
@@ -37,7 +37,7 @@ ResultConfig::~ResultConfig()
void
-ResultConfig::Reset()
+ResultConfig::reset()
{
if (! _classLookup.empty()) {
Clean();
@@ -46,18 +46,18 @@ ResultConfig::Reset()
ResultClass *
-ResultConfig::AddResultClass(const char *name, uint32_t id)
+ResultConfig::addResultClass(const char *name, uint32_t classID)
{
ResultClass *ret = nullptr;
- if (id != NoClassID() && (_classLookup.find(id) == _classLookup.end())) {
+ if (classID != noClassID() && (_classLookup.find(classID) == _classLookup.end())) {
auto rc = std::make_unique<ResultClass>(name);
ret = rc.get();
- _classLookup[id] = std::move(rc);
+ _classLookup[classID] = std::move(rc);
if (_nameLookup.find(name) != _nameLookup.end()) {
- LOG(warning, "Duplicate result class name: %s (now maps to class id %u)", name, id);
+ LOG(warning, "Duplicate result class name: %s (now maps to class id %u)", name, classID);
}
- _nameLookup[name] = id;
+ _nameLookup[name] = classID;
}
return ret;
}
@@ -69,17 +69,17 @@ ResultConfig::set_default_result_class_id(uint32_t id)
}
const ResultClass*
-ResultConfig::LookupResultClass(uint32_t id) const
+ResultConfig::lookupResultClass(uint32_t classID) const
{
- auto it = _classLookup.find(id);
+ auto it = _classLookup.find(classID);
return (it != _classLookup.end()) ? it->second.get() : nullptr;
}
uint32_t
-ResultConfig::LookupResultClassId(const vespalib::string &name) const
+ResultConfig::lookupResultClassId(const vespalib::string &name) const
{
auto found = _nameLookup.find(name);
- return (found != _nameLookup.end()) ? found->second : ((name.empty() || (name == "default")) ? _defaultSummaryId : NoClassID());
+ return (found != _nameLookup.end()) ? found->second : ((name.empty() || (name == "default")) ? _defaultSummaryId : noClassID());
}
@@ -98,10 +98,10 @@ ResultConfig::set_wanted_v8_geo_positions(bool value)
}
bool
-ResultConfig::ReadConfig(const SummaryConfig &cfg, const char *configId, IDocsumFieldWriterFactory& docsum_field_writer_factory)
+ResultConfig::readConfig(const SummaryConfig &cfg, const char *configId, IDocsumFieldWriterFactory& docsum_field_writer_factory)
{
bool rc = true;
- Reset();
+ reset();
int maxclassID = 0x7fffffff; // avoid negative classids
_defaultSummaryId = cfg.defaultsummaryid;
global_useV8geoPositions = cfg.usev8geopositions;
@@ -117,7 +117,7 @@ ResultConfig::ReadConfig(const SummaryConfig &cfg, const char *configId, IDocsum
rc = false;
break;
}
- ResultClass *resClass = AddResultClass(cfg_class.name.c_str(), classID);
+ ResultClass *resClass = addResultClass(cfg_class.name.c_str(), classID);
if (resClass == nullptr) {
LOG(error,"%s: unable to add classes[%d] name %s", configId, i, cfg_class.name.c_str());
rc = false;
@@ -141,7 +141,7 @@ ResultConfig::ReadConfig(const SummaryConfig &cfg, const char *configId, IDocsum
break;
}
}
- rc = resClass->AddConfigEntry(fieldname, std::move(docsum_field_writer));
+ rc = resClass->addConfigEntry(fieldname, std::move(docsum_field_writer));
if (!rc) {
LOG(error, "%s %s.fields: duplicate name '%s'", configId, cfg_class.name.c_str(), fieldname);
break;
@@ -149,7 +149,7 @@ ResultConfig::ReadConfig(const SummaryConfig &cfg, const char *configId, IDocsum
}
}
if (!rc) {
- Reset(); // FAIL, discard all config
+ reset(); // FAIL, discard all config
}
return rc;
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h
index c690d40f8c2..39cebb5e91d 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/resultconfig.h
@@ -88,7 +88,7 @@ public:
/**
* @return value denoting an undefined class id.
**/
- static uint32_t NoClassID() { return static_cast<uint32_t>(-1); }
+ static uint32_t noClassID() { return static_cast<uint32_t>(-1); }
// whether last config seen wanted useV8geoPositions = true
static bool wantedV8geoPositions();
@@ -102,7 +102,7 @@ public:
* state right after it was created. This method may call both Clean
* and Init.
**/
- void Reset();
+ void reset();
/**
@@ -115,7 +115,7 @@ public:
* @param name name of result class to add.
* @param classID id of result class to add.
**/
- ResultClass *AddResultClass(const char *name, uint32_t classID);
+ ResultClass *addResultClass(const char *name, uint32_t classID);
/*
* Set default result class id.
@@ -129,7 +129,7 @@ public:
* @return result class with the given id or NULL if not found.
* @param classID the id of the result class to look up.
**/
- const ResultClass *LookupResultClass(uint32_t classID) const;
+ const ResultClass *lookupResultClass(uint32_t classID) const;
/**
@@ -138,7 +138,7 @@ public:
* @return result class id or configured default if empty or "default".
* @param name the name of the result class, NoClassId(-1) meaning undefined
**/
- uint32_t LookupResultClassId(const vespalib::string &name) const;
+ uint32_t lookupResultClassId(const vespalib::string &name) const;
/**
* Read config that has been fetched from configserver.
@@ -146,7 +146,7 @@ public:
* @return true(success)/false(fail)
* @param configId reference on server
**/
- bool ReadConfig(const SummaryConfig &cfg, const char *configId, IDocsumFieldWriterFactory& docsum_field_writer_factory);
+ bool readConfig(const SummaryConfig &cfg, const char *configId, IDocsumFieldWriterFactory& docsum_field_writer_factory);
};
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
index 13a3a345bf6..a680b01d887 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
@@ -24,7 +24,7 @@ SummaryFeaturesDFW::insertField(uint32_t docid, GetDocsumsState& state, vespalib
return;
}
if ( ! state._summaryFeatures) {
- state._callback.FillSummaryFeatures(state);
+ state._callback.fillSummaryFeatures(state);
if ( !state._summaryFeatures) { // still no summary features to write
return;
}
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
index 661d23c2d64..535360d9661 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
@@ -13,7 +13,7 @@ public:
SummaryFeaturesDFW(const SummaryFeaturesDFW &) = delete;
SummaryFeaturesDFW & operator=(const SummaryFeaturesDFW &) = delete;
~SummaryFeaturesDFW() override;
- bool IsGenerated() const override { return true; }
+ bool isGenerated() const override { return true; }
void insertField(uint32_t docid, GetDocsumsState& state,
vespalib::slime::Inserter &target) const override;
};
diff --git a/searchsummary/src/vespa/searchsummary/test/mock_state_callback.h b/searchsummary/src/vespa/searchsummary/test/mock_state_callback.h
index 71c2be19bba..a576053ea3d 100644
--- a/searchsummary/src/vespa/searchsummary/test/mock_state_callback.h
+++ b/searchsummary/src/vespa/searchsummary/test/mock_state_callback.h
@@ -16,8 +16,8 @@ public:
{
}
~MockStateCallback() override { }
- void FillSummaryFeatures(GetDocsumsState&) override { }
- void FillRankFeatures(GetDocsumsState&) override { }
+ void fillSummaryFeatures(GetDocsumsState&) override { }
+ void fillRankFeatures(GetDocsumsState&) override { }
std::unique_ptr<MatchingElements> fill_matching_elements(const search::MatchingElementsFields&) override {
return std::make_unique<MatchingElements>(_matching_elems);
}