diff options
author | Tor Egge <Tor.Egge@oath.com> | 2018-06-08 12:28:46 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2018-06-08 12:28:46 +0000 |
commit | 74501fc60135bbe840782a444f8c5628ab13276d (patch) | |
tree | 2310a044497ac6f9500e40c8937745eda23e0cae /searchsummary | |
parent | 23dc7db626daef98536095f2b399fe084a7a74bb (diff) |
Use vespalib::Memory to represent nested field name.
Diffstat (limited to 'searchsummary')
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.cpp | 20 | ||||
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.cpp index 2eebe7137dc..99c5d8b7f30 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.cpp @@ -13,7 +13,7 @@ using vespalib::slime::Cursor; namespace search::docsummary { -AttributeFieldWriter::AttributeFieldWriter(const vespalib::string &fieldName, +AttributeFieldWriter::AttributeFieldWriter(vespalib::Memory fieldName, const IAttributeVector &attr) : _fieldName(fieldName), _attr(attr), @@ -31,7 +31,7 @@ class WriteField : public AttributeFieldWriter protected: Content _content; - WriteField(const vespalib::string &fieldName, const IAttributeVector &attr); + WriteField(vespalib::Memory fieldName, const IAttributeVector &attr); ~WriteField() override; private: void fetch(uint32_t docId) override; @@ -40,7 +40,7 @@ private: class WriteStringField : public WriteField<search::attribute::ConstCharContent> { public: - WriteStringField(const vespalib::string &fieldName, + WriteStringField(vespalib::Memory fieldName, const IAttributeVector &attr); ~WriteStringField() override; void print(uint32_t idx, Cursor &cursor) override; @@ -50,7 +50,7 @@ public: class WriteFloatField : public WriteField<search::attribute::FloatContent> { public: - WriteFloatField(const vespalib::string &fieldName, + WriteFloatField(vespalib::Memory fieldName, const IAttributeVector &attr); ~WriteFloatField() override; void print(uint32_t idx, Cursor &cursor) override; @@ -60,7 +60,7 @@ class WriteIntField : public WriteField<search::attribute::IntegerContent> { IAttributeVector::largeint_t _undefined; public: - WriteIntField(const vespalib::string &fieldName, + WriteIntField(vespalib::Memory fieldName, const IAttributeVector &attr, IAttributeVector::largeint_t undefined); ~WriteIntField() override; @@ -68,7 +68,7 @@ public: }; template <class Content> -WriteField<Content>::WriteField(const vespalib::string &fieldName, const IAttributeVector &attr) +WriteField<Content>::WriteField(vespalib::Memory fieldName, const IAttributeVector &attr) : AttributeFieldWriter(fieldName, attr), _content() { @@ -85,7 +85,7 @@ WriteField<Content>::fetch(uint32_t docId) _size = _content.size(); } -WriteStringField::WriteStringField(const vespalib::string &fieldName, +WriteStringField::WriteStringField(vespalib::Memory fieldName, const IAttributeVector &attr) : WriteField(fieldName, attr) { @@ -104,7 +104,7 @@ WriteStringField::print(uint32_t idx, Cursor &cursor) } } -WriteFloatField::WriteFloatField(const vespalib::string &fieldName, +WriteFloatField::WriteFloatField(vespalib::Memory fieldName, const IAttributeVector &attr) : WriteField(fieldName, attr) { @@ -123,7 +123,7 @@ WriteFloatField::print(uint32_t idx, Cursor &cursor) } } -WriteIntField::WriteIntField(const vespalib::string &fieldName, +WriteIntField::WriteIntField(vespalib::Memory fieldName, const IAttributeVector &attr, IAttributeVector::largeint_t undefined) : WriteField(fieldName, attr), @@ -147,7 +147,7 @@ WriteIntField::print(uint32_t idx, Cursor &cursor) } std::unique_ptr<AttributeFieldWriter> -AttributeFieldWriter::create(const vespalib::string &fieldName, const IAttributeVector &attr) +AttributeFieldWriter::create(vespalib::Memory fieldName, const IAttributeVector &attr) { switch (attr.getBasicType()) { case BasicType::INT8: diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h b/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h index 104455a0e79..06a8bd1b737 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h @@ -21,13 +21,13 @@ protected: const vespalib::Memory _fieldName; const search::attribute::IAttributeVector &_attr; size_t _size; -public: - AttributeFieldWriter(const vespalib::string &fieldName, + AttributeFieldWriter(vespalib::Memory fieldName, const search::attribute::IAttributeVector &attr); +public: virtual ~AttributeFieldWriter(); virtual void fetch(uint32_t docId) = 0; virtual void print(uint32_t idx, vespalib::slime::Cursor &cursor) = 0; - static std::unique_ptr<AttributeFieldWriter> create(const vespalib::string &fieldName, const search::attribute::IAttributeVector &attr); + static std::unique_ptr<AttributeFieldWriter> create(vespalib::Memory fieldName, const search::attribute::IAttributeVector &attr); uint32_t size() const { return _size; } }; |