[search] Moved search components to the search library. Moved search index builder to the generator.

generator/dumper.cpp

@@ -1,10 +1,13 @@
 #include "generator/dumper.hpp"
 
+#include "search/search_delimiters.hpp"
+#include "search/search_index_values.hpp"
+#include "search/search_string_utils.hpp"
+#include "search/search_trie.hpp"
+
 #include "indexer/classificator.hpp"
 #include "indexer/feature_processor.hpp"
-#include "indexer/search_delimiters.hpp"
-#include "indexer/search_string_utils.hpp"
-#include "indexer/search_trie.hpp"
+#include "indexer/trie_reader.hpp"
 
 #include "coding/multilang_utf8_string.hpp"
 

generator/generator.pro

@@ -29,6 +29,7 @@ SOURCES += \
     osm_id.cpp \
     osm_source.cpp \
     routing_generator.cpp \
+    search_index_builder.cpp \
     statistics.cpp \
     tesselator.cpp \
     unpack_mwm.cpp \
@@ -58,6 +59,7 @@ HEADERS += \
     osm_xml_source.hpp \
     polygonizer.hpp \
     routing_generator.hpp \
+    search_index_builder.hpp \
     statistics.hpp \
     tesselator.hpp \
     unpack_mwm.hpp \

generator/generator_tool/generator_tool.cpp

@@ -1,15 +1,16 @@
-#include "generator/feature_generator.hpp"
-#include "generator/feature_sorter.hpp"
-#include "generator/update_generator.hpp"
 #include "generator/borders_generator.hpp"
 #include "generator/borders_loader.hpp"
+#include "generator/check_model.hpp"
 #include "generator/dumper.hpp"
+#include "generator/feature_generator.hpp"
+#include "generator/feature_sorter.hpp"
+#include "generator/generate_info.hpp"
+#include "generator/osm_source.hpp"
+#include "generator/routing_generator.hpp"
+#include "generator/search_index_builder.hpp"
 #include "generator/statistics.hpp"
 #include "generator/unpack_mwm.hpp"
-#include "generator/generate_info.hpp"
-#include "generator/check_model.hpp"
-#include "generator/routing_generator.hpp"
-#include "generator/osm_source.hpp"
+#include "generator/update_generator.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/classificator_loader.hpp"
@@ -20,7 +21,6 @@
 #include "indexer/index_builder.hpp"
 #include "indexer/map_style_reader.hpp"
 #include "indexer/rank_table.hpp"
-#include "indexer/search_index_builder.hpp"
 
 #include "platform/platform.hpp"
 

generator/search_index_builder.cpp

@@ -1,17 +1,18 @@
-#include "indexer/search_index_builder.hpp"
+#include "search_index_builder.hpp"
+
+#include "search/categories_holder.hpp"
+#include "search/reverse_geocoder.hpp"
+#include "search/search_delimiters.hpp"
+#include "search/search_index_values.hpp"
+#include "search/search_string_utils.hpp"
+#include "search/search_trie.hpp"
 
-#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/feature_algo.hpp"
 #include "indexer/feature_utils.hpp"
 #include "indexer/feature_visibility.hpp"
 #include "indexer/features_vector.hpp"
 #include "indexer/index.hpp"
-#include "indexer/reverse_geocoder.hpp"
-#include "indexer/search_delimiters.hpp"
-#include "indexer/search_index_values.hpp"
-#include "indexer/search_string_utils.hpp"
-#include "indexer/search_trie.hpp"
 #include "indexer/trie_builder.hpp"
 #include "indexer/types_skipper.hpp"
 

indexer/indexer.pro

@@ -10,7 +10,6 @@ ROOT_DIR = ..
 include($$ROOT_DIR/common.pri)
 
 SOURCES += \
-    categories_holder.cpp \
     classificator.cpp \
     classificator_loader.cpp \
     coding_params.cpp \
@@ -44,17 +43,12 @@ SOURCES += \
     old/feature_loader_101.cpp \
     point_to_int64.cpp \
     rank_table.cpp \
-    reverse_geocoder.cpp \
     scales.cpp \
