summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahooinc.com>2024-02-20 11:01:03 +0100
committerGitHub <noreply@github.com>2024-02-20 11:01:03 +0100
commita14f457c4d8dd93650cb09d634f946104e1ccb36 (patch)
tree4bd2fedc33705149443273dd9df508189ecb6dc4
parent91525f0e94bc150ef9e9879699c158ff93ddb628 (diff)
parent1c40dbaad0fa5cab28839c11a1850fd421481404 (diff)
Merge pull request #30334 from vespa-engine/balder/implement-fool-field-support-for-streaming
Balder/implement bool field support for streaming
-rw-r--r--document/src/vespa/document/fieldvalue/boolfieldvalue.cpp2
-rw-r--r--document/src/vespa/document/fieldvalue/fieldvalue.cpp4
-rw-r--r--searchlib/src/vespa/searchlib/attribute/attributemanager.cpp9
-rw-r--r--streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp4
4 files changed, 10 insertions, 9 deletions
diff --git a/document/src/vespa/document/fieldvalue/boolfieldvalue.cpp b/document/src/vespa/document/fieldvalue/boolfieldvalue.cpp
index 90b4b1711f1..b0b77fe2bf6 100644
--- a/document/src/vespa/document/fieldvalue/boolfieldvalue.cpp
+++ b/document/src/vespa/document/fieldvalue/boolfieldvalue.cpp
@@ -29,7 +29,7 @@ int
BoolFieldValue::compare(const FieldValue&rhs) const {
int diff = FieldValue::compare(rhs);
if (diff != 0) return diff;
- const BoolFieldValue &o = static_cast<const BoolFieldValue &>(rhs);
+ const auto &o = static_cast<const BoolFieldValue &>(rhs);
return (_value == o._value) ? 0 : _value ? 1 : -1;
}
diff --git a/document/src/vespa/document/fieldvalue/fieldvalue.cpp b/document/src/vespa/document/fieldvalue/fieldvalue.cpp
index d1939f09a1d..1fef35fec0c 100644
--- a/document/src/vespa/document/fieldvalue/fieldvalue.cpp
+++ b/document/src/vespa/document/fieldvalue/fieldvalue.cpp
@@ -185,7 +185,7 @@ FieldValue::UP
FieldValue::onGetNestedFieldValue(PathRange nested) const
{
(void) nested;
- return FieldValue::UP();
+ return {};
}
ModificationStatus
@@ -221,7 +221,7 @@ namespace {
class FieldValueFactory : public ComplexArrayT<FieldValue>::Factory
{
public:
- FieldValueFactory(const DataType & dataType) : _dataType(&dataType) { }
+ explicit FieldValueFactory(const DataType & dataType) noexcept : _dataType(&dataType) { }
FieldValue * create() override { return _dataType->createFieldValue().release(); }
FieldValueFactory * clone() const override { return new FieldValueFactory(*this); }
private:
diff --git a/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp b/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp
index 9bd44ab4d02..6656ded68ca 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributemanager.cpp
@@ -26,7 +26,7 @@ std::condition_variable baseDirCond;
using BaseDirSet = std::set<string>;
BaseDirSet baseDirSet;
-static void
+void
waitBaseDir(const string &baseDir)
{
if (baseDir.empty()) { return; }
@@ -49,8 +49,7 @@ waitBaseDir(const string &baseDir)
}
}
-
-static void
+void
dropBaseDir(const string &baseDir)
{
if (baseDir.empty())
@@ -165,7 +164,7 @@ AttributeManager::getAttributeReadGuard(const string &name, bool stableEnumGuard
if (vh != nullptr) {
return (*vh)->makeReadGuard(stableEnumGuard);
} else {
- return std::unique_ptr<attribute::AttributeReadGuard>();
+ return {};
}
}
@@ -187,7 +186,7 @@ AttributeManager::getAttributeList(AttributeList & list) const
{
list.reserve(_attributes.size());
for (const auto& elem : _attributes) {
- list.push_back(AttributeGuard(elem.second));
+ list.emplace_back(elem.second);
}
}
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index e2eb3535223..0c4c6a3e114 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -146,7 +146,9 @@ AttributeVector::SP
createAttribute(const vespalib::string & name, const document::FieldValue & fv, search::attribute::DistanceMetric dm)
{
LOG(debug, "Create single value attribute '%s' with value type '%s'", name.c_str(), fv.className());
- if (fv.isA(document::FieldValue::Type::BYTE) || fv.isA(document::FieldValue::Type::INT) || fv.isA(document::FieldValue::Type::LONG)) {
+ if (fv.isA(document::FieldValue::Type::BOOL) || fv.isA(document::FieldValue::Type::BYTE) ||
+ fv.isA(document::FieldValue::Type::INT) || fv.isA(document::FieldValue::Type::LONG))
+ {
return std::make_shared<search::SingleIntegerExtAttribute>(name);
} else if (fv.isA(document::FieldValue::Type::DOUBLE) || fv.isA(document::FieldValue::Type::FLOAT)) {
return std::make_shared<search::SingleFloatExtAttribute>(name);