Revert "Revert "Collapse vsm into streamingvisitors""

108 files changed, 28 insertions, 70 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0eb126901b9..cbfdc160de6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,6 @@ add_subdirectory(vespajlib)
 add_subdirectory(vespalib)
 add_subdirectory(vespalog)
 add_subdirectory(vespamalloc)
-add_subdirectory(vsm)
 add_subdirectory(zkfacade)
 add_subdirectory(zookeeper-command-line-client)
 add_subdirectory(zookeeper-server)
diff --git a/pom.xml b/pom.xml
index 6a1dd0416dc..3f9d2c4ba64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,6 +121,7 @@
         <module>standalone-container</module>
         <module>statistics</module>
         <module>storage</module>
+        <module>streamingvisitors</module>
         <module>tenant-base</module>
         <module>tenant-cd-api</module>
         <module>tenant-cd-commons</module>
@@ -143,7 +144,6 @@
         <module>vespa_jersey2</module>
         <module>vespajlib</module>
         <module>vespalog</module>
-        <module>vsm</module>
         <module>yolean</module>
         <module>zkfacade</module>
         <module>zookeeper-client-common</module>
diff --git a/storageserver/CMakeLists.txt b/storageserver/CMakeLists.txt
index 628dc9ece3e..ee3335c4921 100644
--- a/storageserver/CMakeLists.txt
+++ b/storageserver/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_define_module(
     DEPENDS
     fastos
     storage
-    streamingvisitors_searchvisitor
+    streamingvisitors
 
     APPS
     src/apps/storaged
diff --git a/streamingvisitors/CMakeLists.txt b/streamingvisitors/CMakeLists.txt
index 5f5e16fc6c3..77ce4b471c0 100644
--- a/streamingvisitors/CMakeLists.txt
+++ b/streamingvisitors/CMakeLists.txt
@@ -7,17 +7,27 @@ vespa_define_module(
     storage
     storageapi
     config_cloudconfig
-    document
     vespalib
+    document
     vdslib
-    vsm
+    searchlib
+    searchsummary
 
     LIBS
     src/vespa/searchvisitor
+    src/vespa/vsm/common
+    src/vespa/vsm/config
+    src/vespa/vsm/searcher
+    src/vespa/vsm/vsm
 
     TESTS
     src/tests/hitcollector
     src/tests/matching_elements_filler
     src/tests/querywrapper
     src/tests/searchvisitor
+    src/tests/charbuffer
+    src/tests/docsum
+    src/tests/document
+    src/tests/searcher
+    src/tests/textutil
 )
diff --git a/vsm/pom.xml b/streamingvisitors/pom.xml
index 2cc777be593..2cc777be593 100644
--- a/vsm/pom.xml
+++ b/streamingvisitors/pom.xml
diff --git a/vsm/src/tests/charbuffer/.gitignore b/streamingvisitors/src/tests/charbuffer/.gitignore
index 2c980038fb5..2c980038fb5 100644
--- a/vsm/src/tests/charbuffer/.gitignore
+++ b/streamingvisitors/src/tests/charbuffer/.gitignore
diff --git a/vsm/src/tests/charbuffer/CMakeLists.txt b/streamingvisitors/src/tests/charbuffer/CMakeLists.txt
index 43eb6a8114f..5d0c0068d37 100644
--- a/vsm/src/tests/charbuffer/CMakeLists.txt
+++ b/streamingvisitors/src/tests/charbuffer/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vsm_charbuffer_test_app TEST
     SOURCES
     charbuffer.cpp
     DEPENDS
-    vsm
+    streamingvisitors
 )
 vespa_add_test(NAME vsm_charbuffer_test_app COMMAND vsm_charbuffer_test_app)
