Collapse persistencetypes into persistence

14 files changed, 1 insertions, 36 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a71b903d0d0..dfcb149093a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,6 @@ add_subdirectory(node-admin)
 add_subdirectory(node-repository)
 add_subdirectory(orchestrator)
 add_subdirectory(persistence)
-add_subdirectory(persistencetypes)
 add_subdirectory(predicate-search)
 add_subdirectory(searchcommon)
 add_subdirectory(searchcore)
diff --git a/persistence/CMakeLists.txt b/persistence/CMakeLists.txt
index cf94ba3bb52..d87f172bfb5 100644
--- a/persistence/CMakeLists.txt
+++ b/persistence/CMakeLists.txt
@@ -5,7 +5,6 @@ vespa_define_module(
     vespalog
     vespalib
     document
-    persistencetypes
     vdslib
 
     LIBS
diff --git a/persistence/src/vespa/persistence/spi/CMakeLists.txt b/persistence/src/vespa/persistence/spi/CMakeLists.txt
index eda3ffb228f..e4bae1c7551 100644
--- a/persistence/src/vespa/persistence/spi/CMakeLists.txt
+++ b/persistence/src/vespa/persistence/spi/CMakeLists.txt
@@ -17,5 +17,6 @@ vespa_add_library(persistence_spi OBJECT
     result.cpp
     selection.cpp
     test.cpp
+    types.cpp
     DEPENDS
 )
diff --git a/persistencetypes/src/vespa/persistence/spi/types.cpp b/persistence/src/vespa/persistence/spi/types.cpp
index 260355213d9..260355213d9 100644
--- a/persistencetypes/src/vespa/persistence/spi/types.cpp
+++ b/persistence/src/vespa/persistence/spi/types.cpp
diff --git a/persistencetypes/src/vespa/persistence/spi/types.h b/persistence/src/vespa/persistence/spi/types.h
index a75b977c14a..a75b977c14a 100644
--- a/persistencetypes/src/vespa/persistence/spi/types.h
+++ b/persistence/src/vespa/persistence/spi/types.h
diff --git a/persistencetypes/.gitignore b/persistencetypes/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/persistencetypes/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/persistencetypes/CMakeLists.txt b/persistencetypes/CMakeLists.txt
deleted file mode 100644
index 2403c1d9406..00000000000
--- a/persistencetypes/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_define_module(
-    DEPENDS
-    vespalib
-    document
-
-    LIBS
-    src/vespa/persistence
-    src/vespa/persistence/spi
-)
diff --git a/persistencetypes/OWNERS b/persistencetypes/OWNERS
deleted file mode 100644
index dbcff24b338..00000000000
--- a/persistencetypes/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-vekterli
diff --git a/persistencetypes/src/.gitignore b/persistencetypes/src/.gitignore
deleted file mode 100644
index 2e8e6fd906a..00000000000
--- a/persistencetypes/src/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Makefile.ini
-/config_command.sh
-/project.dsw
diff --git a/persistencetypes/src/vespa/persistence/.gitignore b/persistencetypes/src/vespa/persistence/.gitignore
deleted file mode 100644
index 444f5c50077..00000000000
--- a/persistencetypes/src/vespa/persistence/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.depend
-/Makefile
-/libpersistencetypes.so.5.1
diff --git a/persistencetypes/src/vespa/persistence/CMakeLists.txt b/persistencetypes/src/vespa/persistence/CMakeLists.txt
deleted file mode 100644
index 2ea62581c4e..00000000000
--- a/persistencetypes/src/vespa/persistence/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(persistencetypes
-    SOURCES
-    $<TARGET_OBJECTS:persistencetypes_spi>
-    INSTALL lib64
-    DEPENDS
-)
diff --git a/persistencetypes/src/vespa/persistence/spi/.gitignore b/persistencetypes/src/vespa/persistence/spi/.gitignore
deleted file mode 100644
index 7e7c0fe7fae..00000000000
--- a/persistencetypes/src/vespa/persistence/spi/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.depend
-/Makefile
diff --git a/persistencetypes/src/vespa/persistence/spi/CMakeLists.txt b/persistencetypes/src/vespa/persistence/spi/CMakeLists.txt
deleted file mode 100644
index 5a5f335ef40..00000000000
--- a/persistencetypes/src/vespa/persistence/spi/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(persistencetypes_spi OBJECT
-    SOURCES
-    types.cpp
-    DEPENDS
-)
diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index 300900dbb77..54892bbea3d 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -12,7 +12,6 @@ vespa_define_module(
     fastlib_fast
     document
     config_cloudconfig
-    persistencetypes
     searchcommon
 
     EXTERNAL_DEPENDS