Skip to content

Commit 5995678

Browse files
LHT129LHT129
committed
refactor: clean up include dependencies in src/ based on IWYU analysis
- Replace fmt/format.h with fmt/core.h (56 files) - Split aggregate headers (common.h, filter_headers.h, etc.) into specific headers - Add missing explicit includes for symbols used - Remove unused includes - 148 files changed, +1424 -117 lines Signed-off-by: LHT129 <tianlan.lht@antgroup.com>
1 parent 390e430 commit 5995678

172 files changed

Lines changed: 1445 additions & 166 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/algorithm/bruteforce/bruteforce_parameter.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "bruteforce_parameter.h"
1717

18-
#include <fmt/format.h>
18+
#include <fmt/core.h>
1919

2020
#include "datacell/flatten_datacell_parameter.h"
2121
#include "impl/logger/logger.h"

‎src/algorithm/hgraph/hgraph.cpp‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,39 +14,50 @@
1414

1515
#include "hgraph.h"
1616

17-
#include <datacell/compressed_graph_datacell_parameter.h>
18-
#include <fmt/format.h>
17+
#include <fmt/core.h>
1918

19+
#include <algorithm>
2020
#include <atomic>
21+
#include <cmath>
22+
#include <cstdint>
23+
#include <cstdlib>
2124
#include <memory>
25+
#include <mutex>
2226
#include <stdexcept>
2327

28+
#include "algorithm/hgraph/hgraph_cache.h"
29+
#include "algorithm/hgraph/hgraph_parameter.h"
2430
#include "algorithm/inner_index_interface.h"
31+
#include "algorithm/inner_index_parameter.h"
2532
#include "analyzer/analyzer.h"
26-
#include "attr/argparse.h"
27-
#include "common.h"
33+
#include "datacell/attribute_inverted_interface.h"
34+
#include "datacell/extra_info_interface.h"
2835
#include "datacell/flatten_interface.h"
36+
#include "datacell/flatten_interface_parameter.h"
2937
#include "datacell/sparse_graph_datacell.h"
30-
#include "dataset_impl.h"
31-
#include "impl/filter/filter_headers.h"
32-
#include "impl/heap/standard_heap.h"
38+
#include "impl/basic_optimizer.h"
39+
#include "impl/label_table/label_table.h"
3340
#include "impl/odescent/odescent_graph_builder.h"
41+
#include "impl/odescent/odescent_graph_parameter.h"
3442
#include "impl/pruning_strategy.h"
35-
#include "impl/reasoning/search_reasoning.h"
3643
#include "impl/reorder/flatten_reorder.h"
3744
#include "index/index_impl.h"
38-
#include "index/iterator_filter.h"
45+
#include "index_common_param.h"
46+
#include "index_feature_list.h"
47+
#include "io/io_parameter.h"
3948
#include "io/reader_io_parameter.h"
40-
#include "storage/serialization.h"
41-
#include "storage/stream_reader.h"
42-
#include "typing.h"
49+
#include "json_wrapper.h"
50+
#include "tsl/robin_hash.h"
51+
#include "utils/resource_object_pool.h"
4352
#include "utils/util_functions.h"
44-
#include "utils/visited_list.h"
53+
#include "vsag/constants.h"
54+
#include "vsag/index_features.h"
4555
#include "vsag/options.h"
56+
#include "vsag/search_request.h"
4657