-    search_delimiters.cpp \
-    search_index_builder.cpp \
-    search_string_utils.cpp \
     types_mapping.cpp \
     types_skipper.cpp \
 
 
 HEADERS += \
-    categories_holder.hpp \
     cell_coverer.hpp \
     cell_id.hpp \
     classificator.hpp \
@@ -96,17 +90,9 @@ HEADERS += \
     old/interval_index_101.hpp \
     point_to_int64.hpp \
     rank_table.hpp \
-    reverse_geocoder.hpp \
     scale_index.hpp \
     scale_index_builder.hpp \
     scales.hpp \
-    search_delimiters.hpp \
-    search_index_builder.hpp \
-    search_index_values.hpp \
-    search_string_utils.hpp \
-    search_trie.hpp \
-    string_file.hpp \
-    succinct_trie.hpp \
     succinct_trie_builder.hpp \
     succinct_trie_reader.hpp \
     tesselator_decl.hpp \

indexer/indexer_tests/indexer_tests.pro

@@ -19,7 +19,6 @@ HEADERS += \
 
 SOURCES += \
     ../../testing/testingmain.cpp \
-    categories_test.cpp \
     cell_coverer_test.cpp \
     cell_id_test.cpp \
     checker_test.cpp \
@@ -35,7 +34,6 @@ SOURCES += \
     point_to_int64_test.cpp \
     rank_table_test.cpp \
     scales_test.cpp \
-    search_string_utils_test.cpp \
     sort_and_merge_intervals_test.cpp \
     succinct_trie_test.cpp \
     test_polylines.cpp \

indexer/indexer_tests/succinct_trie_test.cpp

@@ -3,7 +3,6 @@
 #include "coding/reader.hpp"
 #include "coding/writer.hpp"
 
-#include "indexer/search_trie.hpp"
 #include "indexer/succinct_trie_builder.hpp"
 #include "indexer/succinct_trie_reader.hpp"
 #include "indexer/trie.hpp"

indexer/succinct_trie_reader.hpp

@@ -1,6 +1,4 @@
 #pragma once
-#include "indexer/trie.hpp"
-
 #include "coding/bit_streams.hpp"
 #include "coding/huffman.hpp"
 #include "coding/reader.hpp"

indexer/trie_builder.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include "trie.hpp"
 
 #include "coding/byte_stream.hpp"
 #include "coding/varint.hpp"
@@ -9,6 +10,7 @@
 #include "std/algorithm.hpp"
 #include "std/vector.hpp"
 
+
 // Trie format:
 // [1: header]
 // [node] ... [node]

map/address_finder.cpp

@@ -1,11 +1,12 @@
 #include "map/framework.hpp"
 
+#include "search/categories_holder.hpp"
 #include "search/result.hpp"
+
 #include "drape_frontend/visual_params.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature_visibility.hpp"
-#include "indexer/categories_holder.hpp"
 
 #include "platform/preferred_languages.hpp"
 

map/framework.cpp

@@ -13,6 +13,7 @@
 #include "routing/route.hpp"
 #include "routing/routing_algorithm.hpp"
 
+#include "search/categories_holder.hpp"
 #include "search/geometry_utils.hpp"
 #include "search/intermediate_result.hpp"
 #include "search/result.hpp"
@@ -27,7 +28,6 @@
 #include "drape_frontend/watch/cpu_drawer.hpp"
 #include "drape_frontend/watch/feature_processor.hpp"
 
-#include "indexer/categories_holder.hpp"
 #include "indexer/classificator_loader.hpp"
 #include "indexer/drawing_rules.hpp"
 #include "indexer/feature.hpp"

omim.pro

@@ -23,7 +23,7 @@ HEADERS += defines.hpp
   CONFIG *= desktop
 }
 
