diff options
19 files changed, 46 insertions, 10 deletions
diff --git a/document/src/vespa/document/repo/configbuilder.cpp b/document/src/vespa/document/repo/configbuilder.cpp index 81a3da5db00..e8c02ae5af4 100644 --- a/document/src/vespa/document/repo/configbuilder.cpp +++ b/document/src/vespa/document/repo/configbuilder.cpp @@ -19,5 +19,14 @@ DatatypeConfig::DatatypeConfig() { DatatypeConfig::DatatypeConfig(const DatatypeConfig&) = default; DatatypeConfig& DatatypeConfig::operator=(const DatatypeConfig&) = default; +void DatatypeConfig::addNestedType(const TypeOrId &t) { + if (t.has_type) { + nested_types.insert(nested_types.end(), + t.type.nested_types.begin(), + t.type.nested_types.end()); + nested_types.push_back(t.type); + } +} + } // namespace config_builder } // namespace document diff --git a/document/src/vespa/document/repo/configbuilder.h b/document/src/vespa/document/repo/configbuilder.h index 8c4a48afd95..e0486e8b686 100644 --- a/document/src/vespa/document/repo/configbuilder.h +++ b/document/src/vespa/document/repo/configbuilder.h @@ -38,15 +38,6 @@ struct TypeOrId { TypeOrId(const DatatypeConfig &t) : id(t.id), has_type(true), type(t) {} }; -inline void DatatypeConfig::addNestedType(const TypeOrId &t) { - if (t.has_type) { - nested_types.insert(nested_types.end(), - t.type.nested_types.begin(), - t.type.nested_types.end()); - nested_types.push_back(t.type); - } -} - struct Struct : DatatypeConfig { Struct(const vespalib::string &name) { type = STRUCT; diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/mergehits.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/mergehits.cpp index 94977b4af34..9639cc5a8bd 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/mergehits.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/search/mergehits.cpp @@ -30,7 +30,7 @@ struct FastS_MergeFeatures template <typename T, typename F> -inline bool +bool FastS_MergeCompare(typename T::NodeType *a, typename T::NodeType *b) { diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp index 31d0ec5726a..7e95cf91325 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp @@ -41,6 +41,9 @@ FastS_QueryCacheUtil::FastS_QueryCacheUtil() _searchInfo._maxHits = 10; } +FastS_QueryCacheUtil::~FastS_QueryCacheUtil() +{ +} void FastS_QueryCacheUtil::setSearchRequest(const search::engine::SearchRequest * request) diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h index 1907afc62f5..0ef3fb0abf7 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h @@ -46,6 +46,7 @@ public: static uint32_t _maxOffset; public: FastS_QueryCacheUtil(); + ~FastS_QueryCacheUtil(); bool AgeDropCheck(void); void DropResult(void); bool GotNoResultsYet(void) const { return _queryResult._hitbuf == NULL; } diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.cpp index 5e1e673ee6e..8c334293e63 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.cpp @@ -95,6 +95,9 @@ AttributeUsageFilter::AttributeUsageFilter() { } +AttributeUsageFilter::~AttributeUsageFilter() +{ +} void AttributeUsageFilter::setAttributeStats(AttributeUsageStats attributeStats_in) diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h index 2863fff2805..b59fe2d6346 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h +++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_usage_filter.h @@ -33,6 +33,7 @@ private: void recalcState(const Guard &guard); // called with _lock held public: AttributeUsageFilter(); + ~AttributeUsageFilter(); void setAttributeStats(AttributeUsageStats attributeStats_in); AttributeUsageStats getAttributeUsageStats() const; void setConfig(Config config); diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.cpp b/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.cpp index d8d6ea1f188..5236ebed261 100644 --- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.cpp +++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.cpp @@ -56,6 +56,10 @@ BucketDBExplorer::BucketDBExplorer(BucketDBOwner::Guard bucketDb) { } +BucketDBExplorer::~BucketDBExplorer() +{ +} + void BucketDBExplorer::get_state(const Inserter &inserter, bool full) const { diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.h b/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.h index 81dd26b7434..3c34cbde184 100644 --- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.h +++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.h @@ -17,6 +17,7 @@ private: public: BucketDBExplorer(BucketDBOwner::Guard bucketDb); + ~BucketDBExplorer(); // Implements vespalib::StateExplorer virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override; diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp index 2d59191a162..e755731c0a9 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp @@ -46,6 +46,10 @@ FastAccessDocSubDBConfigurer::FastAccessDocSubDBConfigurer(FeedViewVarHolder &fe { } +FastAccessDocSubDBConfigurer::~FastAccessDocSubDBConfigurer() +{ +} + IReprocessingInitializer::UP FastAccessDocSubDBConfigurer::reconfigure(const DocumentDBConfig &newConfig, const DocumentDBConfig &oldConfig, diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.h b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.h index 27ee5f19d0d..f3371903371 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.h +++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.h @@ -31,6 +31,7 @@ public: FastAccessDocSubDBConfigurer(FeedViewVarHolder &feedView, IAttributeWriterFactory::UP factory, const vespalib::string &subDbName); + ~FastAccessDocSubDBConfigurer(); IReprocessingInitializer::UP reconfigure(const DocumentDBConfig &newConfig, const DocumentDBConfig &oldConfig, diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.cpp b/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.cpp index 9d7b8bbbce5..5c3aea96c8b 100644 --- a/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.cpp +++ b/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.cpp @@ -11,6 +11,10 @@ SimpleHealthProducer::SimpleHealthProducer() setOk(); } +SimpleHealthProducer::~SimpleHealthProducer() +{ +} + void SimpleHealthProducer::setOk() { diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.h b/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.h index fa219c33f48..6ea0d5893ac 100644 --- a/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.h +++ b/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.h @@ -15,6 +15,7 @@ private: public: SimpleHealthProducer(); + ~SimpleHealthProducer(); void setOk(); void setFailed(const vespalib::string &msg); Health getHealth() const override; diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.cpp b/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.cpp index e9928f6df08..dec6247bfbf 100644 --- a/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.cpp +++ b/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.cpp @@ -11,6 +11,10 @@ SimpleMetricsProducer::SimpleMetricsProducer() { } +SimpleMetricsProducer::~SimpleMetricsProducer() +{ +} + void SimpleMetricsProducer::setMetrics(const vespalib::string &metrics) { diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.h b/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.h index 67e34e1ae4e..90fe85cd3bf 100644 --- a/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.h +++ b/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.h @@ -16,6 +16,7 @@ private: public: SimpleMetricsProducer(); + ~SimpleMetricsProducer(); void setMetrics(const vespalib::string &metrics); virtual vespalib::string getMetrics(const vespalib::string &consumer) override; void setTotalMetrics(const vespalib::string &metrics); diff --git a/storage/src/vespa/storage/persistence/fieldvisitor.cpp b/storage/src/vespa/storage/persistence/fieldvisitor.cpp index 6fc4cadda8f..e67d15d4e91 100644 --- a/storage/src/vespa/storage/persistence/fieldvisitor.cpp +++ b/storage/src/vespa/storage/persistence/fieldvisitor.cpp @@ -4,6 +4,8 @@ namespace storage { +FieldVisitor::~FieldVisitor() {} + void FieldVisitor::visitFieldValueNode(const document::select::FieldValueNode & node) { _fields.insert(_docType.getField(node.getRealFieldName())); } diff --git a/storage/src/vespa/storage/persistence/fieldvisitor.h b/storage/src/vespa/storage/persistence/fieldvisitor.h index 3455b1bb032..9ee35573b98 100644 --- a/storage/src/vespa/storage/persistence/fieldvisitor.h +++ b/storage/src/vespa/storage/persistence/fieldvisitor.h @@ -23,6 +23,7 @@ public: : _docType(docType), _fields(_docType) {} + ~FieldVisitor(); const document::FieldSet & getFieldSet() { return _fields; diff --git a/storage/src/vespa/storage/storageserver/priorityconverter.cpp b/storage/src/vespa/storage/storageserver/priorityconverter.cpp index 607dac95cb3..ff4f2c086ce 100644 --- a/storage/src/vespa/storage/storageserver/priorityconverter.cpp +++ b/storage/src/vespa/storage/storageserver/priorityconverter.cpp @@ -12,6 +12,10 @@ PriorityConverter::PriorityConverter(const config::ConfigUri & configUri) _configFetcher.start(); } +PriorityConverter::~PriorityConverter() +{ +} + uint8_t PriorityConverter::toStoragePriority(documentapi::Priority::Value documentApiPriority) const { diff --git a/storage/src/vespa/storage/storageserver/priorityconverter.h b/storage/src/vespa/storage/storageserver/priorityconverter.h index c0aaf3aceea..d5d2953ea45 100644 --- a/storage/src/vespa/storage/storageserver/priorityconverter.h +++ b/storage/src/vespa/storage/storageserver/priorityconverter.h @@ -18,6 +18,7 @@ public: typedef vespa::config::content::core::StorPrioritymappingConfig Config; PriorityConverter(const config::ConfigUri& configUri); + ~PriorityConverter(); /** Converts the given priority into a storage api priority number. */ uint8_t toStoragePriority(documentapi::Priority::Value) const; |