4758
namespace vsag {
48-
49-
class HGraphAnalyzer;
59+
class Reader;
60+
struct AttributeSet;
5061

5162
HGraph::HGraph(const HGraphParameterPtr& hgraph_param, const vsag::IndexCommonParam& common_param)
5263
: InnerIndexInterface(hgraph_param, common_param),

‎src/algorithm/hgraph/hgraph_build.cpp‎

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,83 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <fmt/format.h>
15+
#include <cxxabi.h>
16+
#include <fmt/core.h>
1617

18+
#include <algorithm>
1719
#include <atomic>
1820
#include <chrono>
21+
#include <cstdint>
1922
#include <cstdlib>
23+
#include <exception>
2024
#include <fstream>
2125
#include <future>
26+
#include <iosfwd>
2227
#include <limits>
28+
#include <memory>
29+
#include <mutex>
30+
#include <shared_mutex>
31+
#include <string>
32+
#include <string_view>
2333
#include <unordered_map>
2434
#include <unordered_set>
25-
35+
#include <utility>
36+
#include <vector>
37+
38+
#include "algorithm/hgraph/hgraph_cache.h"
39+
#include "algorithm/hgraph/hgraph_parameter.h"
40+
#include "algorithm/inner_index_interface.h"
41+
#include "basic_types.h"
42+
#include "common.h"
43+
#include "container_types.h"
44+
#include "data_type.h"
45+
#include "datacell/attribute_inverted_interface.h"
46+
#include "datacell/extra_info_interface.h"
2647
#include "datacell/flatten_datacell_parameter.h"
27-
#include "dataset_impl.h"
48+
#include "datacell/flatten_interface.h"
49+
#include "datacell/graph_interface.h"
50+
#include "hash_types.h"
2851
#include "hgraph.h" // IWYU pragma: keep
52+
#include "impl/basic_optimizer.h"
53+
#include "impl/heap/distance_heap.h"
2954
#include "impl/heap/standard_heap.h"
55+
#include "impl/inner_search_param.h"
56+
#include "impl/label_table/label_table.h"
3057
#include "impl/logger/logger.h"
3158
#include "impl/odescent/odescent_graph_builder.h"
59+
#include "impl/odescent/odescent_graph_parameter.h"
3260
#include "impl/pruning_strategy.h"
61+
#include "impl/reorder/flatten_reorder.h"
62+
#include "impl/reorder/reorder.h"
63+
#include "impl/runtime_parameter.h"
3364
#include "impl/searcher/basic_searcher.h"
65+
#include "impl/thread_pool/safe_thread_pool.h"
66+
#include "index_common_param.h"
67+
#include "index_feature_list.h"
68+
#include "inner_string_params.h"
69+
#include "io/io_parameter.h"
3470
#include "io/memory_io_parameter.h"
71+
#include "metric_type.h"
72+
#include "quantization/quantizer_parameter.h"
3573
#include "quantization/scalar_quantization/scalar_quantizer_parameter.h"
3674
#include "storage/stream_reader.h"
3775
#include "storage/stream_writer.h"
76+
#include "tsl/robin_hash.h"
77+
#include "tsl/robin_map.h"
78+
#include "tsl/robin_set.h"
79+
#include "utils/lock_strategy.h"
3880
#include "utils/util_functions.h"
81+
#include "utils/visited_list.h"
82+
#include "vsag/attribute.h"
83+
#include "vsag/constants.h"
84+
#include "vsag/dataset.h"
85+
#include "vsag/index.h"
86+
#include "vsag/index_features.h"
3987

4088
namespace vsag {
89+
class Allocator;
90+
class IteratorFilterContext;
91+
struct QueryContext;
4192

4293
static FlattenInterfacePtr
4394
make_temporary_sq8_flatten(MetricType metric,

‎src/algorithm/hgraph/hgraph_cache.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,15 @@
1414

1515
#include "hgraph_cache.h"
1616

17-
#include "impl/allocator/default_allocator.h"
17+
#include <cstdint>
18+
#include <utility>
19+
20+
#include "storage/stream_reader.h"
21+
#include "storage/stream_writer.h"
22+
#include "tsl/robin_hash.h"
1823

1924
namespace vsag {
25+
class Allocator;
2026

2127
HGraphCache::HGraphCache(Allocator* allocator)
2228
: allocator_(allocator), source_ids_(allocator_), neighbors_(allocator_) {

‎src/algorithm/hgraph/hgraph_modify.cpp‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,35 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
#include <atomic>
16+
#include <cstdint>
17+
#include <memory>
18+
#include <mutex>
19+
#include <ostream>
20+
#include <shared_mutex>
21+
#include <tuple>
22+
#include <vector>
23+
24+
#include "algorithm/inner_index_interface.h"
25+
#include "basic_types.h"
26+
#include "common.h"
27+
#include "container_types.h"
28+
#include "datacell/attribute_inverted_interface.h"
29+
#include "datacell/extra_info_interface.h"
30+
#include "datacell/flatten_interface.h"
31+
#include "datacell/graph_interface.h"
32+
#include "hash_types.h"
1533
#include "hgraph.h" // IWYU pragma: keep
34+
#include "impl/label_table/label_table.h"
1635
#include "impl/pruning_strategy.h"
17-
#include "utils/util_functions.h"
36+
#include "tsl/robin_hash.h"
37+
#include "utils/lock_strategy.h"
38+
#include "vsag/errors.h"
39+
#include "vsag/index.h"
40+
#include "vsag_exception.h"
1841

1942
namespace vsag {
43+
struct AttributeSet;
2044

2145
uint32_t
2246
HGraph::Remove(const std::vector<int64_t>& ids, RemoveMode mode) {

‎src/algorithm/hgraph/hgraph_param_mapping.cpp‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,26 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <fmt/format.h>
15+
#include <fmt/core.h>
16+
17+
#include <algorithm>
18+
#include <cstdint>
19+
#include <memory>
20+
#include <string>
1621

1722
#include "common.h"
23+
#include "data_type.h"
24+
#include "datacell/graph_interface_parameter.h"
1825
#include "hgraph.h" // IWYU pragma: keep
1926
#include "hgraph_parameter.h"
27+
#include "index_common_param.h"
28+
#include "inner_string_params.h"
29+
#include "json_types.h"
30+
#include "json_wrapper.h"
31+
#include "parameter.h"
32+
#include "type_helpers.h"
33+
#include "utils/util_functions.h"
34+
#include "vsag/constants.h"
2035

2136
namespace vsag {
2237

‎src/algorithm/hgraph/hgraph_parameter_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "hgraph_parameter.h"
1717

18-
#include <fmt/format.h>
18+
#include <fmt/core.h>
1919

2020
#include "hgraph.h"
2121
#include "index_common_param.h"

‎src/algorithm/hgraph/hgraph_search.cpp‎

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,63 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <fmt/format.h>
16-
15+
#include <fmt/core.h>
16+
17+
#include <algorithm>
18+
#include <atomic>
19+
#include <cstddef>
20+
#include <cstdint>
21+
#include <limits>
22+
#include <memory>
23+
#include <ostream>
24+
#include <shared_mutex>
25+
#include <string>
26+
#include <tuple>
27+
#include <utility>
28+
#include <vector>
29+
30+
#include "algorithm/hgraph/hgraph_parameter.h"
31+
#include "algorithm/inner_index_interface.h"
1732
#include "attr/argparse.h"
33+
#include "attr/executor/executor.h"
34+
#include "basic_types.h"
35+
#include "common.h"
36+
#include "container_types.h"
37+
#include "data_type.h"
38+
#include "datacell/attribute_inverted_interface.h"
39+
#include "datacell/extra_info_interface.h"
40+
#include "datacell/flatten_interface.h"
41+
#include "datacell/graph_interface.h"
1842
#include "dataset_impl.h"
43+
#include "hash_types.h"
1944
#include "hgraph.h" // IWYU pragma: keep
20-
#include "impl/filter/filter_headers.h"
21-
#include "impl/heap/standard_heap.h"
45+
#include "impl/filter/combined_filter.h"
46+
#include "impl/filter/extrainfo_wrapper_filter.h"
47+
#include "impl/filter/inner_id_wrapper_filter.h"
48+
#include "impl/heap/distance_heap.h"
49+
#include "impl/inner_search_param.h"
50+
#include "impl/label_table/label_table.h"
51+
#include "impl/logger/logger.h"
2252
#include "impl/reasoning/search_reasoning.h"
53+
#include "impl/searcher/basic_searcher.h"
54+
#include "impl/searcher/parallel_searcher.h"
2355
#include "index/iterator_filter.h"
56+
#include "query_context.h"
57+
#include "tsl/robin_hash.h"
58+
#include "utils/resource_object_pool.h"
59+
#include "utils/timer.h"
2460
#include "utils/util_functions.h"
61+
#include "utils/visited_list.h"
62+
#include "vsag/allocator.h"
63+
#include "vsag/dataset.h"
64+
#include "vsag/errors.h"
65+
#include "vsag/expected.hpp"
66+
#include "vsag/filter.h"
67+
#include "vsag/search_request.h"
68+
#include "vsag_exception.h"
2569

2670
namespace vsag {
71+
class IteratorContext;
2772

2873
static DatasetPtr
2974
make_empty_dataset_with_stats() {

‎src/algorithm/hgraph/hgraph_serialize.cpp‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,42 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include <fmt/format.h>
16-
17-
#include "datacell/sparse_graph_datacell.h"
15+
#include <fmt/core.h>
16+
17+
#include <atomic>
18+
#include <cstdint>
19+
#include <limits>
20+
#include <memory>
21+
#include <string>
22+
#include <vector>
23+
24+
#include "algorithm/hgraph/hgraph_parameter.h"
25+
#include "algorithm/inner_index_interface.h"
26+
#include "algorithm/inner_index_parameter.h"
27+
#include "basic_types.h"
28+
#include "container_types.h"
29+
#include "data_type.h"
30+
#include "datacell/attribute_inverted_interface.h"
31+
#include "datacell/extra_info_interface.h"
32+
#include "datacell/flatten_interface.h"
33+
#include "datacell/graph_interface.h"
1834
#include "hgraph.h" // IWYU pragma: keep
19-
#include "impl/heap/standard_heap.h"
20-
#include "impl/odescent/odescent_graph_builder.h"
21-
#include "impl/pruning_strategy.h"
35+
#include "impl/label_table/label_table.h"
36+
#include "impl/logger/logger.h"
37+
#include "inner_string_params.h"
38+
#include "json_types.h"
39+
#include "json_wrapper.h"
40+
#include "metric_type.h"
2241
#include "storage/serialization.h"
2342
#include "storage/stream_reader.h"
24-
#include "typing.h"
43+
#include "storage/stream_writer.h"
44+
#include "tsl/robin_map.h"
45+
#include "utils/lock_strategy.h"
2546
#include "utils/util_functions.h"
26-
#include "vsag/options.h"
47+
#include "utils/visited_list.h"
48+
#include "vsag/constants.h"
49+
#include "vsag/errors.h"
50+
#include "vsag_exception.h"
2751

2852
namespace vsag {
2953

‎src/algorithm/hnswlib/block_manager.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,17 @@
1515

1616
#include "block_manager.h"
1717

18+
#include <algorithm>
19+
#include <cstdint>
20+
#include <ios>
21+
#include <new>
22+
#include <stdexcept>
23+
#include <string>
24+
25+
#include "storage/stream_reader.h"
26+
#include "storage/stream_writer.h"
27+
#include "vsag/allocator.h"
28+
1829
namespace hnswlib {
1930

2031
BlockManager::BlockManager(uint64_t size_data_per_element,

0 commit comments

Comments
 (0)