diff --git a/vsm/src/tests/charbuffer/charbuffer.cpp b/streamingvisitors/src/tests/charbuffer/charbuffer.cpp
index 736d35459cb..736d35459cb 100644
--- a/vsm/src/tests/charbuffer/charbuffer.cpp
+++ b/streamingvisitors/src/tests/charbuffer/charbuffer.cpp
diff --git a/vsm/src/tests/config/mail.cfg b/streamingvisitors/src/tests/config/mail.cfg
index ce830beac23..ce830beac23 100644
--- a/vsm/src/tests/config/mail.cfg
+++ b/streamingvisitors/src/tests/config/mail.cfg
diff --git a/vsm/src/tests/config/vsm.cfg b/streamingvisitors/src/tests/config/vsm.cfg
index dc50447f623..dc50447f623 100644
--- a/vsm/src/tests/config/vsm.cfg
+++ b/streamingvisitors/src/tests/config/vsm.cfg
diff --git a/vsm/src/tests/config/vsmfields.cfg b/streamingvisitors/src/tests/config/vsmfields.cfg
index 30f1c8ed8b1..30f1c8ed8b1 100644
--- a/vsm/src/tests/config/vsmfields.cfg
+++ b/streamingvisitors/src/tests/config/vsmfields.cfg
diff --git a/vsm/src/tests/docsum/.gitignore b/streamingvisitors/src/tests/docsum/.gitignore
index 9a697a94de8..9a697a94de8 100644
--- a/vsm/src/tests/docsum/.gitignore
+++ b/streamingvisitors/src/tests/docsum/.gitignore
diff --git a/vsm/src/tests/docsum/CMakeLists.txt b/streamingvisitors/src/tests/docsum/CMakeLists.txt
index aec2637b3ad..87c46409053 100644
--- a/vsm/src/tests/docsum/CMakeLists.txt
+++ b/streamingvisitors/src/tests/docsum/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vsm_docsum_test_app TEST
     SOURCES
     docsum.cpp
     DEPENDS
-    vsm
+    streamingvisitors
 )
 vespa_add_test(NAME vsm_docsum_test_app COMMAND vsm_docsum_test_app)
diff --git a/vsm/src/tests/docsum/docsum.cpp b/streamingvisitors/src/tests/docsum/docsum.cpp
index 475489d2f5a..475489d2f5a 100644
--- a/vsm/src/tests/docsum/docsum.cpp
+++ b/streamingvisitors/src/tests/docsum/docsum.cpp
diff --git a/vsm/src/tests/document/.gitignore b/streamingvisitors/src/tests/document/.gitignore
index d47781eff63..d47781eff63 100644
--- a/vsm/src/tests/document/.gitignore
+++ b/streamingvisitors/src/tests/document/.gitignore
diff --git a/vsm/src/tests/document/CMakeLists.txt b/streamingvisitors/src/tests/document/CMakeLists.txt
index 819d300280f..5ea12dc5e2d 100644
--- a/vsm/src/tests/document/CMakeLists.txt
+++ b/streamingvisitors/src/tests/document/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vsm_document_test_app TEST
     SOURCES
     document.cpp
     DEPENDS
-    vsm
+    streamingvisitors
 )
 vespa_add_test(NAME vsm_document_test_app COMMAND vsm_document_test_app)
diff --git a/vsm/src/tests/document/document.cpp b/streamingvisitors/src/tests/document/document.cpp
index 1e97d232a64..1e97d232a64 100644
--- a/vsm/src/tests/document/document.cpp
+++ b/streamingvisitors/src/tests/document/document.cpp
diff --git a/streamingvisitors/src/tests/hitcollector/CMakeLists.txt b/streamingvisitors/src/tests/hitcollector/CMakeLists.txt
index f25ab348265..dbec820a462 100644
--- a/streamingvisitors/src/tests/hitcollector/CMakeLists.txt
+++ b/streamingvisitors/src/tests/hitcollector/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(streamingvisitors_hitcollector_test_app TEST
     SOURCES
     hitcollector_test.cpp
     DEPENDS
-    streamingvisitors_searchvisitor
+    streamingvisitors
 )
 vespa_add_test(NAME streamingvisitors_hitcollector_test_app COMMAND streamingvisitors_hitcollector_test_app)
diff --git a/streamingvisitors/src/tests/matching_elements_filler/CMakeLists.txt b/streamingvisitors/src/tests/matching_elements_filler/CMakeLists.txt
index ef93d551912..5cc2977b3c3 100644
--- a/streamingvisitors/src/tests/matching_elements_filler/CMakeLists.txt
+++ b/streamingvisitors/src/tests/matching_elements_filler/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(streamingvisitors_matching_elements_filler_test_app TEST
     SOURCES
     matching_elements_filler_test.cpp
     DEPENDS
-    streamingvisitors_searchvisitor
+    streamingvisitors
     GTest::GTest
 )
 vespa_add_test(NAME streamingvisitors_matching_elements_filler_test_app COMMAND streamingvisitors_matching_elements_filler_test_app)