-SUBDIRS = 3party base coding geometry indexer routing
+SUBDIRS = 3party base coding geometry indexer search routing
 
 !CONFIG(osrm) {
   SUBDIRS *= platform stats storage
@@ -31,7 +31,7 @@ SUBDIRS = 3party base coding geometry indexer routing
   # Integration tests dependencies for gtool.
   # TODO(AlexZ): Avoid duplication for routing_integration_tests.
   CONFIG(gtool):!CONFIG(no-tests) {
-    SUBDIRS *= search map
+    SUBDIRS *= map
 
     routing_integration_tests.subdir = routing/routing_integration_tests
     routing_integration_tests.depends = $$SUBDIRS
@@ -50,7 +50,7 @@ SUBDIRS = 3party base coding geometry indexer routing
 }
 
 !CONFIG(gtool):!CONFIG(osrm) {
-  SUBDIRS *= drape drape_frontend search map
+  SUBDIRS *= drape drape_frontend map
 
   CONFIG(map_designer):CONFIG(desktop) {
     SUBDIRS *= skin_generator
@@ -64,7 +64,7 @@ SUBDIRS = 3party base coding geometry indexer routing
 
   CONFIG(desktop) {
     benchmark_tool.subdir = map/benchmark_tool
-    benchmark_tool.depends = 3party base coding geometry platform indexer map
+    benchmark_tool.depends = 3party base coding geometry platform indexer search map
     mapshot.depends = $$SUBDIRS
     qt.depends = $$SUBDIRS
 

search/approximate_string_match.hpp

@@ -1,7 +1,9 @@
 #pragma once
-#include "indexer/search_string_utils.hpp"
+#include "search_string_utils.hpp"
+
 #include "base/base.hpp"
 #include "base/buffer_vector.hpp"
+
 #include "std/queue.hpp"
 
 namespace search

search/categories_holder.cpp

@@ -1,6 +1,7 @@
-#include "indexer/categories_holder.hpp"
-#include "indexer/search_delimiters.hpp"
-#include "indexer/search_string_utils.hpp"
+#include "categories_holder.hpp"
+#include "search_delimiters.hpp"
+#include "search_string_utils.hpp"
+
 #include "indexer/classificator.hpp"
 
 #include "coding/reader.hpp"

search/feature_offset_match.hpp

@@ -1,9 +1,10 @@
 #pragma once
 #include "search/search_common.hpp"
+#include "search/search_index_values.hpp"
 #include "search/search_query.hpp"
 #include "search/search_query_params.hpp"
 
-#include "indexer/search_trie.hpp"
+#include "indexer/trie.hpp"
 
 #include "base/mutex.hpp"
 #include "base/scope_guard.hpp"

search/house_detector.cpp

@@ -1,10 +1,10 @@
 #include "search/algos.hpp"
 #include "search/house_detector.hpp"
 #include "search/search_common.hpp"
+#include "search/search_string_utils.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature_impl.hpp"
-#include "indexer/search_string_utils.hpp"
 
 #include "geometry/angles.hpp"
 #include "geometry/distance.hpp"

search/intermediate_result.cpp

@@ -1,3 +1,4 @@
+#include "categories_holder.hpp"
 #include "intermediate_result.hpp"
 #include "geometry_utils.hpp"
 
@@ -7,7 +8,6 @@
 #include "indexer/classificator.hpp"
 #include "indexer/feature.hpp"
 #include "indexer/scales.hpp"
-#include "indexer/categories_holder.hpp"
 
 #include "geometry/angles.hpp"
 

search/keyword_lang_matcher.cpp

@@ -1,7 +1,6 @@
-#include "search/keyword_lang_matcher.hpp"
-
-#include "indexer/search_string_utils.hpp"
-#include "indexer/search_delimiters.hpp"
+#include "keyword_lang_matcher.hpp"
+#include "search_delimiters.hpp"
+#include "search_string_utils.hpp"
 
 #include "base/stl_add.hpp"
 

search/keyword_matcher.cpp

@@ -1,7 +1,6 @@
-#include "search/keyword_matcher.hpp"
-
-#include "indexer/search_delimiters.hpp"
-#include "indexer/search_string_utils.hpp"
+#include "keyword_matcher.hpp"
+#include "search_delimiters.hpp"
+#include "search_string_utils.hpp"
 
 #include "base/stl_add.hpp"
 

search/locality.cpp

@@ -1,13 +1,13 @@
-#include "search/locality.hpp"
-
-#include "indexer/search_delimiters.hpp"
-#include "indexer/search_string_utils.hpp"
+#include "locality.hpp"
+#include "search_delimiters.hpp"
+#include "search_string_utils.hpp"
 
 #include "base/assert.hpp"
 
 #include "std/algorithm.hpp"
 #include "std/limits.hpp"
 
+
 namespace search
 {
 Locality::Locality()

search/locality.hpp

@@ -1,7 +1,7 @@
 #pragma once
-
 #include "indexer/ftypes_matcher.hpp"
-#include "indexer/search_trie.hpp"
+
+#include "geometry/point2d.hpp"
 
 #include "base/buffer_vector.hpp"
 #include "base/string_utils.hpp"

search/retrieval.cpp

@@ -1,14 +1,14 @@
-#include "search/retrieval.hpp"
-
-#include "search/feature_offset_match.hpp"
-#include "search/interval_set.hpp"
+#include "feature_offset_match.hpp"
+#include "interval_set.hpp"
+#include "retrieval.hpp"
+#include "search_index_values.hpp"
+#include "search_trie.hpp"
 
 #include "indexer/feature.hpp"
 #include "indexer/feature_algo.hpp"
 #include "indexer/index.hpp"
 #include "indexer/scales.hpp"
-#include "indexer/search_index_values.hpp"
-#include "indexer/search_trie.hpp"
+#include "indexer/trie_reader.hpp"
 
 #include "platform/mwm_version.hpp"
 

search/reverse_geocoder.cpp

@@ -1,11 +1,11 @@
 #include "reverse_geocoder.hpp"
+#include "search_string_utils.hpp"
 
 #include "indexer/feature.hpp"
 #include "indexer/feature_algo.hpp"
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/index.hpp"
 #include "indexer/scales.hpp"
-#include "indexer/search_string_utils.hpp"
 
 
 namespace search

search/search.pro

@@ -11,6 +11,7 @@ include($$ROOT_DIR/common.pri)
 HEADERS += \
     algos.hpp \
     approximate_string_match.hpp \
+    categories_holder.hpp \
     dummy_rank_table.hpp \
     feature_offset_match.hpp \
     geometry_utils.hpp \
@@ -28,12 +29,17 @@ HEADERS += \
     region.hpp \
     result.hpp \
     retrieval.hpp \
+    reverse_geocoder.hpp \
     search_common.hpp \
+    search_delimiters.hpp \
     search_engine.hpp \
+    search_index_values.hpp \
     search_query.hpp \
     search_query_factory.hpp \
     search_query_params.hpp \
     search_string_intersection.hpp \
+    search_string_utils.hpp \
+    search_trie.hpp \
     suggest.hpp \
     v2/features_layer.hpp \
     v2/features_layer_matcher.hpp \
@@ -44,6 +50,7 @@ HEADERS += \
 
 SOURCES += \
     approximate_string_match.cpp \
+    categories_holder.cpp \
     dummy_rank_table.cpp \
     geometry_utils.cpp \
     house_detector.cpp \
@@ -58,9 +65,12 @@ SOURCES += \
     region.cpp \
     result.cpp \
     retrieval.cpp \
+    reverse_geocoder.cpp \
+    search_delimiters.cpp \
     search_engine.cpp \
     search_query.cpp \
     search_query_params.cpp \
+    search_string_utils.cpp \
     v2/features_layer.cpp \
     v2/features_layer_matcher.cpp \
     v2/features_layer_path_finder.cpp \

search/search_delimiters.cpp

@@ -1,4 +1,4 @@
-#include "indexer/search_delimiters.hpp"
+#include "search_delimiters.hpp"
 
 namespace search
 {

search/search_engine.cpp

@@ -1,13 +1,14 @@
-#include "geometry_utils.hpp"
 #include "search_engine.hpp"
+
+#include "categories_holder.hpp"
+#include "geometry_utils.hpp"
 #include "search_query.hpp"
+#include "search_string_utils.hpp"
 
 #include "storage/country_info_getter.hpp"
 
-#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/scales.hpp"
-#include "indexer/search_string_utils.hpp"
 
 #include "platform/platform.hpp"
 

search/search_engine.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "categories_holder.hpp"
 #include "params.hpp"
 #include "result.hpp"
 #include "search_query_factory.hpp"
@@ -7,8 +8,6 @@
 
 #include "geometry/rect2d.hpp"
 
-#include "indexer/categories_holder.hpp"
-
 #include "coding/reader.hpp"
 
 #include "base/macros.hpp"

search/search_integration_tests/retrieval_test.cpp

@@ -1,24 +1,19 @@
 #include "testing/testing.hpp"
 
-#include "search/search_integration_tests/test_feature.hpp"
-#include "search/search_integration_tests/test_mwm_builder.hpp"
-#include "search/search_integration_tests/test_results_matching.hpp"
-#include "search/search_integration_tests/test_search_engine.hpp"
-#include "search/search_integration_tests/test_search_request.hpp"
+#include "search/retrieval.hpp"
+#include "search/search_delimiters.hpp"
+#include "search/search_query_params.hpp"
+#include "search/search_string_utils.hpp"
+#include "search/search_tests_support/test_feature.hpp"
+#include "search/search_tests_support/test_mwm_builder.hpp"
+#include "search/search_tests_support/test_results_matching.hpp"
+#include "search/search_tests_support/test_search_engine.hpp"
+#include "search/search_tests_support/test_search_request.hpp"
 
 #include "indexer/classificator_loader.hpp"
 #include "indexer/index.hpp"
 #include "indexer/mwm_set.hpp"
 #include "indexer/scales.hpp"
-#include "indexer/search_delimiters.hpp"
-#include "indexer/search_string_utils.hpp"
-
-#include "search/retrieval.hpp"
-#include "search/search_query_params.hpp"
-#include "search/search_tests_support/test_feature.hpp"
-#include "search/search_tests_support/test_mwm_builder.hpp"
-#include "search/search_tests_support/test_search_engine.hpp"
-#include "search/search_tests_support/test_search_request.hpp"
 
 #include "storage/country_decl.hpp"
 #include "storage/country_info_getter.hpp"

search/search_integration_tests/search_query_v2_test.cpp

@@ -1,10 +1,10 @@
 #include "testing/testing.hpp"
 
-#include "search/search_integration_tests/test_feature.hpp"
-#include "search/search_integration_tests/test_mwm_builder.hpp"
-#include "search/search_integration_tests/test_results_matching.hpp"
-#include "search/search_integration_tests/test_search_engine.hpp"
-#include "search/search_integration_tests/test_search_request.hpp"
+#include "search/search_tests_support/test_feature.hpp"
+#include "search/search_tests_support/test_mwm_builder.hpp"
+#include "search/search_tests_support/test_results_matching.hpp"
+#include "search/search_tests_support/test_search_engine.hpp"
+#include "search/search_tests_support/test_search_request.hpp"
 
 #include "search/search_query_factory.hpp"
 #include "search/v2/search_query_v2.hpp"
@@ -24,6 +24,8 @@
 
 #include "base/scope_guard.hpp"
 
+using namespace search::tests_support;
+
 namespace
 {
 void Cleanup(platform::LocalCountryFile const & map)

search/search_query.cpp

@@ -1,5 +1,6 @@
-#include "search/search_query.hpp"
+#include "search_query.hpp"
 
+#include "search/categories_holder.hpp"
 #include "search/dummy_rank_table.hpp"
 #include "search/feature_offset_match.hpp"
 #include "search/geometry_utils.hpp"
@@ -8,14 +9,15 @@
 #include "search/locality.hpp"
 #include "search/region.hpp"
 #include "search/search_common.hpp"
+#include "search/search_delimiters.hpp"
+#include "search/search_index_values.hpp"
 #include "search/search_query_params.hpp"
 #include "search/search_string_intersection.hpp"
+#include "search/search_string_utils.hpp"
 
 #include "storage/country_info_getter.hpp"
 
-#include "indexer/categories_holder.hpp"
 #include "indexer/classificator.hpp"
-
 #include "indexer/feature.hpp"
 #include "indexer/feature_algo.hpp"
 #include "indexer/feature_covering.hpp"
@@ -23,9 +25,7 @@
 #include "indexer/features_vector.hpp"
 #include "indexer/index.hpp"
 #include "indexer/scales.hpp"
-#include "indexer/search_delimiters.hpp"
-#include "indexer/search_index_values.hpp"
-#include "indexer/search_string_utils.hpp"
+#include "indexer/trie_reader.hpp"
 
 #include "platform/mwm_version.hpp"
 #include "platform/preferred_languages.hpp"

search/search_query.hpp

@@ -2,12 +2,12 @@
 #include "search/intermediate_result.hpp"
 #include "search/keyword_lang_matcher.hpp"
 #include "search/retrieval.hpp"
+#include "search/search_trie.hpp"
 #include "search/suggest.hpp"
 
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/index.hpp"
 #include "indexer/rank_table.hpp"
-#include "indexer/search_trie.hpp"
 
 #include "geometry/rect2d.hpp"
 

search/search_string_intersection.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "indexer/search_delimiters.hpp"
+#include "search_delimiters.hpp"
 
 
 namespace search

search/search_string_utils.cpp

@@ -1,4 +1,4 @@
-#include "indexer/search_string_utils.hpp"
+#include "search_string_utils.hpp"
 
 #include "base/macros.hpp"
 

search/search_tests/categories_test.cpp

@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "indexer/categories_holder.hpp"
+#include "search/categories_holder.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/classificator_loader.hpp"

search/search_tests/house_detector_tests.cpp

@@ -1,13 +1,13 @@
 #include "testing/testing.hpp"
 
 #include "search/house_detector.hpp"
+#include "search/search_string_utils.hpp"
 
 #include "indexer/classificator_loader.hpp"
 #include "indexer/data_header.hpp"
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/index.hpp"
 #include "indexer/scales.hpp"
-#include "indexer/search_string_utils.hpp"
 
 #include "platform/platform.hpp"
 

search/search_tests/keyword_lang_matcher_test.cpp

@@ -1,8 +1,8 @@
 #include "testing/testing.hpp"
-#include "search/keyword_lang_matcher.hpp"
 
-#include "indexer/search_delimiters.hpp"
-#include "indexer/search_string_utils.hpp"
+#include "search/keyword_lang_matcher.hpp"
+#include "search/search_delimiters.hpp"
+#include "search/search_string_utils.hpp"
 
 #include "base/stl_add.hpp"
 

search/search_tests/keyword_matcher_test.cpp

@@ -1,10 +1,9 @@
 #include "testing/testing.hpp"
+
 #include "search/keyword_matcher.hpp"
-
 #include "search/search_common.hpp"
-
-#include "indexer/search_string_utils.hpp"
-#include "indexer/search_delimiters.hpp"
+#include "search/search_delimiters.hpp"
+#include "search/search_string_utils.hpp"
 
 #include "base/buffer_vector.hpp"
 #include "base/stl_add.hpp"

search/search_tests/search_string_utils_test.cpp

@@ -1,5 +1,6 @@
 #include "testing/testing.hpp"
-#include "indexer/search_string_utils.hpp"
+
+#include "search/search_string_utils.hpp"
 
 #include "base/string_utils.hpp"
 

search/search_tests/search_tests.pro

@@ -17,6 +17,7 @@ macx-*: LIBS *= "-framework IOKit"
 SOURCES += \
     ../../testing/testingmain.cpp \
     algos_tests.cpp \
+    categories_test.cpp \
     house_detector_tests.cpp \
     interval_set_test.cpp \
     keyword_lang_matcher_test.cpp \
@@ -24,6 +25,7 @@ SOURCES += \
     latlon_match_test.cpp \
     locality_finder_test.cpp \
     query_saver_tests.cpp \
+    search_string_utils_test.cpp \
     string_intersection_test.cpp \
     string_match_test.cpp \
 

search/search_tests/string_match_test.cpp

@@ -1,10 +1,10 @@
 #include "testing/testing.hpp"
+
 #include "search/approximate_string_match.hpp"
+#include "search/search_delimiters.hpp"
 
 #include "search/search_tests/match_cost_mock.hpp"
 
-#include "indexer/search_delimiters.hpp"
-
 #include "base/stl_add.hpp"
 
 #include "std/cstring.hpp"

search/search_tests_support/search_tests_support.pro

@@ -9,11 +9,13 @@ include($$ROOT_DIR/common.pri)
 SOURCES += \
     test_feature.cpp \
     test_mwm_builder.cpp \
+    test_results_matching.cpp \
     test_search_engine.cpp \
     test_search_request.cpp \
 
 HEADERS += \
     test_feature.hpp \
     test_mwm_builder.hpp \
+    test_results_matching.hpp \
     test_search_engine.hpp \
     test_search_request.hpp \

search/search_tests_support/test_mwm_builder.cpp

@@ -2,14 +2,14 @@
 
 #include "search/search_tests_support/test_feature.hpp"
 
-#include "indexer/data_header.hpp"
-#include "indexer/features_offsets_table.hpp"
-#include "indexer/index_builder.hpp"
-#include "indexer/search_index_builder.hpp"
-
 #include "generator/feature_builder.hpp"
 #include "generator/feature_generator.hpp"
 #include "generator/feature_sorter.hpp"
+#include "generator/search_index_builder.hpp"
+
+#include "indexer/data_header.hpp"
+#include "indexer/features_offsets_table.hpp"
+#include "indexer/index_builder.hpp"
 
 #include "platform/local_country_file.hpp"
 

search/search_tests_support/test_results_matching.cpp

@@ -1,10 +1,14 @@
-#include "search/search_integration_tests/test_results_matching.hpp"
+#include "search/search_tests_support/test_results_matching.hpp"
 
 #include "indexer/feature_decl.hpp"
 #include "indexer/index.hpp"
 
 #include "std/sstream.hpp"
 
+namespace search
+{
+namespace tests_support
+{
 ExactMatch::ExactMatch(MwmSet::MwmId const & mwmId, shared_ptr<TestFeature> feature)
   : m_mwmId(mwmId), m_feature(feature)
 {
@@ -92,3 +96,5 @@ bool MatchResults(Index const & index, vector<shared_ptr<MatchingRule>> rules,
 }
 
 string DebugPrint(MatchingRule const & rule) { return rule.ToString(); }
+}  // namespace tests_support
+}  // namespace search

search/search_tests_support/test_results_matching.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "search/search_integration_tests/test_feature.hpp"
+#include "search/search_tests_support/test_feature.hpp"
 
 #include "search/result.hpp"
 
@@ -13,6 +13,10 @@
 class FeatureType;
 class Index;
 
+namespace search
+{
+namespace tests_support
+{
 class MatchingRule
 {
 public:
@@ -53,3 +57,5 @@ bool MatchResults(Index const & index, vector<shared_ptr<MatchingRule>> rules,
                   vector<search::Result> const & actual);
 
 string DebugPrint(MatchingRule const & rule);
+}  // namespace tests_support
+}  // namespace search

search/search_tests_support/test_search_engine.cpp

@@ -1,12 +1,12 @@
 #include "search/search_tests_support/test_search_engine.hpp"
 
-#include "indexer/categories_holder.hpp"
-#include "indexer/scales.hpp"
-
+#include "search/categories_holder.hpp"
 #include "search/search_query.hpp"
 #include "search/search_query_factory.hpp"
 #include "search/suggest.hpp"
 
+#include "indexer/scales.hpp"
+
 #include "storage/country_info_getter.hpp"
 
 #include "platform/platform.hpp"

search/search_trie.hpp

@@ -1,11 +1,7 @@
 #pragma once
 
-#include "indexer/geometry_serialization.hpp"
-#include "indexer/search_index_values.hpp"
-#include "indexer/trie.hpp"
-#include "indexer/trie_reader.hpp"
-
-#include "coding/reader.hpp"
+#include "indexer/coding_params.hpp"
+#include "indexer/point_to_int64.hpp"
 
 namespace search
 {

search/v2/geocoder.cpp

@@ -2,11 +2,11 @@
 
 #include "search/retrieval.hpp"
 #include "search/v2/features_layer_path_finder.hpp"
+#include "search/search_delimiters.hpp"
+#include "search/search_string_utils.hpp"
 
 #include "indexer/feature_decl.hpp"
 #include "indexer/index.hpp"
-#include "indexer/search_delimiters.hpp"
-#include "indexer/search_string_utils.hpp"
 
 #include "coding/multilang_utf8_string.hpp"