- Move persitence/spi/types.h under to persitence/spi/types.h

- Cut dependency to persistencetypes for searchlib.

2 files changed, 7 insertions, 7 deletions

diff --git a/searchlib/src/vespa/searchlib/aggregation/grouping.cpp b/searchlib/src/vespa/searchlib/aggregation/grouping.cpp
index f373b5fc0b3..c07e399b38e 100644
--- a/searchlib/src/vespa/searchlib/aggregation/grouping.cpp
+++ b/searchlib/src/vespa/searchlib/aggregation/grouping.cpp
@@ -121,8 +121,7 @@ Grouping::Grouping()
 
 Grouping::Grouping(const Grouping &) = default;
 Grouping & Grouping::operator = (const Grouping &) = default;
-
-Grouping::~Grouping() { }
+Grouping::~Grouping() = default;
 
 void
 Grouping::selectMembers(const vespalib::ObjectPredicate &predicate,
diff --git a/searchlib/src/vespa/searchlib/common/idocumentmetastore.h b/searchlib/src/vespa/searchlib/common/idocumentmetastore.h
index d663d1659e1..5c5791f585a 100644
--- a/searchlib/src/vespa/searchlib/common/idocumentmetastore.h
+++ b/searchlib/src/vespa/searchlib/common/idocumentmetastore.h
@@ -5,7 +5,8 @@
 #include "lid_usage_stats.h"
 #include <vespa/document/base/globalid.h>
 #include <vespa/document/bucket/bucketid.h>
-#include <persistence/spi/types.h>
+#include <vector>
+#include <memory>
 
 namespace search {
 
@@ -15,7 +16,7 @@ namespace search {
 struct DocumentMetaData {
     typedef uint32_t DocId;
     DocId lid;
-    storage::spi::Timestamp timestamp;
+    uint64_t timestamp;
     document::BucketId bucketId;
     document::GlobalId gid;
     bool removed;
@@ -31,14 +32,14 @@ struct DocumentMetaData {
     { }
 
     DocumentMetaData(DocId lid_,
-                     storage::spi::Timestamp timestamp_,
+                     uint64_t timestamp_,
                      document::BucketId bucketId_,
                      const document::GlobalId &gid_) noexcept
         : DocumentMetaData(lid_, timestamp_, bucketId_, gid_, false)
     { }
 
     DocumentMetaData(DocId lid_,
-                     storage::spi::Timestamp timestamp_,
+                     uint64_t timestamp_,
                      document::BucketId bucketId_,
                      const document::GlobalId &gid_,
                      bool removed_) noexcept
@@ -72,7 +73,7 @@ struct IDocumentMetaStore {
     typedef uint32_t                DocId;
     typedef document::GlobalId      GlobalId;
     typedef document::BucketId      BucketId;
-    typedef storage::spi::Timestamp Timestamp;
+    typedef uint64_t Timestamp;
 
     virtual ~IDocumentMetaStore() {}