diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-06-06 10:00:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-06 10:00:59 +0200 |
commit | 81f6540e0bcedb2636ad5ea62f23cecf0658b4dc (patch) | |
tree | 12ea280192a44f26b9718018c7cfb39b0c4c4735 /vsm/src | |
parent | a6cefdae2ea7b40e4ea4c157cbb65426458f70b9 (diff) |
Revert "Balder/sameelement in streaming"
Diffstat (limited to 'vsm/src')
-rw-r--r-- | vsm/src/vespa/vsm/searcher/fieldsearcher.cpp | 6 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/searcher/fieldsearcher.h | 4 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/docsumfilter.cpp | 2 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/docsumfilter.h | 2 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/vsm-adapter.cpp | 12 |
5 files changed, 13 insertions, 13 deletions
diff --git a/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp b/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp index 78531f41cf8..31f53fee300 100644 --- a/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp +++ b/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp @@ -73,7 +73,6 @@ FieldSearcher::FieldSearcher(const FieldIdT & fId, bool defaultPrefix) : _field(fId), _matchType(defaultPrefix ? PREFIX : REGULAR), _maxFieldLength(0x100000), - _currentElementId(0), _currentElementWeight(1), _pureUsAsciiCount(0), _pureUsAsciiFieldCount(0), @@ -86,7 +85,9 @@ FieldSearcher::FieldSearcher(const FieldIdT & fId, bool defaultPrefix) : zeroStat(); } -FieldSearcher::~FieldSearcher() = default; +FieldSearcher::~FieldSearcher() +{ +} bool FieldSearcher::search(const StorageDocument & doc) { @@ -274,7 +275,6 @@ FieldSearcher::IteratorHandler::onPrimitive(uint32_t, const Content & c) { LOG(spam, "onPrimitive: field value '%s'", c.getValue().toString().c_str()); _searcher.setCurrentWeight(c.getWeight()); - _searcher.setCurrentElementId(getArrayIndex()); _searcher.onValue(c.getValue()); } diff --git a/vsm/src/vespa/vsm/searcher/fieldsearcher.h b/vsm/src/vespa/vsm/searcher/fieldsearcher.h index 2bf976de017..236382be5f9 100644 --- a/vsm/src/vespa/vsm/searcher/fieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/fieldsearcher.h @@ -95,13 +95,11 @@ private: void prepareFieldId(); void setCurrentWeight(int32_t weight) { _currentElementWeight = weight; } - void setCurrentElementId(int32_t weight) { _currentElementId = weight; } bool onSearch(const StorageDocument & doc); virtual void onValue(const document::FieldValue & fv) = 0; FieldIdT _field; MatchType _matchType; unsigned _maxFieldLength; - uint32_t _currentElementId; int32_t _currentElementWeight; // Contains the weight of the current item being evaluated. /// Number of bytes in blocks containing pure us-ascii unsigned _pureUsAsciiCount; @@ -126,7 +124,7 @@ protected: * For each call to onValue() a batch of words are processed, and the position is local to this batch. **/ void addHit(search::QueryTerm & qt, uint32_t pos) const { - qt.add(_words + pos, field(), _currentElementId, getCurrentWeight()); + qt.add(_words + pos, field(), getCurrentWeight()); } public: static search::byte _foldLowCase[256]; diff --git a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp b/vsm/src/vespa/vsm/vsm/docsumfilter.cpp index e6af5fb6477..21fa1d9ed02 100644 --- a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp +++ b/vsm/src/vespa/vsm/vsm/docsumfilter.cpp @@ -216,7 +216,7 @@ DocsumFilter::DocsumFilter(const DocsumToolsPtr &tools, const IDocSumCache & doc _emptyFieldPath() { } -DocsumFilter::~DocsumFilter() =default; +DocsumFilter::~DocsumFilter() { } void DocsumFilter::init(const FieldMap & fieldMap, const FieldPathMapT & fieldPathMap) { diff --git a/vsm/src/vespa/vsm/vsm/docsumfilter.h b/vsm/src/vespa/vsm/vsm/docsumfilter.h index 2d1ab6984e4..a3f8a8539f1 100644 --- a/vsm/src/vespa/vsm/vsm/docsumfilter.h +++ b/vsm/src/vespa/vsm/vsm/docsumfilter.h @@ -54,7 +54,7 @@ private: public: DocsumFilter(const DocsumToolsPtr & tools, const IDocSumCache & docsumCache); - ~DocsumFilter() override; + virtual ~DocsumFilter(); const DocsumToolsPtr & getTools() const { return _tools; } /** diff --git a/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp b/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp index 1cd35e7ca61..d5078102e5d 100644 --- a/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp +++ b/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp @@ -46,7 +46,7 @@ void GetDocsumsStateCallback::FillDocumentLocations(GetDocsumsState *state, IDoc } -GetDocsumsStateCallback::~GetDocsumsStateCallback() = default; +GetDocsumsStateCallback::~GetDocsumsStateCallback() { } DocsumTools::FieldSpec::FieldSpec() : _outputName(), @@ -54,7 +54,7 @@ DocsumTools::FieldSpec::FieldSpec() : _command(VsmsummaryConfig::Fieldmap::NONE) { } -DocsumTools::FieldSpec::~FieldSpec() = default; +DocsumTools::FieldSpec::~FieldSpec() {} DocsumTools::DocsumTools(std::unique_ptr<DynamicDocsumWriter> writer) : _writer(std::move(writer)), @@ -64,7 +64,7 @@ DocsumTools::DocsumTools(std::unique_ptr<DynamicDocsumWriter> writer) : { } -DocsumTools::~DocsumTools() = default; +DocsumTools::~DocsumTools() { } bool DocsumTools::obtainFieldNames(const FastS_VsmsummaryHandle &cfg) @@ -174,6 +174,8 @@ VSMAdapter::VSMAdapter(const vespalib::string & highlightindexes, const vespalib } -VSMAdapter::~VSMAdapter() = default; - +VSMAdapter::~VSMAdapter() +{ } + +} // namespace vsm |