diff --git a/streamingvisitors/src/tests/querywrapper/CMakeLists.txt b/streamingvisitors/src/tests/querywrapper/CMakeLists.txt
index 7cae60e6a11..e0131d0c6cc 100644
--- a/streamingvisitors/src/tests/querywrapper/CMakeLists.txt
+++ b/streamingvisitors/src/tests/querywrapper/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(streamingvisitors_querywrapper_test_app TEST
     SOURCES
     querywrapper_test.cpp
     DEPENDS
-    streamingvisitors_searchvisitor
+    streamingvisitors
 )
 vespa_add_test(NAME streamingvisitors_querywrapper_test_app COMMAND streamingvisitors_querywrapper_test_app)
diff --git a/vsm/src/tests/searcher/.gitignore b/streamingvisitors/src/tests/searcher/.gitignore
index 52a56dff405..52a56dff405 100644
--- a/vsm/src/tests/searcher/.gitignore
+++ b/streamingvisitors/src/tests/searcher/.gitignore
diff --git a/vsm/src/tests/searcher/CMakeLists.txt b/streamingvisitors/src/tests/searcher/CMakeLists.txt
index 9e0bf0391ef..2277f5ef55f 100644
--- a/vsm/src/tests/searcher/CMakeLists.txt
+++ b/streamingvisitors/src/tests/searcher/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vsm_searcher_test_app TEST
     SOURCES
     searcher_test.cpp
     DEPENDS
-    vsm
+    streamingvisitors
 )
 vespa_add_test(NAME vsm_searcher_test_app COMMAND vsm_searcher_test_app)
diff --git a/vsm/src/tests/searcher/searcher_test.cpp b/streamingvisitors/src/tests/searcher/searcher_test.cpp
index 34fa66eaa90..34fa66eaa90 100644
--- a/vsm/src/tests/searcher/searcher_test.cpp
+++ b/streamingvisitors/src/tests/searcher/searcher_test.cpp
diff --git a/streamingvisitors/src/tests/searchvisitor/CMakeLists.txt b/streamingvisitors/src/tests/searchvisitor/CMakeLists.txt
index fdbd60ce30a..01b625b6b3b 100644
--- a/streamingvisitors/src/tests/searchvisitor/CMakeLists.txt
+++ b/streamingvisitors/src/tests/searchvisitor/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(streamingvisitors_searchvisitor_test_app TEST
     SOURCES
     searchvisitor_test.cpp
     DEPENDS
-    streamingvisitors_searchvisitor
+    streamingvisitors
 )
 vespa_add_test(NAME streamingvisitors_searchvisitor_test_app COMMAND streamingvisitors_searchvisitor_test_app)
diff --git a/vsm/src/tests/textutil/.gitignore b/streamingvisitors/src/tests/textutil/.gitignore
index 1103f79800a..1103f79800a 100644
--- a/vsm/src/tests/textutil/.gitignore
+++ b/streamingvisitors/src/tests/textutil/.gitignore
diff --git a/vsm/src/tests/textutil/CMakeLists.txt b/streamingvisitors/src/tests/textutil/CMakeLists.txt
index 83d4d8b00d6..59817d01137 100644
--- a/vsm/src/tests/textutil/CMakeLists.txt
+++ b/streamingvisitors/src/tests/textutil/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vsm_textutil_test_app TEST
     SOURCES
     textutil.cpp
     DEPENDS
-    vsm
+    streamingvisitors
 )
 vespa_add_test(NAME vsm_textutil_test_app COMMAND vsm_textutil_test_app)
