diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-07-30 12:54:18 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-07-30 13:00:40 +0200 |
commit | fba625e9a06308364f0c0e6728a9d2195b9354a0 (patch) | |
tree | f26a1979f4c5733331c11832a0256234a4a8b38b /vsm/src | |
parent | b53df1fcba1dae72a6e78c7892bc7b51408d4348 (diff) |
Use proper scope for enum constants.
Diffstat (limited to 'vsm/src')
-rw-r--r-- | vsm/src/tests/searcher/searcher.cpp | 6 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/docsumfieldspec.cpp | 2 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/docsumfilter.cpp | 12 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp | 36 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/vsm-adapter.cpp | 2 |
5 files changed, 29 insertions, 29 deletions
diff --git a/vsm/src/tests/searcher/searcher.cpp b/vsm/src/tests/searcher/searcher.cpp index f5f7508a256..02555f9d6f6 100644 --- a/vsm/src/tests/searcher/searcher.cpp +++ b/vsm/src/tests/searcher/searcher.cpp @@ -766,7 +766,7 @@ TEST("FieldSearchSpec constrution") { EXPECT_EQUAL(0x100000u, f.maxLength()); } { - FieldSearchSpec f(7, "f0", VsmfieldsConfig::Fieldspec::AUTOUTF8, "substring", 789); + FieldSearchSpec f(7, "f0", VsmfieldsConfig::Fieldspec::Searchmethod::AUTOUTF8, "substring", 789); EXPECT_TRUE(f.valid()); EXPECT_EQUAL(7u, f.id()); EXPECT_EQUAL("f0", f.name()); @@ -777,8 +777,8 @@ TEST("FieldSearchSpec constrution") { TEST("snippet modifier manager") { FieldSearchSpecMapT specMap; - specMap[0] = FieldSearchSpec(0, "f0", VsmfieldsConfig::Fieldspec::AUTOUTF8, "substring", 1000); - specMap[1] = FieldSearchSpec(1, "f1", VsmfieldsConfig::Fieldspec::AUTOUTF8, "", 1000); + specMap[0] = FieldSearchSpec(0, "f0", VsmfieldsConfig::Fieldspec::Searchmethod::AUTOUTF8, "substring", 1000); + specMap[1] = FieldSearchSpec(1, "f1", VsmfieldsConfig::Fieldspec::Searchmethod::AUTOUTF8, "", 1000); IndexFieldMapT indexMap; indexMap["i0"].push_back(0); indexMap["i1"].push_back(1); diff --git a/vsm/src/vespa/vsm/vsm/docsumfieldspec.cpp b/vsm/src/vespa/vsm/vsm/docsumfieldspec.cpp index c5e63fde7ba..1440b894934 100644 --- a/vsm/src/vespa/vsm/vsm/docsumfieldspec.cpp +++ b/vsm/src/vespa/vsm/vsm/docsumfieldspec.cpp @@ -16,7 +16,7 @@ DocsumFieldSpec::FieldIdentifier::FieldIdentifier(FieldIdT id, FieldPath path) : DocsumFieldSpec::DocsumFieldSpec() : _resultType(search::docsummary::RES_INT), - _command(VsmsummaryConfig::Fieldmap::NONE), + _command(VsmsummaryConfig::Fieldmap::Command::NONE), _outputField(), _inputFields() { } diff --git a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp b/vsm/src/vespa/vsm/vsm/docsumfilter.cpp index 872ccf6acf8..3794e78cf5b 100644 --- a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp +++ b/vsm/src/vespa/vsm/vsm/docsumfilter.cpp @@ -188,7 +188,7 @@ DocsumFilter::getFieldValue(const DocsumFieldSpec::FieldIdentifier & fieldId, return nullptr; } switch (command) { - case VsmsummaryConfig::Fieldmap::FLATTENJUNIPER: + case VsmsummaryConfig::Fieldmap::Command::FLATTENJUNIPER: if (_snippetModifiers != nullptr) { FieldModifier * mod = _snippetModifiers->getModifier(fId); if (mod != nullptr) { @@ -319,7 +319,7 @@ DocsumFilter::writeSlimeField(const DocsumFieldSpec & fieldSpec, const Document & docsum, ResultPacker & packer) { - if (fieldSpec.getCommand() == VsmsummaryConfig::Fieldmap::NONE) { + if (fieldSpec.getCommand() == VsmsummaryConfig::Fieldmap::Command::NONE) { const DocsumFieldSpec::FieldIdentifier & fieldId = fieldSpec.getOutputField(); const document::FieldValue * fv = docsum.getField(fieldId.getId()); if (fv != nullptr) { @@ -347,7 +347,7 @@ DocsumFilter::writeFlattenField(const DocsumFieldSpec & fieldSpec, const Document & docsum, ResultPacker & packer) { - if (fieldSpec.getCommand() == VsmsummaryConfig::Fieldmap::NONE) { + if (fieldSpec.getCommand() == VsmsummaryConfig::Fieldmap::Command::NONE) { LOG(debug, "writeFlattenField: Cannot handle command NONE"); packer.AddEmpty(); return; @@ -362,7 +362,7 @@ DocsumFilter::writeFlattenField(const DocsumFieldSpec & fieldSpec, } switch (fieldSpec.getCommand()) { - case VsmsummaryConfig::Fieldmap::FLATTENJUNIPER: + case VsmsummaryConfig::Fieldmap::Command::FLATTENJUNIPER: _flattenWriter.setSeparator("\x1E"); // record separator (same as juniper uses) break; default: @@ -453,7 +453,7 @@ DocsumFilter::getMappedDocsum(uint32_t id) // this really means 'structured data' writeSlimeField(*it, doc, _packer); } else { - if (it->getInputFields().size() == 1 && it->getCommand() == VsmsummaryConfig::Fieldmap::NONE) { + if (it->getInputFields().size() == 1 && it->getCommand() == VsmsummaryConfig::Fieldmap::Command::NONE) { const DocsumFieldSpec::FieldIdentifier & fieldId = it->getInputFields()[0]; const document::FieldValue * field = doc.getField(fieldId.getId()); if (field != nullptr) { @@ -461,7 +461,7 @@ DocsumFilter::getMappedDocsum(uint32_t id) } else { writeEmpty(type, _packer); // void input } - } else if (it->getInputFields().size() == 0 && it->getCommand() == VsmsummaryConfig::Fieldmap::NONE) { + } else if (it->getInputFields().size() == 0 && it->getCommand() == VsmsummaryConfig::Fieldmap::Command::NONE) { LOG(spam, "0 inputfields for output field %u", it->getOutputField().getId()); writeEmpty(type, _packer); // no input } else { diff --git a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp b/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp index bb30cdd89e9..8d4cf72b824 100644 --- a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp +++ b/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp @@ -45,7 +45,7 @@ FieldSearchSpec::FieldSearchSpec() : _name(), _maxLength(0x100000), _searcher(), - _searchMethod(VsmfieldsConfig::Fieldspec::NONE), + _searchMethod(VsmfieldsConfig::Fieldspec::Searchmethod::NONE), _arg1(), _reconfigured(false) { @@ -65,12 +65,12 @@ FieldSearchSpec::FieldSearchSpec(const FieldIdT & fid, const vespalib::string & { switch(searchDef) { default: - LOG(warning, "Unknown searchdef = %d. Defaulting to AUTOUTF8", searchDef); + LOG(warning, "Unknown searchdef = %d. Defaulting to AUTOUTF8", static_cast<int>(searchDef)); [[fallthrough]]; - case VsmfieldsConfig::Fieldspec::AUTOUTF8: - case VsmfieldsConfig::Fieldspec::NONE: - case VsmfieldsConfig::Fieldspec::SSE2UTF8: - case VsmfieldsConfig::Fieldspec::UTF8: + case VsmfieldsConfig::Fieldspec::Searchmethod::AUTOUTF8: + case VsmfieldsConfig::Fieldspec::Searchmethod::NONE: + case VsmfieldsConfig::Fieldspec::Searchmethod::SSE2UTF8: + case VsmfieldsConfig::Fieldspec::Searchmethod::UTF8: if (arg1 == "substring") { _searcher = UTF8SubStringFieldSearcher(fid); } else if (arg1 == "suffix") { @@ -79,25 +79,25 @@ FieldSearchSpec::FieldSearchSpec(const FieldIdT & fid, const vespalib::string & _searcher = UTF8ExactStringFieldSearcher(fid); } else if (arg1 == "word") { _searcher = UTF8ExactStringFieldSearcher(fid); - } else if (searchDef == VsmfieldsConfig::Fieldspec::UTF8) { + } else if (searchDef == VsmfieldsConfig::Fieldspec::Searchmethod::UTF8) { _searcher = UTF8StrChrFieldSearcher(fid); } else { _searcher = FUTF8StrChrFieldSearcher(fid); } break; - case VsmfieldsConfig::Fieldspec::BOOL: + case VsmfieldsConfig::Fieldspec::Searchmethod::BOOL: _searcher = BoolFieldSearcher(fid); break; - case VsmfieldsConfig::Fieldspec::INT8: - case VsmfieldsConfig::Fieldspec::INT16: - case VsmfieldsConfig::Fieldspec::INT32: - case VsmfieldsConfig::Fieldspec::INT64: + case VsmfieldsConfig::Fieldspec::Searchmethod::INT8: + case VsmfieldsConfig::Fieldspec::Searchmethod::INT16: + case VsmfieldsConfig::Fieldspec::Searchmethod::INT32: + case VsmfieldsConfig::Fieldspec::Searchmethod::INT64: _searcher = IntFieldSearcher(fid); break; - case VsmfieldsConfig::Fieldspec::FLOAT: + case VsmfieldsConfig::Fieldspec::Searchmethod::FLOAT: _searcher = FloatFieldSearcher(fid); break; - case VsmfieldsConfig::Fieldspec::DOUBLE: + case VsmfieldsConfig::Fieldspec::Searchmethod::DOUBLE: _searcher = DoubleFieldSearcher(fid); break; } @@ -114,10 +114,10 @@ FieldSearchSpec::reconfig(const search::QueryTerm & term) return; } switch (_searchMethod) { - case VsmfieldsConfig::Fieldspec::NONE: - case VsmfieldsConfig::Fieldspec::AUTOUTF8: - case VsmfieldsConfig::Fieldspec::UTF8: - case VsmfieldsConfig::Fieldspec::SSE2UTF8: + case VsmfieldsConfig::Fieldspec::Searchmethod::NONE: + case VsmfieldsConfig::Fieldspec::Searchmethod::AUTOUTF8: + case VsmfieldsConfig::Fieldspec::Searchmethod::UTF8: + case VsmfieldsConfig::Fieldspec::Searchmethod::SSE2UTF8: if ((term.isSubstring() && _arg1 != "substring") || (term.isSuffix() && _arg1 != "suffix") || (term.isExactstring() && _arg1 != "exact") || diff --git a/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp b/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp index 1cd35e7ca61..f87c327e86a 100644 --- a/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp +++ b/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp @@ -51,7 +51,7 @@ GetDocsumsStateCallback::~GetDocsumsStateCallback() = default; DocsumTools::FieldSpec::FieldSpec() : _outputName(), _inputNames(), - _command(VsmsummaryConfig::Fieldmap::NONE) + _command(VsmsummaryConfig::Fieldmap::Command::NONE) { } DocsumTools::FieldSpec::~FieldSpec() = default; |