From 532395fd9a02c8ca77b1502a575eb710d374c91c Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Tue, 10 Jan 2023 07:41:07 +0000 Subject: Use const to signal members that will not change --- searchlib/src/vespa/searchlib/memoryindex/field_index_base.h | 2 +- searchlib/src/vespa/searchlib/memoryindex/field_index_collection.h | 2 +- searchlib/src/vespa/searchlib/memoryindex/field_inverter.h | 4 ++-- searchlib/src/vespa/searchlib/memoryindex/invert_task.h | 2 +- searchlib/src/vespa/searchlib/memoryindex/posting_list_entry.h | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index_base.h b/searchlib/src/vespa/searchlib/memoryindex/field_index_base.h index 93fe77ba50b..2d6d367af3b 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_index_base.h +++ b/searchlib/src/vespa/searchlib/memoryindex/field_index_base.h @@ -78,7 +78,7 @@ protected: GenerationHandler _generationHandler; DictionaryTree _dict; FeatureStore _featureStore; - uint32_t _fieldId; + const uint32_t _fieldId; FieldIndexRemover _remover; std::unique_ptr _inserter; index::FieldLengthCalculator _calculator; diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.h b/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.h index 7a65195e843..a9f597e6296 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.h +++ b/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.h @@ -28,7 +28,7 @@ private: using GenerationHandler = vespalib::GenerationHandler; std::vector> _fieldIndexes; - uint32_t _numFields; + const uint32_t _numFields; public: FieldIndexCollection(const index::Schema& schema, const index::IFieldLengthInspector& inspector); diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_inverter.h b/searchlib/src/vespa/searchlib/memoryindex/field_inverter.h index e68f664603e..7995dc56de8 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_inverter.h +++ b/searchlib/src/vespa/searchlib/memoryindex/field_inverter.h @@ -97,7 +97,7 @@ private: class ElemInfo { public: - int32_t _weight; + const int32_t _weight; uint32_t _len; uint32_t _field_length; @@ -161,7 +161,7 @@ private: using UInt32Vector = std::vector>; // Current field state. - uint32_t _fieldId; // current field id + const uint32_t _fieldId; // current field id uint32_t _elem; // current element uint32_t _wpos; // current word pos uint32_t _docId; diff --git a/searchlib/src/vespa/searchlib/memoryindex/invert_task.h b/searchlib/src/vespa/searchlib/memoryindex/invert_task.h index b898deb5c16..a351fd2a10f 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/invert_task.h +++ b/searchlib/src/vespa/searchlib/memoryindex/invert_task.h @@ -27,7 +27,7 @@ class InvertTask : public vespalib::Executor::Task const std::vector>& _inverters; const std::vector>& _uri_inverters; const document::Document& _doc; - uint32_t _lid; + const uint32_t _lid; std::remove_reference_t _on_write_done; public: InvertTask(const DocumentInverterContext& inv_context, const InvertContext& context, const std::vector>& inverters, const std::vector>& uri_inverters, uint32_t lid, const document::Document& doc, OnWriteDoneType on_write_done); diff --git a/searchlib/src/vespa/searchlib/memoryindex/posting_list_entry.h b/searchlib/src/vespa/searchlib/memoryindex/posting_list_entry.h index ef0866e957b..a8cc7fce1f2 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/posting_list_entry.h +++ b/searchlib/src/vespa/searchlib/memoryindex/posting_list_entry.h @@ -13,7 +13,6 @@ class InterleavedFeatures { protected: uint16_t _num_occs; uint16_t _field_length; - public: InterleavedFeatures() : _num_occs(0), -- cgit v1.2.3