diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-15 11:50:08 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-15 11:50:46 +0000 |
commit | 81fb601117642a0e531630cc504cb4a6855d27df (patch) | |
tree | 093d429e9e791df3870aa84a3601489c2f214351 | |
parent | fb35d47f9dfdc0cab773b86a496e010877d72afe (diff) |
Collapse searchcorespi into searchcore
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchcore/CMakeLists.txt | 6 | ||||
-rw-r--r-- | searchcore/src/tests/index/disk_indexes/CMakeLists.txt (renamed from searchcorespi/src/tests/index/disk_indexes/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | searchcore/src/tests/index/disk_indexes/disk_indexes_test.cpp (renamed from searchcorespi/src/tests/index/disk_indexes/disk_indexes_test.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/tests/index/index_disk_layout/CMakeLists.txt (renamed from searchcorespi/src/tests/index/index_disk_layout/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | searchcore/src/tests/index/index_disk_layout/index_disk_layout_test.cpp (renamed from searchcorespi/src/tests/index/index_disk_layout/index_disk_layout_test.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/tests/proton/flushengine/CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt | 2 | ||||
-rw-r--r-- | searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/documentmetastore/CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/flushengine/CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/index/CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/matching/CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.cpp | 15 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.h | 11 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/.gitignore (renamed from searchcorespi/src/vespa/searchcorespi/.gitignore) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/CMakeLists.txt (renamed from searchcorespi/src/vespa/searchcorespi/CMakeLists.txt) | 3 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/flush/.gitignore (renamed from searchcorespi/src/vespa/searchcorespi/flush/.gitignore) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/flush/CMakeLists.txt (renamed from searchcorespi/src/vespa/searchcorespi/flush/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/flush/flushstats.cpp (renamed from searchcorespi/src/vespa/searchcorespi/flush/flushstats.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/flush/flushstats.h (renamed from searchcorespi/src/vespa/searchcorespi/flush/flushstats.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/flush/flushtask.h (renamed from searchcorespi/src/vespa/searchcorespi/flush/flushtask.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/flush/iflushtarget.h (renamed from searchcorespi/src/vespa/searchcorespi/flush/iflushtarget.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/flush/lambdaflushtask.h (renamed from searchcorespi/src/vespa/searchcorespi/flush/lambdaflushtask.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/.gitignore (renamed from searchcorespi/src/vespa/searchcorespi/index/.gitignore) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/CMakeLists.txt (renamed from searchcorespi/src/vespa/searchcorespi/index/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/disk_index_stats.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/disk_index_stats.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/disk_index_stats.h (renamed from searchcorespi/src/vespa/searchcorespi/index/disk_index_stats.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/disk_indexes.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/disk_indexes.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/disk_indexes.h (renamed from searchcorespi/src/vespa/searchcorespi/index/disk_indexes.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/diskindexcleaner.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/diskindexcleaner.h (renamed from searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/eventlogger.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/eventlogger.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/eventlogger.h (renamed from searchcorespi/src/vespa/searchcorespi/index/eventlogger.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/fakeindexsearchable.h (renamed from searchcorespi/src/vespa/searchcorespi/index/fakeindexsearchable.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/fusionrunner.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/fusionrunner.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/fusionrunner.h (renamed from searchcorespi/src/vespa/searchcorespi/index/fusionrunner.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/fusionspec.h (renamed from searchcorespi/src/vespa/searchcorespi/index/fusionspec.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/i_thread_service.h (renamed from searchcorespi/src/vespa/searchcorespi/index/i_thread_service.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/idiskindex.h (renamed from searchcorespi/src/vespa/searchcorespi/index/idiskindex.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/iindexcollection.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/iindexcollection.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/iindexcollection.h (renamed from searchcorespi/src/vespa/searchcorespi/index/iindexcollection.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/iindexmaintaineroperations.h (renamed from searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/iindexmanager.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/iindexmanager.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/iindexmanager.h (renamed from searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/imemoryindex.h (renamed from searchcorespi/src/vespa/searchcorespi/index/imemoryindex.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/index_disk_dir.h (renamed from searchcorespi/src/vespa/searchcorespi/index/index_disk_dir.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/index_disk_dir_state.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_state.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/index_disk_dir_state.h (renamed from searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_state.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/index_manager_explorer.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/index_manager_explorer.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/index_manager_explorer.h (renamed from searchcorespi/src/vespa/searchcorespi/index/index_manager_explorer.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/index_manager_stats.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/index_manager_stats.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/index_manager_stats.h (renamed from searchcorespi/src/vespa/searchcorespi/index/index_manager_stats.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/index_searchable_stats.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/index_searchable_stats.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/index_searchable_stats.h (renamed from searchcorespi/src/vespa/searchcorespi/index/index_searchable_stats.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexcollection.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexcollection.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexcollection.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexdisklayout.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/indexdisklayout.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexdisklayout.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexdisklayout.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexflushtarget.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexflushtarget.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexfusiontarget.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexfusiontarget.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexmaintainer.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexmaintainerconfig.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/indexmaintainerconfig.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexmaintainerconfig.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexmaintainerconfig.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexmaintainercontext.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/indexmaintainercontext.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexmaintainercontext.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexmaintainercontext.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexmanagerconfig.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/indexmanagerconfig.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexmanagerconfig.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexmanagerconfig.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexreadutilities.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/indexreadutilities.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexreadutilities.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexreadutilities.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexsearchable.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexsearchable.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexsearchablevisitor.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexsearchablevisitor.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexwriteutilities.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/indexwriteutilities.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/indexwriteutilities.h (renamed from searchcorespi/src/vespa/searchcorespi/index/indexwriteutilities.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/isearchableindexcollection.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/isearchableindexcollection.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/isearchableindexcollection.h (renamed from searchcorespi/src/vespa/searchcorespi/index/isearchableindexcollection.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/ithreadingservice.h (renamed from searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/memory_index_stats.h (renamed from searchcorespi/src/vespa/searchcorespi/index/memory_index_stats.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/warmupconfig.h (renamed from searchcorespi/src/vespa/searchcorespi/index/warmupconfig.h) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/warmupindexcollection.cpp (renamed from searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp) | 0 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcorespi/index/warmupindexcollection.h (renamed from searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h) | 0 | ||||
-rw-r--r-- | searchcorespi/CMakeLists.txt | 4 |
89 files changed, 38 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cbfdc160de6..a71b903d0d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,7 +116,6 @@ add_subdirectory(persistencetypes) add_subdirectory(predicate-search) add_subdirectory(searchcommon) add_subdirectory(searchcore) -add_subdirectory(searchcorespi) add_subdirectory(searchlib) add_subdirectory(searchsummary) add_subdirectory(security-tools) diff --git a/searchcore/CMakeLists.txt b/searchcore/CMakeLists.txt index 7fb98cb2514..8df693e8ea2 100644 --- a/searchcore/CMakeLists.txt +++ b/searchcore/CMakeLists.txt @@ -15,7 +15,6 @@ vespa_define_module( messagebus documentapi persistence - searchcorespi searchsummary fileacquirer @@ -41,6 +40,9 @@ vespa_define_module( src/vespa/searchcore/proton/server src/vespa/searchcore/proton/summaryengine src/vespa/searchcore/proton/test + src/vespa/searchcorespi + src/vespa/searchcorespi/flush + src/vespa/searchcorespi/index APPS src/apps/proton @@ -158,6 +160,8 @@ vespa_define_module( src/tests/proton/statusreport src/tests/proton/summaryengine src/tests/proton/verify_ranksetup + src/tests/index/disk_indexes + src/tests/index/index_disk_layout TEST_DEPENDS messagebus_messagebus-test diff --git a/searchcorespi/src/tests/index/disk_indexes/CMakeLists.txt b/searchcore/src/tests/index/disk_indexes/CMakeLists.txt index 81b6bb0e8a9..81b6bb0e8a9 100644 --- a/searchcorespi/src/tests/index/disk_indexes/CMakeLists.txt +++ b/searchcore/src/tests/index/disk_indexes/CMakeLists.txt diff --git a/searchcorespi/src/tests/index/disk_indexes/disk_indexes_test.cpp b/searchcore/src/tests/index/disk_indexes/disk_indexes_test.cpp index d22ad499316..d22ad499316 100644 --- a/searchcorespi/src/tests/index/disk_indexes/disk_indexes_test.cpp +++ b/searchcore/src/tests/index/disk_indexes/disk_indexes_test.cpp diff --git a/searchcorespi/src/tests/index/index_disk_layout/CMakeLists.txt b/searchcore/src/tests/index/index_disk_layout/CMakeLists.txt index 4e82cf1b9d2..4e82cf1b9d2 100644 --- a/searchcorespi/src/tests/index/index_disk_layout/CMakeLists.txt +++ b/searchcore/src/tests/index/index_disk_layout/CMakeLists.txt diff --git a/searchcorespi/src/tests/index/index_disk_layout/index_disk_layout_test.cpp b/searchcore/src/tests/index/index_disk_layout/index_disk_layout_test.cpp index e35225b2745..e35225b2745 100644 --- a/searchcorespi/src/tests/index/index_disk_layout/index_disk_layout_test.cpp +++ b/searchcore/src/tests/index/index_disk_layout/index_disk_layout_test.cpp diff --git a/searchcore/src/tests/proton/flushengine/CMakeLists.txt b/searchcore/src/tests/proton/flushengine/CMakeLists.txt index b45c4fa411c..a47b3f2c93f 100644 --- a/searchcore/src/tests/proton/flushengine/CMakeLists.txt +++ b/searchcore/src/tests/proton/flushengine/CMakeLists.txt @@ -5,6 +5,7 @@ vespa_add_executable(searchcore_flushengine_test_app TEST DEPENDS searchcore_flushengine searchcore_pcommon + searchcore_test ) vespa_add_test( NAME searchcore_flushengine_test_app diff --git a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt index 9f0c777a4d7..608f80e38aa 100644 --- a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt +++ b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/CMakeLists.txt @@ -3,8 +3,8 @@ vespa_add_executable(searchcore_flushengine_prepare_restart_flush_strategy_test_ SOURCES prepare_restart_flush_strategy_test.cpp DEPENDS - searchcorespi searchcore_flushengine + searchcore_test ) vespa_add_test( NAME searchcore_flushengine_prepare_restart_flush_strategy_test_app diff --git a/searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt b/searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt index 4a5dd2acb9d..aad11581e2f 100644 --- a/searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt +++ b/searchcore/src/tests/proton/metrics/documentdb_job_trackers/CMakeLists.txt @@ -4,5 +4,6 @@ vespa_add_executable(searchcore_documentdb_job_trackers_test_app TEST documentdb_job_trackers_test.cpp DEPENDS searchcore_proton_metrics + searchcore_test ) vespa_add_test(NAME searchcore_documentdb_job_trackers_test_app COMMAND searchcore_documentdb_job_trackers_test_app) diff --git a/searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt b/searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt index 6ab08602f67..4467bea4ab1 100644 --- a/searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt +++ b/searchcore/src/tests/proton/metrics/job_tracked_flush/CMakeLists.txt @@ -4,5 +4,6 @@ vespa_add_executable(searchcore_job_tracked_flush_test_app TEST job_tracked_flush_test.cpp DEPENDS searchcore_proton_metrics + searchcore_test ) vespa_add_test(NAME searchcore_job_tracked_flush_test_app COMMAND searchcore_job_tracked_flush_test_app) diff --git a/searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt b/searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt index 80c5521c763..207883aab0e 100644 --- a/searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt +++ b/searchcore/src/tests/proton/server/memoryflush/CMakeLists.txt @@ -5,5 +5,6 @@ vespa_add_executable(searchcore_memoryflush_test_app TEST DEPENDS searchcore_server searchcore_flushengine + searchcore_test ) vespa_add_test(NAME searchcore_memoryflush_test_app COMMAND searchcore_memoryflush_test_app) diff --git a/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt b/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt index 60d3a05502a..501c5e468dd 100644 --- a/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt @@ -49,6 +49,7 @@ vespa_add_library(searchcore_bmcluster STATIC searchcore_grouping searchcore_proton_metrics searchcore_fconfig + searchcorespi storageserver_storageapp messagebus_messagebus-test messagebus diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/documentmetastore/CMakeLists.txt index 5f288a116b4..ff740f7a4ae 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/CMakeLists.txt @@ -20,4 +20,5 @@ vespa_add_library(searchcore_documentmetastore STATIC searchcore_attribute searchcore_bucketdb searchcore_initializer + searchcorespi ) diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/flushengine/CMakeLists.txt index b506e889a97..a0e69af5b1e 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/flushengine/CMakeLists.txt @@ -16,4 +16,5 @@ vespa_add_library(searchcore_flushengine STATIC tls_stats_factory.cpp tls_stats_map.cpp DEPENDS + searchcorespi ) diff --git a/searchcore/src/vespa/searchcore/proton/index/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/index/CMakeLists.txt index 7f5ece11366..ee9f0caded1 100644 --- a/searchcore/src/vespa/searchcore/proton/index/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/index/CMakeLists.txt @@ -7,4 +7,5 @@ vespa_add_library(searchcore_index STATIC indexmanager.cpp memoryindexwrapper.cpp DEPENDS + searchcorespi ) diff --git a/searchcore/src/vespa/searchcore/proton/matching/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/matching/CMakeLists.txt index 41e2fe2105f..1c203dd1284 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/matching/CMakeLists.txt @@ -43,4 +43,5 @@ vespa_add_library(searchcore_matching STATIC viewresolver.cpp DEPENDS searchcore_grouping + searchcorespi ) diff --git a/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt index 3a2e443bfef..5df9060ea07 100644 --- a/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt @@ -8,6 +8,7 @@ vespa_add_library(searchcore_test STATIC clusterstatehandler.cpp documentdb_config_builder.cpp dummy_feed_view.cpp + dummy_flush_target.cpp mock_index_manager.cpp mock_shared_threading_service.cpp userdocumentsbuilder.cpp @@ -17,4 +18,5 @@ vespa_add_library(searchcore_test STATIC DEPENDS searchcore_server searchcore_fconfig + searchcorespi ) diff --git a/searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.cpp b/searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.cpp new file mode 100644 index 00000000000..8915e3b367c --- /dev/null +++ b/searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.cpp @@ -0,0 +1,15 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +#include "dummy_flush_target.h" + +namespace proton::test { + +DummyFlushTarget::DummyFlushTarget(const vespalib::string &name) noexcept + : searchcorespi::IFlushTarget(name) +{} +DummyFlushTarget::DummyFlushTarget(const vespalib::string &name, const Type &type, const Component &component) noexcept + : searchcorespi::IFlushTarget(name, type, component) +{} +DummyFlushTarget::~DummyFlushTarget() = default; + +} diff --git a/searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.h b/searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.h index 3689b181c52..a9206233c9d 100644 --- a/searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.h +++ b/searchcore/src/vespa/searchcore/proton/test/dummy_flush_target.h @@ -7,14 +7,9 @@ namespace proton::test { struct DummyFlushTarget : public searchcorespi::IFlushTarget { - DummyFlushTarget(const vespalib::string &name) noexcept - : searchcorespi::IFlushTarget(name) - {} - DummyFlushTarget(const vespalib::string &name, - const Type &type, - const Component &component) noexcept - : searchcorespi::IFlushTarget(name, type, component) - {} + DummyFlushTarget(const vespalib::string &name) noexcept; + DummyFlushTarget(const vespalib::string &name, const Type &type, const Component &component) noexcept; + ~DummyFlushTarget() override; MemoryGain getApproxMemoryGain() const override { return MemoryGain(0, 0); } DiskGain getApproxDiskGain() const override { return DiskGain(0, 0); } SerialNum getFlushedSerialNum() const override { return 0; } diff --git a/searchcorespi/src/vespa/searchcorespi/.gitignore b/searchcore/src/vespa/searchcorespi/.gitignore index 9d6ecd51398..9d6ecd51398 100644 --- a/searchcorespi/src/vespa/searchcorespi/.gitignore +++ b/searchcore/src/vespa/searchcorespi/.gitignore diff --git a/searchcorespi/src/vespa/searchcorespi/CMakeLists.txt b/searchcore/src/vespa/searchcorespi/CMakeLists.txt index 56608a219be..fab1d007a4f 100644 --- a/searchcorespi/src/vespa/searchcorespi/CMakeLists.txt +++ b/searchcore/src/vespa/searchcorespi/CMakeLists.txt @@ -1,8 +1,7 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(searchcorespi +vespa_add_library(searchcorespi STATIC SOURCES $<TARGET_OBJECTS:searchcorespi_flush> $<TARGET_OBJECTS:searchcorespi_index> - INSTALL lib64 DEPENDS ) diff --git a/searchcorespi/src/vespa/searchcorespi/flush/.gitignore b/searchcore/src/vespa/searchcorespi/flush/.gitignore index 7e7c0fe7fae..7e7c0fe7fae 100644 --- a/searchcorespi/src/vespa/searchcorespi/flush/.gitignore +++ b/searchcore/src/vespa/searchcorespi/flush/.gitignore diff --git a/searchcorespi/src/vespa/searchcorespi/flush/CMakeLists.txt b/searchcore/src/vespa/searchcorespi/flush/CMakeLists.txt index c7fa81ffd01..b2777d4327a 100644 --- a/searchcorespi/src/vespa/searchcorespi/flush/CMakeLists.txt +++ b/searchcore/src/vespa/searchcorespi/flush/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(searchcorespi_flush OBJECT +vespa_add_library(searchcorespi_flush STATIC OBJECT SOURCES flushstats.cpp DEPENDS diff --git a/searchcorespi/src/vespa/searchcorespi/flush/flushstats.cpp b/searchcore/src/vespa/searchcorespi/flush/flushstats.cpp index 28632219a28..28632219a28 100644 --- a/searchcorespi/src/vespa/searchcorespi/flush/flushstats.cpp +++ b/searchcore/src/vespa/searchcorespi/flush/flushstats.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/flush/flushstats.h b/searchcore/src/vespa/searchcorespi/flush/flushstats.h index f92187b2112..f92187b2112 100644 --- a/searchcorespi/src/vespa/searchcorespi/flush/flushstats.h +++ b/searchcore/src/vespa/searchcorespi/flush/flushstats.h diff --git a/searchcorespi/src/vespa/searchcorespi/flush/flushtask.h b/searchcore/src/vespa/searchcorespi/flush/flushtask.h index a4de3f65fff..a4de3f65fff 100644 --- a/searchcorespi/src/vespa/searchcorespi/flush/flushtask.h +++ b/searchcore/src/vespa/searchcorespi/flush/flushtask.h diff --git a/searchcorespi/src/vespa/searchcorespi/flush/iflushtarget.h b/searchcore/src/vespa/searchcorespi/flush/iflushtarget.h index dff6041d7d5..dff6041d7d5 100644 --- a/searchcorespi/src/vespa/searchcorespi/flush/iflushtarget.h +++ b/searchcore/src/vespa/searchcorespi/flush/iflushtarget.h diff --git a/searchcorespi/src/vespa/searchcorespi/flush/lambdaflushtask.h b/searchcore/src/vespa/searchcorespi/flush/lambdaflushtask.h index 75737ce73d5..75737ce73d5 100644 --- a/searchcorespi/src/vespa/searchcorespi/flush/lambdaflushtask.h +++ b/searchcore/src/vespa/searchcorespi/flush/lambdaflushtask.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/.gitignore b/searchcore/src/vespa/searchcorespi/index/.gitignore index 7e7c0fe7fae..7e7c0fe7fae 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/.gitignore +++ b/searchcore/src/vespa/searchcorespi/index/.gitignore diff --git a/searchcorespi/src/vespa/searchcorespi/index/CMakeLists.txt b/searchcore/src/vespa/searchcorespi/index/CMakeLists.txt index 3995eb836fd..ca33131d7f4 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/CMakeLists.txt +++ b/searchcore/src/vespa/searchcorespi/index/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(searchcorespi_index OBJECT +vespa_add_library(searchcorespi_index STATIC OBJECT SOURCES diskindexcleaner.cpp disk_indexes.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/disk_index_stats.cpp b/searchcore/src/vespa/searchcorespi/index/disk_index_stats.cpp index 1b77061de8c..1b77061de8c 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/disk_index_stats.cpp +++ b/searchcore/src/vespa/searchcorespi/index/disk_index_stats.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/disk_index_stats.h b/searchcore/src/vespa/searchcorespi/index/disk_index_stats.h index 831d95e95c1..831d95e95c1 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/disk_index_stats.h +++ b/searchcore/src/vespa/searchcorespi/index/disk_index_stats.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/disk_indexes.cpp b/searchcore/src/vespa/searchcorespi/index/disk_indexes.cpp index 28f6a886d06..28f6a886d06 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/disk_indexes.cpp +++ b/searchcore/src/vespa/searchcorespi/index/disk_indexes.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/disk_indexes.h b/searchcore/src/vespa/searchcorespi/index/disk_indexes.h index 842c1814faf..842c1814faf 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/disk_indexes.h +++ b/searchcore/src/vespa/searchcorespi/index/disk_indexes.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.cpp b/searchcore/src/vespa/searchcorespi/index/diskindexcleaner.cpp index 3bed7ea8ea7..3bed7ea8ea7 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.cpp +++ b/searchcore/src/vespa/searchcorespi/index/diskindexcleaner.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.h b/searchcore/src/vespa/searchcorespi/index/diskindexcleaner.h index cbd3a5aa94f..cbd3a5aa94f 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/diskindexcleaner.h +++ b/searchcore/src/vespa/searchcorespi/index/diskindexcleaner.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/eventlogger.cpp b/searchcore/src/vespa/searchcorespi/index/eventlogger.cpp index 7a5b1bf907a..7a5b1bf907a 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/eventlogger.cpp +++ b/searchcore/src/vespa/searchcorespi/index/eventlogger.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/eventlogger.h b/searchcore/src/vespa/searchcorespi/index/eventlogger.h index 6191543dcb3..6191543dcb3 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/eventlogger.h +++ b/searchcore/src/vespa/searchcorespi/index/eventlogger.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/fakeindexsearchable.h b/searchcore/src/vespa/searchcorespi/index/fakeindexsearchable.h index 25a8b6847e9..25a8b6847e9 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/fakeindexsearchable.h +++ b/searchcore/src/vespa/searchcorespi/index/fakeindexsearchable.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/fusionrunner.cpp b/searchcore/src/vespa/searchcorespi/index/fusionrunner.cpp index 1675b6091cf..1675b6091cf 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/fusionrunner.cpp +++ b/searchcore/src/vespa/searchcorespi/index/fusionrunner.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/fusionrunner.h b/searchcore/src/vespa/searchcorespi/index/fusionrunner.h index 92ad42b76ad..92ad42b76ad 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/fusionrunner.h +++ b/searchcore/src/vespa/searchcorespi/index/fusionrunner.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/fusionspec.h b/searchcore/src/vespa/searchcorespi/index/fusionspec.h index 0b147140e55..0b147140e55 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/fusionspec.h +++ b/searchcore/src/vespa/searchcorespi/index/fusionspec.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/i_thread_service.h b/searchcore/src/vespa/searchcorespi/index/i_thread_service.h index f973908b62d..f973908b62d 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/i_thread_service.h +++ b/searchcore/src/vespa/searchcorespi/index/i_thread_service.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/idiskindex.h b/searchcore/src/vespa/searchcorespi/index/idiskindex.h index 010e7e7727d..010e7e7727d 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/idiskindex.h +++ b/searchcore/src/vespa/searchcorespi/index/idiskindex.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/iindexcollection.cpp b/searchcore/src/vespa/searchcorespi/index/iindexcollection.cpp index 988c0084d4f..988c0084d4f 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/iindexcollection.cpp +++ b/searchcore/src/vespa/searchcorespi/index/iindexcollection.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/iindexcollection.h b/searchcore/src/vespa/searchcorespi/index/iindexcollection.h index 1cbf994b44f..1cbf994b44f 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/iindexcollection.h +++ b/searchcore/src/vespa/searchcorespi/index/iindexcollection.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h b/searchcore/src/vespa/searchcorespi/index/iindexmaintaineroperations.h index 9025b56dc27..9025b56dc27 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/iindexmaintaineroperations.h +++ b/searchcore/src/vespa/searchcorespi/index/iindexmaintaineroperations.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.cpp b/searchcore/src/vespa/searchcorespi/index/iindexmanager.cpp index 70770f6f012..70770f6f012 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.cpp +++ b/searchcore/src/vespa/searchcorespi/index/iindexmanager.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h b/searchcore/src/vespa/searchcorespi/index/iindexmanager.h index a4173b41aa5..a4173b41aa5 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h +++ b/searchcore/src/vespa/searchcorespi/index/iindexmanager.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/imemoryindex.h b/searchcore/src/vespa/searchcorespi/index/imemoryindex.h index 67d6e034080..67d6e034080 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/imemoryindex.h +++ b/searchcore/src/vespa/searchcorespi/index/imemoryindex.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir.h b/searchcore/src/vespa/searchcorespi/index/index_disk_dir.h index 335838ddf2e..335838ddf2e 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir.h +++ b/searchcore/src/vespa/searchcorespi/index/index_disk_dir.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_state.cpp b/searchcore/src/vespa/searchcorespi/index/index_disk_dir_state.cpp index ffe33d704c8..ffe33d704c8 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_state.cpp +++ b/searchcore/src/vespa/searchcorespi/index/index_disk_dir_state.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_state.h b/searchcore/src/vespa/searchcorespi/index/index_disk_dir_state.h index d8b790b3960..d8b790b3960 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/index_disk_dir_state.h +++ b/searchcore/src/vespa/searchcorespi/index/index_disk_dir_state.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_manager_explorer.cpp b/searchcore/src/vespa/searchcorespi/index/index_manager_explorer.cpp index 855f3c69bc9..855f3c69bc9 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/index_manager_explorer.cpp +++ b/searchcore/src/vespa/searchcorespi/index/index_manager_explorer.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_manager_explorer.h b/searchcore/src/vespa/searchcorespi/index/index_manager_explorer.h index 3e52199eeda..3e52199eeda 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/index_manager_explorer.h +++ b/searchcore/src/vespa/searchcorespi/index/index_manager_explorer.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_manager_stats.cpp b/searchcore/src/vespa/searchcorespi/index/index_manager_stats.cpp index a93934c1500..a93934c1500 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/index_manager_stats.cpp +++ b/searchcore/src/vespa/searchcorespi/index/index_manager_stats.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_manager_stats.h b/searchcore/src/vespa/searchcorespi/index/index_manager_stats.h index 1e218a62660..1e218a62660 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/index_manager_stats.h +++ b/searchcore/src/vespa/searchcorespi/index/index_manager_stats.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_searchable_stats.cpp b/searchcore/src/vespa/searchcorespi/index/index_searchable_stats.cpp index 92de7d2d292..92de7d2d292 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/index_searchable_stats.cpp +++ b/searchcore/src/vespa/searchcorespi/index/index_searchable_stats.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/index_searchable_stats.h b/searchcore/src/vespa/searchcorespi/index/index_searchable_stats.h index a61245ddb5d..a61245ddb5d 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/index_searchable_stats.h +++ b/searchcore/src/vespa/searchcorespi/index/index_searchable_stats.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp b/searchcore/src/vespa/searchcorespi/index/indexcollection.cpp index d69f7d1b0a4..d69f7d1b0a4 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.cpp +++ b/searchcore/src/vespa/searchcorespi/index/indexcollection.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h b/searchcore/src/vespa/searchcorespi/index/indexcollection.h index d9fb8e973e1..d9fb8e973e1 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h +++ b/searchcore/src/vespa/searchcorespi/index/indexcollection.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexdisklayout.cpp b/searchcore/src/vespa/searchcorespi/index/indexdisklayout.cpp index c701d1dfb1d..c701d1dfb1d 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexdisklayout.cpp +++ b/searchcore/src/vespa/searchcorespi/index/indexdisklayout.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexdisklayout.h b/searchcore/src/vespa/searchcorespi/index/indexdisklayout.h index 94b35936cc7..94b35936cc7 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexdisklayout.h +++ b/searchcore/src/vespa/searchcorespi/index/indexdisklayout.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.cpp b/searchcore/src/vespa/searchcorespi/index/indexflushtarget.cpp index e72525d0aaa..e72525d0aaa 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.cpp +++ b/searchcore/src/vespa/searchcorespi/index/indexflushtarget.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h b/searchcore/src/vespa/searchcorespi/index/indexflushtarget.h index 2b9ecc9574b..2b9ecc9574b 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexflushtarget.h +++ b/searchcore/src/vespa/searchcorespi/index/indexflushtarget.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp b/searchcore/src/vespa/searchcorespi/index/indexfusiontarget.cpp index 1df6d321f99..1df6d321f99 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.cpp +++ b/searchcore/src/vespa/searchcorespi/index/indexfusiontarget.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h b/searchcore/src/vespa/searchcorespi/index/indexfusiontarget.h index 7a9f44e6612..7a9f44e6612 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexfusiontarget.h +++ b/searchcore/src/vespa/searchcorespi/index/indexfusiontarget.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp b/searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp index af273bc5e45..af273bc5e45 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp +++ b/searchcore/src/vespa/searchcorespi/index/indexmaintainer.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h b/searchcore/src/vespa/searchcorespi/index/indexmaintainer.h index b3fb14e1c2e..b3fb14e1c2e 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h +++ b/searchcore/src/vespa/searchcorespi/index/indexmaintainer.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainerconfig.cpp b/searchcore/src/vespa/searchcorespi/index/indexmaintainerconfig.cpp index 695de7b84ff..695de7b84ff 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainerconfig.cpp +++ b/searchcore/src/vespa/searchcorespi/index/indexmaintainerconfig.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainerconfig.h b/searchcore/src/vespa/searchcorespi/index/indexmaintainerconfig.h index 3f890e6fa76..3f890e6fa76 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainerconfig.h +++ b/searchcore/src/vespa/searchcorespi/index/indexmaintainerconfig.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainercontext.cpp b/searchcore/src/vespa/searchcorespi/index/indexmaintainercontext.cpp index efd7827fc3d..efd7827fc3d 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainercontext.cpp +++ b/searchcore/src/vespa/searchcorespi/index/indexmaintainercontext.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainercontext.h b/searchcore/src/vespa/searchcorespi/index/indexmaintainercontext.h index 2c7aa4af48e..2c7aa4af48e 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainercontext.h +++ b/searchcore/src/vespa/searchcorespi/index/indexmaintainercontext.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmanagerconfig.cpp b/searchcore/src/vespa/searchcorespi/index/indexmanagerconfig.cpp index 8ba9efe2734..8ba9efe2734 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexmanagerconfig.cpp +++ b/searchcore/src/vespa/searchcorespi/index/indexmanagerconfig.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmanagerconfig.h b/searchcore/src/vespa/searchcorespi/index/indexmanagerconfig.h index decb03d97e0..decb03d97e0 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexmanagerconfig.h +++ b/searchcore/src/vespa/searchcorespi/index/indexmanagerconfig.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexreadutilities.cpp b/searchcore/src/vespa/searchcorespi/index/indexreadutilities.cpp index 14556ddef29..14556ddef29 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexreadutilities.cpp +++ b/searchcore/src/vespa/searchcorespi/index/indexreadutilities.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexreadutilities.h b/searchcore/src/vespa/searchcorespi/index/indexreadutilities.h index aeafd746772..aeafd746772 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexreadutilities.h +++ b/searchcore/src/vespa/searchcorespi/index/indexreadutilities.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexsearchable.h b/searchcore/src/vespa/searchcorespi/index/indexsearchable.h index 609d7854351..609d7854351 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexsearchable.h +++ b/searchcore/src/vespa/searchcorespi/index/indexsearchable.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexsearchablevisitor.h b/searchcore/src/vespa/searchcorespi/index/indexsearchablevisitor.h index f85a2cf4af6..f85a2cf4af6 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexsearchablevisitor.h +++ b/searchcore/src/vespa/searchcorespi/index/indexsearchablevisitor.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexwriteutilities.cpp b/searchcore/src/vespa/searchcorespi/index/indexwriteutilities.cpp index cc2575f74d2..cc2575f74d2 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexwriteutilities.cpp +++ b/searchcore/src/vespa/searchcorespi/index/indexwriteutilities.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexwriteutilities.h b/searchcore/src/vespa/searchcorespi/index/indexwriteutilities.h index 313ab3cc1c7..313ab3cc1c7 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/indexwriteutilities.h +++ b/searchcore/src/vespa/searchcorespi/index/indexwriteutilities.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/isearchableindexcollection.cpp b/searchcore/src/vespa/searchcorespi/index/isearchableindexcollection.cpp index 85e87965cb7..85e87965cb7 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/isearchableindexcollection.cpp +++ b/searchcore/src/vespa/searchcorespi/index/isearchableindexcollection.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/isearchableindexcollection.h b/searchcore/src/vespa/searchcorespi/index/isearchableindexcollection.h index efd7062af71..efd7062af71 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/isearchableindexcollection.h +++ b/searchcore/src/vespa/searchcorespi/index/isearchableindexcollection.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h b/searchcore/src/vespa/searchcorespi/index/ithreadingservice.h index c325d5ded11..c325d5ded11 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/ithreadingservice.h +++ b/searchcore/src/vespa/searchcorespi/index/ithreadingservice.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/memory_index_stats.h b/searchcore/src/vespa/searchcorespi/index/memory_index_stats.h index ccc85ab4dc6..ccc85ab4dc6 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/memory_index_stats.h +++ b/searchcore/src/vespa/searchcorespi/index/memory_index_stats.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/warmupconfig.h b/searchcore/src/vespa/searchcorespi/index/warmupconfig.h index 8582b7256bc..8582b7256bc 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/warmupconfig.h +++ b/searchcore/src/vespa/searchcorespi/index/warmupconfig.h diff --git a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp b/searchcore/src/vespa/searchcorespi/index/warmupindexcollection.cpp index bf437dd7ee3..bf437dd7ee3 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp +++ b/searchcore/src/vespa/searchcorespi/index/warmupindexcollection.cpp diff --git a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h b/searchcore/src/vespa/searchcorespi/index/warmupindexcollection.h index c2d70b4fd5c..c2d70b4fd5c 100644 --- a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h +++ b/searchcore/src/vespa/searchcorespi/index/warmupindexcollection.h diff --git a/searchcorespi/CMakeLists.txt b/searchcorespi/CMakeLists.txt index 0bbaa813752..66ff3fff0f2 100644 --- a/searchcorespi/CMakeLists.txt +++ b/searchcorespi/CMakeLists.txt @@ -18,8 +18,4 @@ vespa_define_module( src/vespa/searchcorespi src/vespa/searchcorespi/flush src/vespa/searchcorespi/index - - TESTS - src/tests/index/disk_indexes - src/tests/index/index_disk_layout ) |