Use more auto and use curly braces on single line if-statements.

6 files changed, 37 insertions, 32 deletions

diff --git a/searchlib/src/vespa/searchlib/memoryindex/featurestore.cpp b/searchlib/src/vespa/searchlib/memoryindex/featurestore.cpp
index 46b0fe36302..c032bb33217 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/featurestore.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/featurestore.cpp
@@ -88,7 +88,7 @@ FeatureStore::FeatureStore(const Schema &schema)
 
     _fieldsParams.resize(_schema.getNumIndexFields());
     SchemaUtil::IndexIterator it(_schema);
-    for(; it.isValid(); ++it) {
+    for (; it.isValid(); ++it) {
         _fieldsParams[it.getIndex()].setSchemaParams(_schema, it.getIndex());
     }
     _store.addType(&_type);
diff --git a/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp
index 32ca3f75c61..6d3b6667ad4 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp
@@ -113,8 +113,9 @@ FieldInverter::processAnnotations(const StringFieldValue &value)
     if (tree == nullptr) {
         /* This is wrong unless field is exact match */
         const vespalib::string &text = value.getValue();
-        if (text.empty())
+        if (text.empty()) {
             return;
+        }
         uint32_t wordRef = saveWord(text);
         if (wordRef != 0u) {
             add(wordRef);
@@ -249,8 +250,9 @@ FieldInverter::saveWord(const vespalib::stringref word)
     const size_t wordsSize = _words.size();
     // assert((wordsSize & 3) == 0); // Check alignment
     size_t len = word.size();
-    if (len == 0)
+    if (len == 0) {
         return 0u;
+    }
 
     const size_t fullyPaddedSize = (wordsSize + 4 + len + 1 + 3) & ~3;
     _words.reserve(vespalib::roundUp2inN(fullyPaddedSize));
@@ -305,8 +307,7 @@ FieldInverter::processNormalDocArrayTextField(const ArrayFieldValue &field)
     for (;el < ele; ++el) {
         const FieldValue &elfv = field[el];
         assert(elfv.getClass().id() == StringFieldValue::classId);
-        const StringFieldValue &element =
-            static_cast<const StringFieldValue &>(elfv);
+        const auto &element = static_cast<const StringFieldValue &>(elfv);
         startElement(1);
         processAnnotations(element);
         endElement();
@@ -322,7 +323,7 @@ FieldInverter::processNormalDocWeightedSetTextField(const WeightedSetFieldValue
         const FieldValue &xweight = *el.second;
         assert(key.getClass().id() == StringFieldValue::classId);
         assert(xweight.getClass().id() == IntFieldValue::classId);
-        const StringFieldValue &element = static_cast<const StringFieldValue &>(key);
+        const auto &element = static_cast<const StringFieldValue &>(key);
         int32_t weight = xweight.getAsInt();
         startElement(weight);
         processAnnotations(element);
@@ -372,8 +373,9 @@ FieldInverter::moveNotAbortedDocs(uint32_t &dstIdx,
 {
     assert(nextTrimIdx >= srcIdx);
     uint32_t size = nextTrimIdx - srcIdx;
-    if (size == 0)
+    if (size == 0) {
         return;
+    }
     assert(dstIdx < srcIdx);
     assert(srcIdx < _positions.size());
     assert(srcIdx + size <= _positions.size());
@@ -438,7 +440,7 @@ FieldInverter::invertNormalDocTextField(const FieldValue &val)
         break;
     case CollectionType::WEIGHTEDSET:
         if (cInfo.id() == WeightedSetFieldValue::classId) {
-            const WeightedSetFieldValue &wset = static_cast<const WeightedSetFieldValue &>(val);
+            const auto &wset = static_cast<const WeightedSetFieldValue &>(val);
             if (wset.getNestedType() == *DataType::STRING) {
                 processNormalDocWeightedSetTextField(wset);
             } else {
@@ -450,7 +452,7 @@ FieldInverter::invertNormalDocTextField(const FieldValue &val)
         break;
     case CollectionType::ARRAY:
         if (cInfo.id() == ArrayFieldValue::classId) {
-            const ArrayFieldValue &arr = static_cast<const ArrayFieldValue&>(val);
+            const auto &arr = static_cast<const ArrayFieldValue&>(val);
             if (arr.getNestedType() == *DataType::STRING) {
                 processNormalDocArrayTextField(arr);
             } else {
diff --git a/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.cpp b/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.cpp
index 22f76e9393e..a6a21ab4ab8 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.cpp
@@ -81,7 +81,7 @@ MemoryFieldIndex::find(const vespalib::stringref word) const
 MemoryFieldIndex::PostingList::ConstIterator
 MemoryFieldIndex::findFrozen(const vespalib::stringref word) const
 {
-    DictionaryTree::ConstIterator itr = _dict.getFrozenView().find(WordKey(EntryRef()), KeyComp(_wordStore, word));
+    auto itr = _dict.getFrozenView().find(WordKey(EntryRef()), KeyComp(_wordStore, word));
     if (itr.valid()) {
         return _postingListStore.beginFrozen(EntryRef(itr.getData()));
     }
@@ -95,18 +95,19 @@ MemoryFieldIndex::compactFeatures()
     std::vector<uint32_t> toHold;
 
     toHold = _featureStore.startCompact();
-    DictionaryTree::Iterator itr(_dict.begin());
+    auto itr = _dict.begin();
     uint32_t packedIndex = _fieldId;
     for (; itr.valid(); ++itr) {
         PostingListStore::RefType pidx(EntryRef(itr.getData()));
-        if (!pidx.valid())
+        if (!pidx.valid()) {
             continue;
+        }
         uint32_t clusterSize = _postingListStore.getClusterSize(pidx);
         if (clusterSize == 0) {
             const PostingList *tree = _postingListStore.getTreeEntry(pidx);
-            PostingList::Iterator it(tree->begin(_postingListStore.getAllocator()));
-            for (; it.valid(); ++it) {
-                EntryRef oldFeatures(it.getData());
+            auto pitr = tree->begin(_postingListStore.getAllocator());
+            for (; pitr.valid(); ++pitr) {
+                EntryRef oldFeatures(pitr.getData());
 
                 // Filter on which buffers to move features from when
                 // performing incremental compaction.
@@ -117,7 +118,7 @@ MemoryFieldIndex::compactFeatures()
                 std::atomic_thread_fence(std::memory_order_release);
 
                 // Ugly, ugly due to const_cast in iterator
-                it.writeData(newFeatures.ref());
+                pitr.writeData(newFeatures.ref());
             }
         } else {
             const PostingListKeyDataType *shortArray = _postingListStore.getKeyDataEntry(pidx, clusterSize);
@@ -153,17 +154,18 @@ MemoryFieldIndex::dump(search::index::IndexBuilder & indexBuilder)
     DocIdAndFeatures features;
     vespalib::Array<uint32_t> wordMap(_numUniqueWords + 1, 0);
     _featureStore.setupForField(_fieldId, decoder);
-    for (DictionaryTree::Iterator itr = _dict.begin(); itr.valid(); ++itr) {
+    for (auto itr = _dict.begin(); itr.valid(); ++itr) {
         const WordKey & wk = itr.getKey();
         PostingListStore::RefType plist(EntryRef(itr.getData()));
         word = _wordStore.getWord(wk._wordRef);
-        if (!plist.valid())
+        if (!plist.valid()) {
             continue;
+        }
         indexBuilder.startWord(word);
         uint32_t clusterSize = _postingListStore.getClusterSize(plist);
         if (clusterSize == 0) {
             const PostingList *tree = _postingListStore.getTreeEntry(plist);
-            PostingList::Iterator pitr = tree->begin(_postingListStore.getAllocator());
+            auto pitr = tree->begin(_postingListStore.getAllocator());
             assert(pitr.valid());
             for (; pitr.valid(); ++pitr) {
                 uint32_t docId = pitr.getKey();
diff --git a/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp b/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp
index d984a4bb9d4..21fe7373265 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp
@@ -266,14 +266,16 @@ MemoryIndex::pruneRemovedFields(const Schema &schema)
 {
     LockGuard lock(_lock);
     if (_prunedSchema.get() == nullptr) {
-        Schema::UP newSchema = Schema::intersect(_schema, schema);
-        if (_schema == *newSchema)
+        auto newSchema = Schema::intersect(_schema, schema);
+        if (_schema == *newSchema) {
             return;
+        }
         _prunedSchema.reset(newSchema.release());
     } else {
-        Schema::UP newSchema = Schema::intersect(*_prunedSchema, schema);
-        if (*_prunedSchema == *newSchema)
+        auto newSchema = Schema::intersect(*_prunedSchema, schema);
+        if (*_prunedSchema == *newSchema) {
             return;
+        }
         _prunedSchema.reset(newSchema.release());
     }
     SchemaUtil::IndexIterator i(_schema);
diff --git a/searchlib/src/vespa/searchlib/memoryindex/ordereddocumentinserter.cpp b/searchlib/src/vespa/searchlib/memoryindex/ordereddocumentinserter.cpp
index 1f15bcf1c75..8231dfdff5b 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/ordereddocumentinserter.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/ordereddocumentinserter.cpp
@@ -106,7 +106,7 @@ OrderedDocumentInserter::setNextWord(const vespalib::stringref word)
 
 void
 OrderedDocumentInserter::add(uint32_t docId,
-                               const index::DocIdAndFeatures &features)
+                             const index::DocIdAndFeatures &features)
 {
     assert(docId != noDocId);
     assert(_prevDocId == noDocId || _prevDocId < docId ||
diff --git a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp
index c67a378fa46..2c290f17782 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp
@@ -125,8 +125,9 @@ UrlFieldInverter::processUrlSubField(FieldInverter *inverter,
                                      bool addAnchors)
 {
     const FieldValue::UP sfv = field.getValue(subField);
-    if (!sfv)
+    if (!sfv) {
         return;
+    }
     if (!sfv->inherits(IDENTIFIABLE_CLASSID(StringFieldValue))) {
         LOG(error,
             "Illegal field type %s for URL subfield %s, expected string",
@@ -134,7 +135,7 @@ UrlFieldInverter::processUrlSubField(FieldInverter *inverter,
             vespalib::string(subField).data());
         return;
     }
-    const StringFieldValue &value = static_cast<const StringFieldValue &>(*sfv);
+    const auto &value = static_cast<const StringFieldValue &>(*sfv);
     if (addAnchors) {
         inverter->addWord(HOSTNAME_BEGIN);
     }
@@ -169,8 +170,7 @@ UrlFieldInverter::processUrlField(const FieldValue &url_field)
         return;
     }
     assert(url_field.getClass().id() == StructFieldValue::classId);
-    const StructFieldValue &field =
-        static_cast<const StructFieldValue &>(url_field);
+    const auto &field = static_cast<const StructFieldValue &>(url_field);
 
     const FieldValue::UP all_val = field.getValue("all");
     if (all_val.get() == nullptr) {
@@ -187,8 +187,7 @@ UrlFieldInverter::processUrlField(const FieldValue &url_field)
             all_val->getDataType()->getName().c_str());
         return;
     }
-    const StringFieldValue &all_sfv =
-        static_cast<const StringFieldValue &>(*all_val);
+    const auto &all_sfv = static_cast<const StringFieldValue &>(*all_val);
     if (_useAnnotations) {
         StringFieldValue::SpanTrees trees = all_sfv.getSpanTrees();
         const SpanTree *tree = StringFieldValue::findTree(trees, SPANTREE_NAME);
@@ -317,7 +316,7 @@ UrlFieldInverter::invertUrlField(const FieldValue &val)
         break;
     case CollectionType::WEIGHTEDSET:
         if (cInfo.id() == WeightedSetFieldValue::classId) {
-            const WeightedSetFieldValue &wset = static_cast<const WeightedSetFieldValue &>(val);
+            const auto &wset = static_cast<const WeightedSetFieldValue &>(val);
             if (isUriType(wset.getNestedType())) {
                 processWeightedSetUrlField(wset);
             } else {
@@ -329,7 +328,7 @@ UrlFieldInverter::invertUrlField(const FieldValue &val)
         break;
     case CollectionType::ARRAY:
         if (cInfo.id() == ArrayFieldValue::classId) {
-            const ArrayFieldValue &arr = static_cast<const ArrayFieldValue&>(val);
+            const auto &arr = static_cast<const ArrayFieldValue&>(val);
             if (isUriType(arr.getNestedType())) {
                 processArrayUrlField(arr);
             } else {