From d50f67b95676259251d79e6cff3a6ce33282c096 Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Sun, 30 Apr 2023 09:33:19 +0000 Subject: cleanup whitespace --- .../src/tests/attribute/benchmark/attributesearcher.h | 2 +- searchlib/src/vespa/searchlib/attribute/attributevector.h | 4 ++-- searchlib/src/vespa/searchlib/attribute/floatbase.h | 2 +- searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h | 14 +++++++------- searchlib/src/vespa/searchlib/attribute/loadedvalue.h | 2 +- .../vespa/searchlib/attribute/multinumericpostattribute.h | 4 ++-- .../vespa/searchlib/attribute/multistringpostattribute.h | 2 +- searchlib/src/vespa/searchlib/attribute/postingstore.h | 2 +- .../vespa/searchlib/attribute/singlenumericpostattribute.h | 4 ++-- .../src/vespa/searchlib/common/i_compactable_lid_space.h | 6 +++--- searchlib/src/vespa/searchlib/common/sort.h | 2 +- searchlib/src/vespa/searchlib/diskindex/diskindex.h | 4 ++-- searchlib/src/vespa/searchlib/diskindex/extposocc.h | 4 ++-- searchlib/src/vespa/searchlib/diskindex/fieldreader.h | 2 +- .../src/vespa/searchlib/diskindex/zc4_posting_reader.h | 2 +- .../src/vespa/searchlib/diskindex/zc4_posting_writer.h | 2 +- searchlib/src/vespa/searchlib/docstore/chunkformat.h | 2 +- searchlib/src/vespa/searchlib/docstore/idatastore.h | 2 +- searchlib/src/vespa/searchlib/docstore/logdatastore.h | 2 +- searchlib/src/vespa/searchlib/engine/searchreply.h | 2 +- searchlib/src/vespa/searchlib/features/firstphasefeature.h | 2 +- searchlib/src/vespa/searchlib/features/foreachfeature.h | 2 +- .../vespa/searchlib/features/nativeattributematchfeature.h | 2 +- .../src/vespa/searchlib/features/nativefieldmatchfeature.h | 2 +- .../src/vespa/searchlib/features/nativeproximityfeature.h | 2 +- searchlib/src/vespa/searchlib/fef/featureexecutor.h | 2 +- searchlib/src/vespa/searchlib/fef/iindexenvironment.h | 2 +- searchlib/src/vespa/searchlib/fef/onnx_model.h | 2 +- searchlib/src/vespa/searchlib/index/docidandfeatures.h | 6 +++--- searchlib/src/vespa/searchlib/index/schema_index_fields.h | 2 +- searchlib/src/vespa/searchlib/predicate/predicate_hash.h | 8 ++++---- searchlib/src/vespa/searchlib/query/query_term_decoder.h | 2 +- searchlib/src/vespa/searchlib/queryeval/begin_and_end_id.h | 2 +- searchlib/src/vespa/searchlib/queryeval/blueprint.h | 2 +- searchlib/src/vespa/searchlib/queryeval/hitcollector.h | 2 +- searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h | 2 +- .../vespa/searchlib/queryeval/nearest_neighbor_iterator.h | 2 +- searchlib/src/vespa/searchlib/queryeval/posting_info.h | 2 +- .../src/vespa/searchlib/queryeval/profiled_iterator.h | 2 +- searchlib/src/vespa/searchlib/queryeval/searchiterator.h | 8 ++++---- searchlib/src/vespa/searchlib/queryeval/simplesearch.h | 2 +- searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h | 8 ++++---- .../src/vespa/searchlib/queryeval/wand/weak_and_heap.h | 2 +- .../src/vespa/searchlib/test/fakedata/fakememtreeocc.h | 4 ++-- searchlib/src/vespa/searchlib/transactionlog/domainpart.h | 4 ++-- .../src/vespa/searchlib/transactionlog/translogserver.h | 2 +- 46 files changed, 72 insertions(+), 72 deletions(-) diff --git a/searchlib/src/tests/attribute/benchmark/attributesearcher.h b/searchlib/src/tests/attribute/benchmark/attributesearcher.h index ea2d7190f25..48120880223 100644 --- a/searchlib/src/tests/attribute/benchmark/attributesearcher.h +++ b/searchlib/src/tests/attribute/benchmark/attributesearcher.h @@ -67,7 +67,7 @@ protected: vespalib::Timer _timer; AttributeSearcherStatus _status; std::thread _thread; - + public: AttributeSearcher(const AttributePtr & attrPtr) : _attrPtr(attrPtr), _timer(), _status(), _thread() diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h index b58060a05bf..6bab0f278ca 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributevector.h +++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h @@ -89,7 +89,7 @@ public: virtual bool add(const char *, int32_t = 1) { return false; } virtual bool add(vespalib::ConstArrayRef, int32_t = 1) { return false; } virtual bool add(const vespalib::eval::Value&, int32_t = 1) { return false; } - + virtual ~IExtendAttribute() = default; }; @@ -157,7 +157,7 @@ protected: _uncommittedDocIdLimit = 0; } } - + public: void incGeneration(); void reclaim_unused_memory(); diff --git a/searchlib/src/vespa/searchlib/attribute/floatbase.h b/searchlib/src/vespa/searchlib/attribute/floatbase.h index 675ea50a4fc..b1b27eb7dd5 100644 --- a/searchlib/src/vespa/searchlib/attribute/floatbase.h +++ b/searchlib/src/vespa/searchlib/attribute/floatbase.h @@ -53,7 +53,7 @@ protected: using EnumEntryType = T; using LoadedNumericValueT = attribute::LoadedNumericValue; -public: +public: using BaseType = T; using LoadedValueType = T; using LoadedVector = SequentialReadModifyWriteInterface; diff --git a/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h b/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h index bbd811095c6..c5d5aed9b09 100644 --- a/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h +++ b/searchlib/src/vespa/searchlib/attribute/loadedenumvalue.h @@ -29,7 +29,7 @@ public: operator()(const LoadedEnumAttribute &v) { return (static_cast(v._enum) << 32) | v.getDocId(); - } + } }; class EnumCompare @@ -60,12 +60,12 @@ public: _weight(weight) { } - + uint32_t getEnum() const { return _enum; } uint32_t getDocId() const { return _docId; } int32_t getWeight() const { return _weight; } }; - + using LoadedEnumAttributeVector = std::vector>; @@ -79,22 +79,22 @@ class SaveLoadedEnum { private: LoadedEnumAttributeVector &_loaded; - + public: SaveLoadedEnum(LoadedEnumAttributeVector &loaded) : _loaded(loaded) { } - + void save(uint32_t e, uint32_t docId, int32_t weight) { _loaded.push_back(LoadedEnumAttribute(e, docId, weight)); } }; - + /** - * Helper class used when loading non-enumerated attribute from + * Helper class used when loading non-enumerated attribute from * enumerated save file. */ diff --git a/searchlib/src/vespa/searchlib/attribute/loadedvalue.h b/searchlib/src/vespa/searchlib/attribute/loadedvalue.h index fb385d14824..bd4477ae891 100644 --- a/searchlib/src/vespa/searchlib/attribute/loadedvalue.h +++ b/searchlib/src/vespa/searchlib/attribute/loadedvalue.h @@ -96,7 +96,7 @@ public: { return _value._value < rhs._value._value; } - + union Value { T _value; uint32_t _eidx; diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h index a22a6241ab2..71c50ccb270 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h @@ -45,7 +45,7 @@ private: DocumentWeightAttributeAdapter _document_weight_attribute_adapter; friend class PostingListAttributeTest; - template + template friend class attribute::PostingSearchContext; // getEnumStore() using SelfType = MultiValueNumericPostingAttribute; @@ -91,7 +91,7 @@ public: bool onAddDoc(DocId doc) override { return forwardedOnAddDoc(doc, this->_mvMapping.getNumKeys(), this->_mvMapping.getCapacityKeys()); } - + void load_posting_lists(LoadedVector& loaded) override { handle_load_posting_lists(loaded); } diff --git a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h index 2e355a9aed2..b25c31a7dea 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h @@ -88,7 +88,7 @@ public: bool onAddDoc(DocId doc) override { return forwardedOnAddDoc(doc, this->_mvMapping.getNumKeys(), this->_mvMapping.getCapacityKeys()); } - + void load_posting_lists(LoadedVector& loaded) override { handle_load_posting_lists(loaded); } diff --git a/searchlib/src/vespa/searchlib/attribute/postingstore.h b/searchlib/src/vespa/searchlib/attribute/postingstore.h index ea7c5e0986b..57f523acefe 100644 --- a/searchlib/src/vespa/searchlib/attribute/postingstore.h +++ b/searchlib/src/vespa/searchlib/attribute/postingstore.h @@ -104,7 +104,7 @@ public: using Parent::_aggrCalc; using Parent::BUFFERTYPE_BTREE; using BitVectorRefPair = vespalib::datastore::Handle; - + PostingStore(IEnumStoreDictionary& dictionary, Status &status, const Config &config); ~PostingStore(); diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h index f2343c1a57c..68cdc0fbec9 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h @@ -30,7 +30,7 @@ public: private: friend class PostingListAttributeTest; - template + template friend class attribute::PostingSearchContext; // getEnumStore() using LoadedVector = typename B::LoadedVector; @@ -81,7 +81,7 @@ public: void onAddDocs(DocId docIdLimit) override { forwardedOnAddDoc(docIdLimit, this->_enumIndices.size(), this->_enumIndices.capacity()); } - + void load_posting_lists(LoadedVector& loaded) override { handle_load_posting_lists(loaded); } attribute::IPostingListAttributeBase *getIPostingListAttributeBase() override { return this; } const attribute::IPostingListAttributeBase *getIPostingListAttributeBase() const override { return this; } diff --git a/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h b/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h index cea251272dc..80cc8cb7a17 100644 --- a/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h +++ b/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h @@ -9,19 +9,19 @@ namespace search::common { /** * Interface for a component that has a lid space that can be compacted and shrunk. - */ + */ struct ICompactableLidSpace { virtual ~ICompactableLidSpace() = default; /** * Compacts the lid space down to the wanted given doc id limit. * After this, the remaining lid space is a candidate for shrinking (freeing of memory resources). - */ + */ virtual void compactLidSpace(uint32_t wantedDocLidLimit) = 0; /** * Returns whether this lid space can be shrunk down to the wanted doc id limit. - */ + */ virtual bool canShrinkLidSpace() const = 0; /* diff --git a/searchlib/src/vespa/searchlib/common/sort.h b/searchlib/src/vespa/searchlib/common/sort.h index b02d71b070e..aacd845a0a9 100644 --- a/searchlib/src/vespa/searchlib/common/sort.h +++ b/searchlib/src/vespa/searchlib/common/sort.h @@ -281,7 +281,7 @@ void ShiftBasedRadixSorterBase::radix_sort_core(GR R, size_t ptr[2 * @param SHIFT is the number of significant bits in the radix - 8. Must a multiple of 8. * @param continueAfterRadixEnds indicates if the radix only represents a prefix of the objects. If it is true we * will continue using std::sort to order objects that have equal radix representation. - */ + */ template class ShiftBasedRadixSorter : private ShiftBasedRadixSorterBase { diff --git a/searchlib/src/vespa/searchlib/diskindex/diskindex.h b/searchlib/src/vespa/searchlib/diskindex/diskindex.h index 9672939a741..0c813363ab3 100644 --- a/searchlib/src/vespa/searchlib/diskindex/diskindex.h +++ b/searchlib/src/vespa/searchlib/diskindex/diskindex.h @@ -151,9 +151,9 @@ public: /** * Needed for the Cache::BackingStore interface. - */ + */ bool read(const Key & key, LookupResultVector & result); - + index::FieldLengthInfo get_field_length_info(const vespalib::string& field_name) const; }; diff --git a/searchlib/src/vespa/searchlib/diskindex/extposocc.h b/searchlib/src/vespa/searchlib/diskindex/extposocc.h index 78f3b0b52b0..1b463bf8f68 100644 --- a/searchlib/src/vespa/searchlib/diskindex/extposocc.h +++ b/searchlib/src/vespa/searchlib/diskindex/extposocc.h @@ -5,12 +5,12 @@ #include #include -namespace search { +namespace search { class TuneFileSeqRead; class TuneFileSeqWrite; } -namespace search::index { +namespace search::index { class FieldLengthInfo; class PostingListParams; class PostingListCountFileSeqWrite; diff --git a/searchlib/src/vespa/searchlib/diskindex/fieldreader.h b/searchlib/src/vespa/searchlib/diskindex/fieldreader.h index c822ace0002..73b56559115 100644 --- a/searchlib/src/vespa/searchlib/diskindex/fieldreader.h +++ b/searchlib/src/vespa/searchlib/diskindex/fieldreader.h @@ -17,7 +17,7 @@ class FieldLengthScanner; /* * FieldReader is used to read a dictionary and posting list file * together, and get a sequential view of the stored data. - * + * * It can use mappings for word numbers and document ids to skip * documents that are logically removed and use shared word numbers * with other field readers. diff --git a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_reader.h b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_reader.h index 6cecccfeb11..145af8d2918 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_reader.h +++ b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_reader.h @@ -13,7 +13,7 @@ namespace search::diskindex { * features. If "cheap" features are enabled then they are interleaved * with docid deltas for quick access during sequential scan while the * full features still remains separate. - * + * * Rare words do not have skip info, and docid deltas and features are * interleaved. */ diff --git a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.h b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.h index 5f464766877..d7d78cf958c 100644 --- a/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.h +++ b/searchlib/src/vespa/searchlib/diskindex/zc4_posting_writer.h @@ -15,7 +15,7 @@ namespace search::diskindex { * features. If "cheap" features are enabled then they are interleaved * with docid deltas for quick access during sequential scan while the * full features still remains separate. - * + * * Rare words do not have skip info, and docid deltas and features are * interleaved. */ diff --git a/searchlib/src/vespa/searchlib/docstore/chunkformat.h b/searchlib/src/vespa/searchlib/docstore/chunkformat.h index 29793f8b311..6c76840ea21 100644 --- a/searchlib/src/vespa/searchlib/docstore/chunkformat.h +++ b/searchlib/src/vespa/searchlib/docstore/chunkformat.h @@ -96,7 +96,7 @@ private: * @param buf Buffer to write into. */ virtual void writeHeader(vespalib::DataBuffer & buf) const = 0; - + static void verifyCompression(uint8_t type); vespalib::nbostream _dataBuf; diff --git a/searchlib/src/vespa/searchlib/docstore/idatastore.h b/searchlib/src/vespa/searchlib/docstore/idatastore.h index 2fe3ebc00e4..863ee3e1268 100644 --- a/searchlib/src/vespa/searchlib/docstore/idatastore.h +++ b/searchlib/src/vespa/searchlib/docstore/idatastore.h @@ -148,7 +148,7 @@ public: * Visit all data found in data store. */ virtual void accept(IDataStoreVisitor &visitor, IDataStoreVisitorProgress &visitorProgress, bool prune) = 0; - + /** * Return cost of visiting all data found in data store. */ diff --git a/searchlib/src/vespa/searchlib/docstore/logdatastore.h b/searchlib/src/vespa/searchlib/docstore/logdatastore.h index cd302ca0c55..877446e510e 100644 --- a/searchlib/src/vespa/searchlib/docstore/logdatastore.h +++ b/searchlib/src/vespa/searchlib/docstore/logdatastore.h @@ -81,7 +81,7 @@ public: * The caller must keep it alive for the semantic * lifetime of the log data store. * @param tlSyncer Helper to sync transaction log to avoid - * it being behind the document store after a + * it being behind the document store after a * crash. * The caller must keep it alive for the semantic * lifetime of the log data store. diff --git a/searchlib/src/vespa/searchlib/engine/searchreply.h b/searchlib/src/vespa/searchlib/engine/searchreply.h index 6b0edca3086..2117aac39bc 100644 --- a/searchlib/src/vespa/searchlib/engine/searchreply.h +++ b/searchlib/src/vespa/searchlib/engine/searchreply.h @@ -73,7 +73,7 @@ public: SearchReply(); ~SearchReply(); SearchReply(const SearchReply &rhs); // for test only - + void setDistributionKey(uint32_t key) { _distributionKey = key; } uint32_t getDistributionKey() const { return _distributionKey; } }; diff --git a/searchlib/src/vespa/searchlib/features/firstphasefeature.h b/searchlib/src/vespa/searchlib/features/firstphasefeature.h index 6b6a2aaa292..8cde6457833 100644 --- a/searchlib/src/vespa/searchlib/features/firstphasefeature.h +++ b/searchlib/src/vespa/searchlib/features/firstphasefeature.h @@ -14,7 +14,7 @@ public: bool isPure() override { return true; } void execute(uint32_t docId) override; }; - + /** * Implements the blueprint for the first phase feature. */ diff --git a/searchlib/src/vespa/searchlib/features/foreachfeature.h b/searchlib/src/vespa/searchlib/features/foreachfeature.h index e5930e8902b..9070e993b88 100644 --- a/searchlib/src/vespa/searchlib/features/foreachfeature.h +++ b/searchlib/src/vespa/searchlib/features/foreachfeature.h @@ -22,7 +22,7 @@ public: ForeachExecutor(const CO & condition, uint32_t numInputs); void execute(uint32_t docId) override; }; - + /** * Base class for condition template class. **/ diff --git a/searchlib/src/vespa/searchlib/features/nativeattributematchfeature.h b/searchlib/src/vespa/searchlib/features/nativeattributematchfeature.h index 2584ce0f3f9..b72443ce11b 100644 --- a/searchlib/src/vespa/searchlib/features/nativeattributematchfeature.h +++ b/searchlib/src/vespa/searchlib/features/nativeattributematchfeature.h @@ -96,7 +96,7 @@ public: fef::ParameterDescriptions getDescriptions() const override; bool setup(const fef::IIndexEnvironment & env, const fef::ParameterList & params) override; fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; - + const NativeAttributeMatchParams & getParams() const { return _params; } }; diff --git a/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h b/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h index 1d5ac98a74d..f3590954d11 100644 --- a/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h +++ b/searchlib/src/vespa/searchlib/features/nativefieldmatchfeature.h @@ -125,7 +125,7 @@ public: } bool setup(const fef::IIndexEnvironment & env, const fef::ParameterList & params) override; fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment & env, vespalib::Stash &stash) const override; - + const NativeFieldMatchParams & getParams() const { return _params; } void prepareSharedState(const fef::IQueryEnvironment &queryEnv, fef::IObjectStore &objectStore) const override; diff --git a/searchlib/src/vespa/searchlib/features/nativeproximityfeature.h b/searchlib/src/vespa/searchlib/features/nativeproximityfeature.h index c5a485cecac..5ed872da54c 100644 --- a/searchlib/src/vespa/searchlib/features/nativeproximityfeature.h +++ b/searchlib/src/vespa/searchlib/features/nativeproximityfeature.h @@ -114,7 +114,7 @@ public: } bool setup(const fef::IIndexEnvironment & env, const fef::ParameterList & params) override; fef::FeatureExecutor &createExecutor(const fef::IQueryEnvironment &env, vespalib::Stash &stash) const override; - + const NativeProximityParams & getParams() const { return _params; } void prepareSharedState(const fef::IQueryEnvironment &queryEnv, fef::IObjectStore &objectStore) const override; diff --git a/searchlib/src/vespa/searchlib/fef/featureexecutor.h b/searchlib/src/vespa/searchlib/fef/featureexecutor.h index adbf03e83a8..b7f389ad417 100644 --- a/searchlib/src/vespa/searchlib/fef/featureexecutor.h +++ b/searchlib/src/vespa/searchlib/fef/featureexecutor.h @@ -70,7 +70,7 @@ public: feature_t *get_number_ptr(size_t idx) { return &_outputs[idx].as_number; } - vespalib::eval::Value::CREF *get_object_ptr(size_t idx) { + vespalib::eval::Value::CREF *get_object_ptr(size_t idx) { return &_outputs[idx].as_object; } feature_t get_number(size_t idx) const { diff --git a/searchlib/src/vespa/searchlib/fef/iindexenvironment.h b/searchlib/src/vespa/searchlib/fef/iindexenvironment.h index 0cb4ce5218d..ff0188fe36e 100644 --- a/searchlib/src/vespa/searchlib/fef/iindexenvironment.h +++ b/searchlib/src/vespa/searchlib/fef/iindexenvironment.h @@ -81,7 +81,7 @@ public: * motivation is typically that we want to set up features for * ranking or dumping. In some cases we are also setting things up * just to verify that it is possible. - * + * * @return current feature motivation **/ virtual FeatureMotivation getFeatureMotivation() const = 0; diff --git a/searchlib/src/vespa/searchlib/fef/onnx_model.h b/searchlib/src/vespa/searchlib/fef/onnx_model.h index fc5b434b22b..62d12b8bcd1 100644 --- a/searchlib/src/vespa/searchlib/fef/onnx_model.h +++ b/searchlib/src/vespa/searchlib/fef/onnx_model.h @@ -30,7 +30,7 @@ public: OnnxModel & operator =(const OnnxModel &) = delete; ~OnnxModel(); - const vespalib::string &name() const { return _name; } + const vespalib::string &name() const { return _name; } const vespalib::string &file_path() const { return _file_path; } OnnxModel &input_feature(const vespalib::string &model_input_name, const vespalib::string &input_feature); OnnxModel &output_name(const vespalib::string &model_output_name, const vespalib::string &output_name); diff --git a/searchlib/src/vespa/searchlib/index/docidandfeatures.h b/searchlib/src/vespa/searchlib/index/docidandfeatures.h index e595ec833ef..e4c9815d49b 100644 --- a/searchlib/src/vespa/searchlib/index/docidandfeatures.h +++ b/searchlib/src/vespa/searchlib/index/docidandfeatures.h @@ -49,9 +49,9 @@ public: _elementLen(elementLen) {} - uint32_t getElementId() const { return _elementId; } - uint32_t getNumOccs() const { return _numOccs; } - int32_t getWeight() const { return _weight; } + uint32_t getElementId() const { return _elementId; } + uint32_t getNumOccs() const { return _numOccs; } + int32_t getWeight() const { return _weight; } uint32_t getElementLen() const { return _elementLen; } void setElementId(uint32_t elementId) { _elementId = elementId; } diff --git a/searchlib/src/vespa/searchlib/index/schema_index_fields.h b/searchlib/src/vespa/searchlib/index/schema_index_fields.h index 2a7d6ae6d03..b4a10059870 100644 --- a/searchlib/src/vespa/searchlib/index/schema_index_fields.h +++ b/searchlib/src/vespa/searchlib/index/schema_index_fields.h @@ -15,7 +15,7 @@ public: using UriFieldIdVector = std::vector; FieldIdVector _textFields; UriFieldIdVector _uriFields; - + SchemaIndexFields(); ~SchemaIndexFields(); void setup(const Schema &schema); diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_hash.h b/searchlib/src/vespa/searchlib/predicate/predicate_hash.h index 39ffe57745e..2690d602187 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_hash.h +++ b/searchlib/src/vespa/searchlib/predicate/predicate_hash.h @@ -18,7 +18,7 @@ struct PredicateHash { int offset; // Current offset into the entire key. const uint8_t *aKey = static_cast(data); - + // Set up the internal state int anInitval = 0; a = b = anInitval; // the previous hash value @@ -36,7 +36,7 @@ struct PredicateHash { ((0xffLL & aKey[offset+5])<<40) + ((0xffLL & aKey[offset+6])<<48) + ((0xffLL & aKey[offset+7])<<56)); - b += ((0xffLL & aKey[offset+8]) + + b += ((0xffLL & aKey[offset+8]) + ((0xffLL & aKey[offset+9])<<8) + ((0xffLL & aKey[offset+10])<<16) + ((0xffLL & aKey[offset+11])<<24) + @@ -52,7 +52,7 @@ struct PredicateHash { ((0xffLL & aKey[offset+21])<<40) + ((0xffLL & aKey[offset+22])<<48) + ((0xffLL & aKey[offset+23])<<56)); - + // Mix. This arithmetic must match the mix below. a -= b; a -= c; a ^= (c>>43); b -= c; b -= a; b ^= (a<<9); @@ -72,7 +72,7 @@ struct PredicateHash { } // handle the last 23 bytes - c += origLen; + c += origLen; switch(len) { // all the case statements fall through case 23: c+=((0xffLL & aKey[offset+22])<<56); [[fallthrough]]; case 22: c+=((0xffLL & aKey[offset+21])<<48); [[fallthrough]]; diff --git a/searchlib/src/vespa/searchlib/query/query_term_decoder.h b/searchlib/src/vespa/searchlib/query/query_term_decoder.h index 9bc8a896b12..8e50e8d41b9 100644 --- a/searchlib/src/vespa/searchlib/query/query_term_decoder.h +++ b/searchlib/src/vespa/searchlib/query/query_term_decoder.h @@ -9,7 +9,7 @@ namespace search { /** * Class used to decode a single term. - */ + */ struct QueryTermDecoder { using QueryPacketT = vespalib::stringref; diff --git a/searchlib/src/vespa/searchlib/queryeval/begin_and_end_id.h b/searchlib/src/vespa/searchlib/queryeval/begin_and_end_id.h index 3ec66caa952..49f5fbcc3a5 100644 --- a/searchlib/src/vespa/searchlib/queryeval/begin_and_end_id.h +++ b/searchlib/src/vespa/searchlib/queryeval/begin_and_end_id.h @@ -4,7 +4,7 @@ #include namespace search { - + static constexpr uint32_t beginDocId = 0u; static constexpr uint32_t endDocId = 0x7fffffffu; // max signed value diff --git a/searchlib/src/vespa/searchlib/queryeval/blueprint.h b/searchlib/src/vespa/searchlib/queryeval/blueprint.h index 2c207253787..c76f0a22e98 100644 --- a/searchlib/src/vespa/searchlib/queryeval/blueprint.h +++ b/searchlib/src/vespa/searchlib/queryeval/blueprint.h @@ -218,7 +218,7 @@ public: virtual const State &getState() const = 0; const Blueprint &root() const; - double hit_ratio() const { return getState().hit_ratio(_docid_limit); } + double hit_ratio() const { return getState().hit_ratio(_docid_limit); } virtual void fetchPostings(const ExecuteInfo &execInfo) = 0; virtual void freeze() = 0; diff --git a/searchlib/src/vespa/searchlib/queryeval/hitcollector.h b/searchlib/src/vespa/searchlib/queryeval/hitcollector.h index e244c856c4a..70a69dfb932 100644 --- a/searchlib/src/vespa/searchlib/queryeval/hitcollector.h +++ b/searchlib/src/vespa/searchlib/queryeval/hitcollector.h @@ -119,7 +119,7 @@ private: BitVectorCollector(HitCollector &hc) : CollectorBase(hc) { } virtual void collect(uint32_t docId, feature_t score) override; }; - + HitRank getReScore(feature_t score) const { return ((score * _scale) - _adjust); } diff --git a/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h b/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h index 7b28df84ad1..b4d7682cf89 100644 --- a/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h +++ b/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h @@ -40,7 +40,7 @@ private: SimpleResult _result; protected: - SearchIterator::UP + SearchIterator::UP createLeafSearch(const search::fef::TermFieldMatchDataArray &tfmda, bool strict) const override; public: SimpleBlueprint(const SimpleResult &result); diff --git a/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_iterator.h b/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_iterator.h index f06e62f9cc1..fe3f8d51d06 100644 --- a/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_iterator.h +++ b/searchlib/src/vespa/searchlib/queryeval/nearest_neighbor_iterator.h @@ -42,7 +42,7 @@ public: NearestNeighborIterator(Params params_in) : _params(params_in) {} - + static std::unique_ptr create( bool strict, fef::TermFieldMatchData &tfmd, diff --git a/searchlib/src/vespa/searchlib/queryeval/posting_info.h b/searchlib/src/vespa/searchlib/queryeval/posting_info.h index 38503b00306..1774dd318a6 100644 --- a/searchlib/src/vespa/searchlib/queryeval/posting_info.h +++ b/searchlib/src/vespa/searchlib/queryeval/posting_info.h @@ -4,7 +4,7 @@ #include namespace search::queryeval { - + /** * Interface for getting global information stored in underlying posting list * used by a search iterator. diff --git a/searchlib/src/vespa/searchlib/queryeval/profiled_iterator.h b/searchlib/src/vespa/searchlib/queryeval/profiled_iterator.h index e1e16e164dc..0d2d6c2e5fc 100644 --- a/searchlib/src/vespa/searchlib/queryeval/profiled_iterator.h +++ b/searchlib/src/vespa/searchlib/queryeval/profiled_iterator.h @@ -11,7 +11,7 @@ namespace search::queryeval { * Wraps a search iterator to profile its operations. Each iterator * has 4 distinct operations that will be profiled separately: * - * 'init' -> initRange + * 'init' -> initRange * 'seek' -> doSeek * 'unpack' -> doUnpack * 'termwise' -> get_hits, or_hits_into, and_hits_into diff --git a/searchlib/src/vespa/searchlib/queryeval/searchiterator.h b/searchlib/src/vespa/searchlib/queryeval/searchiterator.h index 0ce0d19a226..b58d7ceed43 100644 --- a/searchlib/src/vespa/searchlib/queryeval/searchiterator.h +++ b/searchlib/src/vespa/searchlib/queryeval/searchiterator.h @@ -117,7 +117,7 @@ public: * * @param beginId This is the first valid docId and the lowest that will be given to doSeek. * @param endId This is the first docid after the valid range. - */ + */ virtual void initRange(uint32_t begin_id, uint32_t end_id) { _docid = begin_id - 1; _endid = end_id; @@ -200,7 +200,7 @@ public: * @return true if the iterator has reached its end. **/ bool isAtEnd() const { return isAtEnd(_docid); } - bool isAtEnd(uint32_t docid) const { + bool isAtEnd(uint32_t docid) const { if (__builtin_expect(docid >= _endid, false)) { return true; } @@ -241,7 +241,7 @@ public: * * @return the first matching docid * @param docid hit candidate - **/ + **/ uint32_t seekFirst(uint32_t docid) { if (__builtin_expect(docid > _docid, true)) { doSeek(docid); @@ -256,7 +256,7 @@ public: * * @return the first matching docid * @param docid hit candidate - **/ + **/ uint32_t seekNext(uint32_t docid) { doSeek(docid); return _docid; diff --git a/searchlib/src/vespa/searchlib/queryeval/simplesearch.h b/searchlib/src/vespa/searchlib/queryeval/simplesearch.h index b09d628a87f..b3fb0fba037 100644 --- a/searchlib/src/vespa/searchlib/queryeval/simplesearch.h +++ b/searchlib/src/vespa/searchlib/queryeval/simplesearch.h @@ -18,7 +18,7 @@ private: SimpleResult _result; uint32_t _index; bool _strict; - + SimpleSearch(const SimpleSearch &); SimpleSearch &operator=(const SimpleSearch &); diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h b/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h index b0be4e9db5e..0a822036c97 100644 --- a/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h +++ b/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h @@ -89,7 +89,7 @@ struct TermInput { int32_t get_weight(ref_t ref) const { return terms[ref].weight; } uint32_t get_est_hits(ref_t ref) const { return terms[ref].estHits; } int32_t get_max_weight(ref_t ref) const { return ::search::queryeval::wand::get_max_weight(*(terms[ref].search)); } - docid_t get_initial_docid(ref_t ref) const { return terms[ref].search->getDocId(); } + docid_t get_initial_docid(ref_t ref) const { return terms[ref].search->getDocId(); } }; struct AttrInput { @@ -102,7 +102,7 @@ struct AttrInput { int32_t get_weight(ref_t ref) const { return weights[ref]; } uint32_t get_est_hits(ref_t ref) const { return dict_entries[ref].posting_size; } int32_t get_max_weight(ref_t ref) const { return dict_entries[ref].max_weight; } - docid_t get_initial_docid(ref_t) const { return SearchIterator::beginId(); } + docid_t get_initial_docid(ref_t) const { return SearchIterator::beginId(); } }; template @@ -179,7 +179,7 @@ public: uint32_t seek(uint16_t ref, uint32_t docid) { return _iteratorPack.seek(ref, docid); } int32_t get_weight(uint16_t ref, uint32_t docid) { return _iteratorPack.get_weight(ref, docid); } - + vespalib::string stringify_docid() const; }; @@ -294,7 +294,7 @@ struct DocIdOrder { const docid_t *termPos; DocIdOrder(docid_t *pos) : termPos(pos) {} bool at_end(ref_t ref) const { return termPos[ref] == search::endDocId; } - docid_t get_pos(ref_t ref) const { return termPos[ref]; } + docid_t get_pos(ref_t ref) const { return termPos[ref]; } bool operator()(ref_t a, ref_t b) const { return (termPos[a] < termPos[b]); } diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.h b/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.h index a6e7d035aa7..f2997446ba1 100644 --- a/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.h +++ b/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.h @@ -7,7 +7,7 @@ #include namespace search::queryeval { - + /** * An interface used to insert scores into an underlying heap (or similar data structure) * that can be shared between multiple search iterators. diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h index abc42642e06..ea8699d94b2 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h @@ -80,9 +80,9 @@ public: if (_docId != rhs.getDocId()) return _docId < rhs.getDocId(); return _seq < rhs._seq; - } + } }; - + std::vector > _postingIdxs; std::vector _fakeWords; std::vector _featureSizes; diff --git a/searchlib/src/vespa/searchlib/transactionlog/domainpart.h b/searchlib/src/vespa/searchlib/transactionlog/domainpart.h index 4b8d52644a9..f7e5d67f767 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/domainpart.h +++ b/searchlib/src/vespa/searchlib/transactionlog/domainpart.h @@ -34,9 +34,9 @@ public: SerialNum getSynced() const { std::lock_guard guard(_writeLock); - return _syncedSerial; + return _syncedSerial; } - + size_t size() const noexcept { return _sz.load(std::memory_order_relaxed); } size_t byteSize() const { return _byteSize.load(std::memory_order_acquire); diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h index 83993da5964..0e51b4a1058 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/translogserver.h +++ b/searchlib/src/vespa/searchlib/transactionlog/translogserver.h @@ -64,7 +64,7 @@ private: using WriteGuard = std::unique_lock; bool running() const { return !_closed.load(std::memory_order_relaxed); } - + vespalib::string _name; vespalib::string _baseDir; DomainConfig _domainConfig; -- cgit v1.2.3