diff options
author | Tor Egge <Tor.Egge@oath.com> | 2018-06-08 09:27:18 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2018-06-08 09:27:18 +0000 |
commit | 742b761fa885c9c26321d3a9961cc8067c370f1c (patch) | |
tree | 037ef39b9153286cc570258848b216460a848a8b | |
parent | 5ed1021b72b1640731a7446e4bdec61359536e8d (diff) |
Rename _len member to _size, to match accessor method.
Add assert triggered by unhandled attribute basic type.
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.cpp | 12 | ||||
-rw-r--r-- | searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.cpp index 66940f37a13..2eebe7137dc 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.cpp +++ b/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.cpp @@ -4,6 +4,7 @@ #include <vespa/searchcommon/attribute/attributecontent.h> #include <vespa/searchcommon/common/undefinedvalues.h> #include <vespa/vespalib/data/slime/cursor.h> +#include <cassert> using search::attribute::BasicType; using search::attribute::IAttributeVector; @@ -16,7 +17,7 @@ AttributeFieldWriter::AttributeFieldWriter(const vespalib::string &fieldName, const IAttributeVector &attr) : _fieldName(fieldName), _attr(attr), - _len(0) + _size(0) { } @@ -81,7 +82,7 @@ void WriteField<Content>::fetch(uint32_t docId) { _content.fill(_attr, docId); - _len = _content.size(); + _size = _content.size(); } WriteStringField::WriteStringField(const vespalib::string &fieldName, @@ -95,7 +96,7 @@ WriteStringField::~WriteStringField() = default; void WriteStringField::print(uint32_t idx, Cursor &cursor) { - if (idx < _len) { + if (idx < _size) { const char *s = _content[idx]; if (s[0] != '\0') { cursor.setString(_fieldName, vespalib::Memory(s)); @@ -114,7 +115,7 @@ WriteFloatField::~WriteFloatField() = default; void WriteFloatField::print(uint32_t idx, Cursor &cursor) { - if (idx < _len) { + if (idx < _size) { double val = _content[idx]; if (!search::attribute::isUndefined(val)) { cursor.setDouble(_fieldName, val); @@ -135,7 +136,7 @@ WriteIntField::~WriteIntField() = default; void WriteIntField::print(uint32_t idx, Cursor &cursor) { - if (idx < _len) { + if (idx < _size) { auto val = _content[idx]; if (val != _undefined) { cursor.setLong(_fieldName, _content[idx]); @@ -163,6 +164,7 @@ AttributeFieldWriter::create(const vespalib::string &fieldName, const IAttribute case BasicType::STRING: return std::make_unique<WriteStringField>(fieldName, attr); default: + assert(false); abort(); } } diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h b/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h index 03eda4b067a..104455a0e79 100644 --- a/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h +++ b/searchsummary/src/vespa/searchsummary/docsummary/attribute_field_writer.h @@ -20,7 +20,7 @@ class AttributeFieldWriter protected: const vespalib::Memory _fieldName; const search::attribute::IAttributeVector &_attr; - size_t _len; + size_t _size; public: AttributeFieldWriter(const vespalib::string &fieldName, const search::attribute::IAttributeVector &attr); @@ -28,7 +28,7 @@ public: 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); - uint32_t size() const { return _len; } + uint32_t size() const { return _size; } }; } |