From fb45b597193bed72b81d64795620be008808755c Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Tue, 27 Sep 2022 13:01:52 +0200 Subject: Normalize includes in searchcore. --- searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp | 2 +- searchcore/src/vespa/searchcore/bmcluster/bm_node.h | 3 ++- searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp | 2 +- .../src/vespa/searchcore/proton/attribute/flushableattribute.cpp | 2 +- searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp | 2 +- searchcore/src/vespa/searchcore/proton/common/cachedselect.h | 1 + searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp | 2 +- searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp | 2 +- searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp | 2 +- searchcore/src/vespa/searchcore/proton/matching/matcher.cpp | 2 +- searchcore/src/vespa/searchcore/proton/matching/query.cpp | 2 +- searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.cpp | 2 +- searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h | 2 ++ .../searchcore/proton/persistenceengine/persistence_handler_map.cpp | 2 +- searchcore/src/vespa/searchcore/proton/server/documentdb.cpp | 2 +- .../src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp | 2 +- .../src/vespa/searchcore/proton/server/documentsubdbcollection.cpp | 2 +- .../searchcore/proton/server/executor_threading_service_explorer.cpp | 2 +- .../src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp | 2 +- searchcore/src/vespa/searchcore/proton/server/feedstates.cpp | 2 +- .../vespa/searchcore/proton/server/i_lid_space_compaction_handler.h | 3 ++- .../vespa/searchcore/proton/server/lid_space_compaction_handler.cpp | 2 +- .../src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp | 2 +- .../src/vespa/searchcore/proton/server/move_operation_limiter.cpp | 2 +- searchcore/src/vespa/searchcore/proton/server/proton.cpp | 2 +- .../vespa/searchcore/proton/server/proton_thread_pools_explorer.cpp | 2 +- searchcore/src/vespa/searchcore/proton/server/tls_replay_progress.h | 1 + .../src/vespa/searchcore/proton/server/transactionlogmanager.cpp | 2 +- searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp | 2 +- 29 files changed, 32 insertions(+), 26 deletions(-) diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp index 1e00c958723..a33d9682973 100644 --- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp +++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.cpp @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "bm_node.h" #include "bm_cluster.h" #include "bm_cluster_params.h" #include "bm_message_bus.h" -#include "bm_node.h" #include "bm_node_stats.h" #include "bm_storage_chain_builder.h" #include "bm_storage_link_context.h" diff --git a/searchcore/src/vespa/searchcore/bmcluster/bm_node.h b/searchcore/src/vespa/searchcore/bmcluster/bm_node.h index 86c5b2ee095..39ddb91c55b 100644 --- a/searchcore/src/vespa/searchcore/bmcluster/bm_node.h +++ b/searchcore/src/vespa/searchcore/bmcluster/bm_node.h @@ -2,8 +2,9 @@ #pragma once -#include +#include #include +#include #include namespace document { diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp index 6fb0279733f..be8bcd8e66a 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "attributemanager.h" #include "attribute_directory.h" #include "attribute_factory.h" #include "attribute_type_matcher.h" #include "attributedisklayout.h" -#include "attributemanager.h" #include "flushableattribute.h" #include "imported_attributes_context.h" #include "imported_attributes_repo.h" diff --git a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp index 25d6e3c36a7..93663637e75 100644 --- a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp +++ b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "attributedisklayout.h" #include "flushableattribute.h" +#include "attributedisklayout.h" #include "attribute_directory.h" #include #include diff --git a/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp b/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp index b0244c34a0f..c51771df265 100644 --- a/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/cachedselect.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "attributefieldvaluenode.h" #include "cachedselect.h" +#include "attributefieldvaluenode.h" #include "select_utils.h" #include "selectcontext.h" #include "selectpruner.h" diff --git a/searchcore/src/vespa/searchcore/proton/common/cachedselect.h b/searchcore/src/vespa/searchcore/proton/common/cachedselect.h index 7ed21eea68c..cdda29ec301 100644 --- a/searchcore/src/vespa/searchcore/proton/common/cachedselect.h +++ b/searchcore/src/vespa/searchcore/proton/common/cachedselect.h @@ -3,6 +3,7 @@ #include #include +#include #include namespace document { diff --git a/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp b/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp index c3a8e951278..209336aad1a 100644 --- a/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "select_utils.h" #include "selectpruner.h" +#include "select_utils.h" #include #include #include diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp index fd3deb2abd7..c0a1bcbd4c3 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp +++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "flushengine.h" #include "cachedflushtarget.h" #include "flush_all_strategy.h" -#include "flushengine.h" #include "flushtask.h" #include "tls_stats_factory.h" #include "tls_stats_map.h" diff --git a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp index 92d7e385293..7573137d98c 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/blueprintbuilder.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "querynodes.h" #include "blueprintbuilder.h" +#include "querynodes.h" #include "termdatafromnode.h" #include "same_element_builder.h" #include diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp index b612f4cd061..334948bd191 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "matcher.h" #include "isearchcontext.h" #include "match_master.h" #include "match_context.h" #include "match_tools.h" #include "match_params.h" -#include "matcher.h" #include "sessionmanager.h" #include #include diff --git a/searchcore/src/vespa/searchcore/proton/matching/query.cpp b/searchcore/src/vespa/searchcore/proton/matching/query.cpp index 599a7989bb9..3379fd74a9b 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/query.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/query.cpp @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "query.h" #include "blueprintbuilder.h" #include "matchdatareservevisitor.h" -#include "query.h" #include "resolveviewvisitor.h" #include "sameelementmodifier.h" #include "termdataextractor.h" diff --git a/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.cpp b/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.cpp index bb8fde53357..1ccb3956fc2 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.cpp +++ b/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.cpp @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "metrics_engine.h" #include "attribute_metrics.h" #include "documentdb_tagged_metrics.h" -#include "metrics_engine.h" #include "content_proton_metrics.h" #include #include diff --git a/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h b/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h index f90f8205817..06d76d1d8d7 100644 --- a/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h +++ b/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.h @@ -4,8 +4,10 @@ #include "metricswireservice.h" #include +#include namespace metrics { + class Metric; class Metricmanager; class UpdateHook; } diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistence_handler_map.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistence_handler_map.cpp index 1bcb96702a4..0df3952f571 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistence_handler_map.cpp +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistence_handler_map.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "ipersistencehandler.h" #include "persistence_handler_map.h" +#include "ipersistencehandler.h" namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp index 64b04967f3f..27a2db27369 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "documentdb.h" #include "bootstrapconfig.h" #include "combiningfeedview.h" #include "document_meta_store_read_guards.h" #include "document_subdb_collection_explorer.h" -#include "documentdb.h" #include "documentdbconfigscout.h" #include "feedhandler.h" #include "i_shared_threading_service.h" diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp index d8ae75b40b1..3fe7fd6cfde 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb_metrics_updater.cpp @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "documentdb_metrics_updater.h" #include "ddbstate.h" #include "document_meta_store_read_guards.h" -#include "documentdb_metrics_updater.h" #include "documentsubdbcollection.h" #include "executorthreadingservice.h" #include "feedhandler.h" diff --git a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp index 945570c5b3b..e7685624f55 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "documentsubdbcollection.h" #include "combiningfeedview.h" #include "document_subdb_collection_initializer.h" -#include "documentsubdbcollection.h" #include "i_document_subdb_owner.h" #include "maintenancecontroller.h" #include "searchabledocsubdb.h" diff --git a/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_explorer.cpp b/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_explorer.cpp index 5bbbf1ca57d..9dfebaa825d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_explorer.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_explorer.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "executor_explorer_utils.h" #include "executor_threading_service_explorer.h" +#include "executor_explorer_utils.h" #include "executorthreadingservice.h" #include diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp index 73d08785d5f..3ec1e23693e 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.cpp @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "fast_access_doc_subdb.h" #include "attribute_writer_factory.h" #include "emptysearchview.h" -#include "fast_access_doc_subdb.h" #include "fast_access_document_retriever.h" #include "document_subdb_initializer.h" #include "reconfig_params.h" diff --git a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp index c542437d440..31c1ec165a1 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/feedstates.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "feedconfigstore.h" #include "feedstates.h" +#include "feedconfigstore.h" #include "ifeedview.h" #include "ireplayconfig.h" #include "replaypacketdispatcher.h" diff --git a/searchcore/src/vespa/searchcore/proton/server/i_lid_space_compaction_handler.h b/searchcore/src/vespa/searchcore/proton/server/i_lid_space_compaction_handler.h index d7920af8407..8ab2738cc5e 100644 --- a/searchcore/src/vespa/searchcore/proton/server/i_lid_space_compaction_handler.h +++ b/searchcore/src/vespa/searchcore/proton/server/i_lid_space_compaction_handler.h @@ -3,6 +3,8 @@ #pragma once #include +#include +#include #include namespace vespalib { class IDestructorCallback; } @@ -76,4 +78,3 @@ struct ILidSpaceCompactionHandler }; } // namespace proton - diff --git a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_handler.cpp b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_handler.cpp index 13a70526789..269737109f5 100644 --- a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_handler.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_handler.cpp @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "lid_space_compaction_handler.h" #include "document_scan_iterator.h" #include "ifeedview.h" -#include "lid_space_compaction_handler.h" #include "maintenancedocumentsubdb.h" #include #include diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp index 9c2f97dd655..9521356ceee 100644 --- a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "maintenance_jobs_injector.h" #include "bucketmovejob.h" #include "heart_beat_job.h" #include "job_tracked_maintenance_job.h" #include "lid_space_compaction_job.h" #include "lid_space_compaction_handler.h" -#include "maintenance_jobs_injector.h" #include "prune_session_cache_job.h" #include "pruneremoveddocumentsjob.h" #include "sample_attribute_usage_job.h" diff --git a/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp b/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp index 3977848578e..5bee99a30c0 100644 --- a/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/move_operation_limiter.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "i_blockable_maintenance_job.h" #include "move_operation_limiter.h" +#include "i_blockable_maintenance_job.h" #include namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index f48214e18f8..3635aba9e10 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -1,5 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "proton.h" #include "disk_mem_usage_sampler.h" #include "document_db_explorer.h" #include "fileconfigmanager.h" @@ -8,7 +9,6 @@ #include "memoryflush.h" #include "persistencehandlerproxy.h" #include "prepare_restart_handler.h" -#include "proton.h" #include "proton_config_snapshot.h" #include "proton_disk_layout.h" #include "proton_thread_pools_explorer.h" diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_thread_pools_explorer.cpp b/searchcore/src/vespa/searchcore/proton/server/proton_thread_pools_explorer.cpp index 06a51b7e661..7e94825d3f2 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton_thread_pools_explorer.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton_thread_pools_explorer.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "executor_explorer_utils.h" #include "proton_thread_pools_explorer.h" +#include "executor_explorer_utils.h" #include #include diff --git a/searchcore/src/vespa/searchcore/proton/server/tls_replay_progress.h b/searchcore/src/vespa/searchcore/proton/server/tls_replay_progress.h index 5bd1b6382f4..921c47b2b60 100644 --- a/searchcore/src/vespa/searchcore/proton/server/tls_replay_progress.h +++ b/searchcore/src/vespa/searchcore/proton/server/tls_replay_progress.h @@ -5,6 +5,7 @@ #include #include #include +#include namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp index 58c8c5f92c2..2fae98a3e0c 100644 --- a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "configstore.h" #include "transactionlogmanager.h" +#include "configstore.h" #include #include #include diff --git a/searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp b/searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp index 1f022b1215b..d70728e0d2f 100644 --- a/searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp +++ b/searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "indexmaintainer.h" #include "diskindexcleaner.h" #include "eventlogger.h" #include "fusionrunner.h" #include "indexflushtarget.h" #include "indexfusiontarget.h" -#include "indexmaintainer.h" #include "indexreadutilities.h" #include "indexwriteutilities.h" #include "index_disk_dir.h" -- cgit v1.2.3