diff --git a/vsm/src/tests/textutil/textutil.cpp b/streamingvisitors/src/tests/textutil/textutil.cpp
index 2a1390eaa01..2a1390eaa01 100644
--- a/vsm/src/tests/textutil/textutil.cpp
+++ b/streamingvisitors/src/tests/textutil/textutil.cpp
diff --git a/vsm/src/tests/utilapps/.gitignore b/streamingvisitors/src/tests/utilapps/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/vsm/src/tests/utilapps/.gitignore
+++ b/streamingvisitors/src/tests/utilapps/.gitignore
diff --git a/streamingvisitors/src/vespa/searchvisitor/CMakeLists.txt b/streamingvisitors/src/vespa/searchvisitor/CMakeLists.txt
index e8f85fc987e..ff629462f9e 100644
--- a/streamingvisitors/src/vespa/searchvisitor/CMakeLists.txt
+++ b/streamingvisitors/src/vespa/searchvisitor/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(streamingvisitors_searchvisitor
+vespa_add_library(streamingvisitors
     SOURCES
     hitcollector.cpp
     indexenvironment.cpp
@@ -11,6 +11,10 @@ vespa_add_library(streamingvisitors_searchvisitor
     rankprocessor.cpp
     searchenvironment.cpp
     searchvisitor.cpp
+    $<TARGET_OBJECTS:vsm_vconfig>
+    $<TARGET_OBJECTS:vsm_vsmbase>
+    $<TARGET_OBJECTS:vsm_vsmcommon>
+    $<TARGET_OBJECTS:vsm_vsmsearcher>
     INSTALL lib64
     DEPENDS
     searchlib_searchlib_uca
diff --git a/vsm/src/vespa/vsm/.gitignore b/streamingvisitors/src/vespa/vsm/.gitignore
index 4c5f5d9ef7a..4c5f5d9ef7a 100644
--- a/vsm/src/vespa/vsm/.gitignore
+++ b/streamingvisitors/src/vespa/vsm/.gitignore
diff --git a/vsm/src/vespa/vsm/common/.gitignore b/streamingvisitors/src/vespa/vsm/common/.gitignore
index 95bc02923a9..95bc02923a9 100644
--- a/vsm/src/vespa/vsm/common/.gitignore
+++ b/streamingvisitors/src/vespa/vsm/common/.gitignore
diff --git a/vsm/src/vespa/vsm/common/CMakeLists.txt b/streamingvisitors/src/vespa/vsm/common/CMakeLists.txt
index 4570a9b581e..4570a9b581e 100644
--- a/vsm/src/vespa/vsm/common/CMakeLists.txt
+++ b/streamingvisitors/src/vespa/vsm/common/CMakeLists.txt
diff --git a/vsm/src/vespa/vsm/common/charbuffer.cpp b/streamingvisitors/src/vespa/vsm/common/charbuffer.cpp
index b8fbb5c8846..b8fbb5c8846 100644
--- a/vsm/src/vespa/vsm/common/charbuffer.cpp
+++ b/streamingvisitors/src/vespa/vsm/common/charbuffer.cpp
diff --git a/vsm/src/vespa/vsm/common/charbuffer.h b/streamingvisitors/src/vespa/vsm/common/charbuffer.h
index 08618a9b973..08618a9b973 100644
--- a/vsm/src/vespa/vsm/common/charbuffer.h
+++ b/streamingvisitors/src/vespa/vsm/common/charbuffer.h
diff --git a/vsm/src/vespa/vsm/common/docsum.h b/streamingvisitors/src/vespa/vsm/common/docsum.h
index 49b84cb0783..49b84cb0783 100644
--- a/vsm/src/vespa/vsm/common/docsum.h
+++ b/streamingvisitors/src/vespa/vsm/common/docsum.h
diff --git a/vsm/src/vespa/vsm/common/document.cpp b/streamingvisitors/src/vespa/vsm/common/document.cpp
index a345c82ce2d..a345c82ce2d 100644
--- a/vsm/src/vespa/vsm/common/document.cpp
+++ b/streamingvisitors/src/vespa/vsm/common/document.cpp
diff --git a/vsm/src/vespa/vsm/common/document.h b/streamingvisitors/src/vespa/vsm/common/document.h
index 8c11d27072b..8c11d27072b 100644
--- a/vsm/src/vespa/vsm/common/document.h
+++ b/streamingvisitors/src/vespa/vsm/common/document.h
diff --git a/vsm/src/vespa/vsm/common/documenttypemapping.cpp b/streamingvisitors/src/vespa/vsm/common/documenttypemapping.cpp
index 7886c44b2e0..7886c44b2e0 100644
--- a/vsm/src/vespa/vsm/common/documenttypemapping.cpp
+++ b/streamingvisitors/src/vespa/vsm/common/documenttypemapping.cpp
diff --git a/vsm/src/vespa/vsm/common/documenttypemapping.h b/streamingvisitors/src/vespa/vsm/common/documenttypemapping.h
index 607b40cec47..607b40cec47 100644
--- a/vsm/src/vespa/vsm/common/documenttypemapping.h
+++ b/streamingvisitors/src/vespa/vsm/common/documenttypemapping.h
diff --git a/vsm/src/vespa/vsm/common/fieldmodifier.cpp b/streamingvisitors/src/vespa/vsm/common/fieldmodifier.cpp
index b39afd83b5a..b39afd83b5a 100644
--- a/vsm/src/vespa/vsm/common/fieldmodifier.cpp
+++ b/streamingvisitors/src/vespa/vsm/common/fieldmodifier.cpp
diff --git a/vsm/src/vespa/vsm/common/fieldmodifier.h b/streamingvisitors/src/vespa/vsm/common/fieldmodifier.h
index 60e480fa237..60e480fa237 100644
--- a/vsm/src/vespa/vsm/common/fieldmodifier.h
+++ b/streamingvisitors/src/vespa/vsm/common/fieldmodifier.h
diff --git a/vsm/src/vespa/vsm/common/storagedocument.cpp b/streamingvisitors/src/vespa/vsm/common/storagedocument.cpp
index a0d666268f5..a0d666268f5 100644
--- a/vsm/src/vespa/vsm/common/storagedocument.cpp
+++ b/streamingvisitors/src/vespa/vsm/common/storagedocument.cpp
diff --git a/vsm/src/vespa/vsm/common/storagedocument.h b/streamingvisitors/src/vespa/vsm/common/storagedocument.h
index a7f21cb052f..a7f21cb052f 100644
--- a/vsm/src/vespa/vsm/common/storagedocument.h
+++ b/streamingvisitors/src/vespa/vsm/common/storagedocument.h
diff --git a/vsm/src/vespa/vsm/config/.gitignore b/streamingvisitors/src/vespa/vsm/config/.gitignore
index d58390943e2..d58390943e2 100644
--- a/vsm/src/vespa/vsm/config/.gitignore
+++ b/streamingvisitors/src/vespa/vsm/config/.gitignore
diff --git a/vsm/src/vespa/vsm/config/CMakeLists.txt b/streamingvisitors/src/vespa/vsm/config/CMakeLists.txt
index fea0bafe6b2..fea0bafe6b2 100644
--- a/vsm/src/vespa/vsm/config/CMakeLists.txt
+++ b/streamingvisitors/src/vespa/vsm/config/CMakeLists.txt
diff --git a/vsm/src/vespa/vsm/config/vsm-cfif.h b/streamingvisitors/src/vespa/vsm/config/vsm-cfif.h
index 22033aee232..22033aee232 100644
--- a/vsm/src/vespa/vsm/config/vsm-cfif.h
+++ b/streamingvisitors/src/vespa/vsm/config/vsm-cfif.h
diff --git a/vsm/src/vespa/vsm/config/vsm.def b/streamingvisitors/src/vespa/vsm/config/vsm.def
index 1971f9e9574..1971f9e9574 100644
--- a/vsm/src/vespa/vsm/config/vsm.def
+++ b/streamingvisitors/src/vespa/vsm/config/vsm.def
diff --git a/vsm/src/vespa/vsm/config/vsmfields.def b/streamingvisitors/src/vespa/vsm/config/vsmfields.def
index 5e943c9274d..5e943c9274d 100644
--- a/vsm/src/vespa/vsm/config/vsmfields.def
+++ b/streamingvisitors/src/vespa/vsm/config/vsmfields.def
diff --git a/vsm/src/vespa/vsm/config/vsmsummary.def b/streamingvisitors/src/vespa/vsm/config/vsmsummary.def
index 5eb96624826..5eb96624826 100644
--- a/vsm/src/vespa/vsm/config/vsmsummary.def
+++ b/streamingvisitors/src/vespa/vsm/config/vsmsummary.def
diff --git a/vsm/src/vespa/vsm/searcher/.gitignore b/streamingvisitors/src/vespa/vsm/searcher/.gitignore
index 95bc02923a9..95bc02923a9 100644
--- a/vsm/src/vespa/vsm/searcher/.gitignore
+++ b/streamingvisitors/src/vespa/vsm/searcher/.gitignore
diff --git a/vsm/src/vespa/vsm/searcher/CMakeLists.txt b/streamingvisitors/src/vespa/vsm/searcher/CMakeLists.txt
index 0a2a9ec21d2..0a2a9ec21d2 100644
--- a/vsm/src/vespa/vsm/searcher/CMakeLists.txt
+++ b/streamingvisitors/src/vespa/vsm/searcher/CMakeLists.txt
diff --git a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/boolfieldsearcher.cpp
index 8c9b556e593..8c9b556e593 100644
--- a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/boolfieldsearcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/boolfieldsearcher.h
index f6afef9e507..f6afef9e507 100644
--- a/vsm/src/vespa/vsm/searcher/boolfieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/boolfieldsearcher.h
diff --git a/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
index e69999b160e..e69999b160e 100644
--- a/vsm/src/vespa/vsm/searcher/fieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/fieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h
index 5c2ef8fec28..5c2ef8fec28 100644
--- a/vsm/src/vespa/vsm/searcher/fieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h
diff --git a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.cpp
index 02d8bd8c12a..02d8bd8c12a 100644
--- a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.h
index 98018fbf4a3..98018fbf4a3 100644
--- a/vsm/src/vespa/vsm/searcher/floatfieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.h
diff --git a/vsm/src/vespa/vsm/searcher/fold.cpp b/streamingvisitors/src/vespa/vsm/searcher/fold.cpp
index bd2392d3ad6..bd2392d3ad6 100644
--- a/vsm/src/vespa/vsm/searcher/fold.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/fold.cpp
diff --git a/vsm/src/vespa/vsm/searcher/fold.h b/streamingvisitors/src/vespa/vsm/searcher/fold.h
index 578b883484f..578b883484f 100644
--- a/vsm/src/vespa/vsm/searcher/fold.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/fold.h
diff --git a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp
index fc5d77de419..fc5d77de419 100644
--- a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/futf8strchrfieldsearcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h
index 900ab4c9120..900ab4c9120 100644
--- a/vsm/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/futf8strchrfieldsearcher.h
diff --git a/vsm/src/vespa/vsm/searcher/geo_pos_field_searcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/geo_pos_field_searcher.cpp
index db93bda7778..db93bda7778 100644
--- a/vsm/src/vespa/vsm/searcher/geo_pos_field_searcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/geo_pos_field_searcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/geo_pos_field_searcher.h b/streamingvisitors/src/vespa/vsm/searcher/geo_pos_field_searcher.h
index ef1c5b5a1c4..ef1c5b5a1c4 100644
--- a/vsm/src/vespa/vsm/searcher/geo_pos_field_searcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/geo_pos_field_searcher.h
diff --git a/vsm/src/vespa/vsm/searcher/intfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.cpp
index 8cfb8e6df14..8cfb8e6df14 100644
--- a/vsm/src/vespa/vsm/searcher/intfieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/intfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.h
index a2b17a87f4b..a2b17a87f4b 100644
--- a/vsm/src/vespa/vsm/searcher/intfieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.h
diff --git a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/strchrfieldsearcher.cpp
index 1c4ff78ff4a..1c4ff78ff4a 100644
--- a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/strchrfieldsearcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/strchrfieldsearcher.h
index 0155c79cddf..0155c79cddf 100644
--- a/vsm/src/vespa/vsm/searcher/strchrfieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/strchrfieldsearcher.h
diff --git a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp
index 977602a691c..977602a691c 100644
--- a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h
index 744974a6cf6..744974a6cf6 100644
--- a/vsm/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8exactstringfieldsearcher.h
diff --git a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp
index 9aef99f9fa1..9aef99f9fa1 100644
--- a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h
index 63931af0036..63931af0036 100644
--- a/vsm/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8flexiblestringfieldsearcher.h
diff --git a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp
index 0d93009655c..0d93009655c 100644
--- a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8strchrfieldsearcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h
index 1687a1a18c0..1687a1a18c0 100644
--- a/vsm/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8strchrfieldsearcher.h
diff --git a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp b/streamingvisitors/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp
index 148cdf2c0c3..148cdf2c0c3 100644
--- a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.cpp
diff --git a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h b/streamingvisitors/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h
index f540a7ac457..f540a7ac457 100644
--- a/vsm/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8stringfieldsearcherbase.h
diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsearcher.cpp
index fd327d3a3df..fd327d3a3df 100644
--- a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsearcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsearcher.h
index 1c463c28847..1c463c28847 100644
--- a/vsm/src/vespa/vsm/searcher/utf8substringsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsearcher.h
diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp
index be02a58cfda..be02a58cfda 100644
--- a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.cpp
diff --git a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h
index 0127a7f2827..0127a7f2827 100644
--- a/vsm/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h
diff --git a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp b/streamingvisitors/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp
index 3495d46b85b..3495d46b85b 100644
--- a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.cpp
diff --git a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h
index 0640ac22da5..0640ac22da5 100644
--- a/vsm/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h
+++ b/streamingvisitors/src/vespa/vsm/searcher/utf8suffixstringfieldsearcher.h
diff --git a/vsm/src/vespa/vsm/vsm/.gitignore b/streamingvisitors/src/vespa/vsm/vsm/.gitignore
index 95bc02923a9..95bc02923a9 100644
--- a/vsm/src/vespa/vsm/vsm/.gitignore
+++ b/streamingvisitors/src/vespa/vsm/vsm/.gitignore
diff --git a/vsm/src/vespa/vsm/vsm/CMakeLists.txt b/streamingvisitors/src/vespa/vsm/vsm/CMakeLists.txt
index adc00b341a3..adc00b341a3 100644
--- a/vsm/src/vespa/vsm/vsm/CMakeLists.txt
+++ b/streamingvisitors/src/vespa/vsm/vsm/CMakeLists.txt
diff --git a/vsm/src/vespa/vsm/vsm/docsumconfig.cpp b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.cpp
index 656e9eed132..656e9eed132 100644
--- a/vsm/src/vespa/vsm/vsm/docsumconfig.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.cpp
diff --git a/vsm/src/vespa/vsm/vsm/docsumconfig.h b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.h
index 11010c04e90..11010c04e90 100644
--- a/vsm/src/vespa/vsm/vsm/docsumconfig.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsumconfig.h
diff --git a/vsm/src/vespa/vsm/vsm/docsumfieldspec.cpp b/streamingvisitors/src/vespa/vsm/vsm/docsumfieldspec.cpp
index 936aaaa2091..936aaaa2091 100644
--- a/vsm/src/vespa/vsm/vsm/docsumfieldspec.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsumfieldspec.cpp
diff --git a/vsm/src/vespa/vsm/vsm/docsumfieldspec.h b/streamingvisitors/src/vespa/vsm/vsm/docsumfieldspec.h
index db6ee9fa223..db6ee9fa223 100644
--- a/vsm/src/vespa/vsm/vsm/docsumfieldspec.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsumfieldspec.h
diff --git a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp
index 70759feb41c..70759feb41c 100644
--- a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.cpp
diff --git a/vsm/src/vespa/vsm/vsm/docsumfilter.h b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.h
index e6f7ae3e6fe..e6f7ae3e6fe 100644
--- a/vsm/src/vespa/vsm/vsm/docsumfilter.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/docsumfilter.h
diff --git a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp
index 7043e63ec87..7043e63ec87 100644
--- a/vsm/src/vespa/vsm/vsm/fieldsearchspec.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.cpp
diff --git a/vsm/src/vespa/vsm/vsm/fieldsearchspec.h b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.h
index 7b78a8634e0..7b78a8634e0 100644
--- a/vsm/src/vespa/vsm/vsm/fieldsearchspec.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.h
diff --git a/vsm/src/vespa/vsm/vsm/flattendocsumwriter.cpp b/streamingvisitors/src/vespa/vsm/vsm/flattendocsumwriter.cpp
index 06b652d85e6..06b652d85e6 100644
--- a/vsm/src/vespa/vsm/vsm/flattendocsumwriter.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/flattendocsumwriter.cpp
diff --git a/vsm/src/vespa/vsm/vsm/flattendocsumwriter.h b/streamingvisitors/src/vespa/vsm/vsm/flattendocsumwriter.h
index 47c6f1e75d0..47c6f1e75d0 100644
--- a/vsm/src/vespa/vsm/vsm/flattendocsumwriter.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/flattendocsumwriter.h
diff --git a/vsm/src/vespa/vsm/vsm/i_matching_elements_filler.h b/streamingvisitors/src/vespa/vsm/vsm/i_matching_elements_filler.h
index a35cea40cec..a35cea40cec 100644
--- a/vsm/src/vespa/vsm/vsm/i_matching_elements_filler.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/i_matching_elements_filler.h
diff --git a/vsm/src/vespa/vsm/vsm/slimefieldwriter.cpp b/streamingvisitors/src/vespa/vsm/vsm/slimefieldwriter.cpp
index 5bc5798fb9d..5bc5798fb9d 100644
--- a/vsm/src/vespa/vsm/vsm/slimefieldwriter.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/slimefieldwriter.cpp
diff --git a/vsm/src/vespa/vsm/vsm/slimefieldwriter.h b/streamingvisitors/src/vespa/vsm/vsm/slimefieldwriter.h
index b5adac8985f..b5adac8985f 100644
--- a/vsm/src/vespa/vsm/vsm/slimefieldwriter.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/slimefieldwriter.h
diff --git a/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp
index 127302311f9..127302311f9 100644
--- a/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp
diff --git a/vsm/src/vespa/vsm/vsm/snippetmodifier.h b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.h
index 4718ab8783a..4718ab8783a 100644
--- a/vsm/src/vespa/vsm/vsm/snippetmodifier.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.h
diff --git a/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
index 5507532d4f3..5507532d4f3 100644
--- a/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.cpp
diff --git a/vsm/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
index 6484269353b..6484269353b 100644
--- a/vsm/src/vespa/vsm/vsm/vsm-adapter.h
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h
diff --git a/vsm/src/vespa/vsm/vsm/vsm-adapter.hpp b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.hpp
index f071dbb2015..f071dbb2015 100644
--- a/vsm/src/vespa/vsm/vsm/vsm-adapter.hpp
+++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.hpp
diff --git a/vsm/.gitignore b/vsm/.gitignore
deleted file mode 100644
index 3969348a427..00000000000
--- a/vsm/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-lib
-/target
-/pom.xml.build
-Makefile
diff --git a/vsm/CMakeLists.txt b/vsm/CMakeLists.txt
deleted file mode 100644
index e1607ff27aa..00000000000
--- a/vsm/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_define_module(
-    DEPENDS
-    fastos
-    vespalog
-    fastlib_fast
-    config_cloudconfig
-    vespalib
-    document
-    searchlib
-    searchsummary
-
-    TESTS
-    src/tests/charbuffer
-    src/tests/docsum
-    src/tests/document
-    src/tests/searcher
-    src/tests/textutil
-
-    LIBS
-    src/vespa/vsm
-    src/vespa/vsm/common
-    src/vespa/vsm/config
-    src/vespa/vsm/searcher
-    src/vespa/vsm/vsm
-)
diff --git a/vsm/OWNERS b/vsm/OWNERS
deleted file mode 100644
index 465c0e30113..00000000000
--- a/vsm/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-baldersheim
-geirst
diff --git a/vsm/README b/vsm/README
deleted file mode 100644
index a7686213183..00000000000
--- a/vsm/README
+++ /dev/null
@@ -1 +0,0 @@
-Vespa Streaming Matcher applications
diff --git a/vsm/src/.gitignore b/vsm/src/.gitignore
deleted file mode 100644
index d185ea18fd0..00000000000
--- a/vsm/src/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.dsp
-Makefile.ini
-config_command.sh
-project.dsw
diff --git a/vsm/src/vespa/vsm/CMakeLists.txt b/vsm/src/vespa/vsm/CMakeLists.txt
deleted file mode 100644
index 8ceabbe494f..00000000000
--- a/vsm/src/vespa/vsm/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(vsm
-    SOURCES
-    $<TARGET_OBJECTS:vsm_vconfig>
-    $<TARGET_OBJECTS:vsm_vsmbase>
-    $<TARGET_OBJECTS:vsm_vsmcommon>
-    $<TARGET_OBJECTS:vsm_vsmsearcher>
-    INSTALL lib64
-    DEPENDS
-)
diff --git a/vsm/testrun/.gitignore b/vsm/testrun/.gitignore
deleted file mode 100644
index 3b525d55e24..00000000000
--- a/vsm/testrun/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-test-report.html
-test-report.html.*
-test.*.*.file.*
-test.*.*.files.html
-tmp.*
-/test.*.*.result
-Makefile