diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-14 21:13:18 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-14 21:35:58 +0000 |
commit | 04465fd7fffc974cfdb767f966e92483cac381fb (patch) | |
tree | 3f902f2cc53f17d32b70ff1cff16860fd24d7a45 /searchcore/src/tests/proton | |
parent | cdb9ece95aeae9861ec5aad31c168575919ec346 (diff) |
Move idestructorcallback.h to vespalib module and search::IDestructorCallback to vespalib::IdestructorCallback.
Diffstat (limited to 'searchcore/src/tests/proton')
16 files changed, 25 insertions, 21 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp index 8076e3d05e9..b67eaec1a8d 100644 --- a/searchcore/src/tests/proton/attribute/attribute_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp @@ -31,7 +31,7 @@ #include <vespa/searchlib/attribute/integerbase.h> #include <vespa/searchlib/attribute/predicate_attribute.h> #include <vespa/searchlib/attribute/singlenumericattribute.hpp> -#include <vespa/searchlib/common/idestructorcallback.h> +#include <vespa/vespalib/util/idestructorcallback.h> #include <vespa/searchlib/index/docbuilder.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/predicate/predicate_hash.h> @@ -87,6 +87,7 @@ using vespalib::eval::SimpleValue; using vespalib::eval::TensorSpec; using vespalib::eval::Value; using vespalib::eval::ValueType; +using vespalib::IDestructorCallback; using AVBasicType = search::attribute::BasicType; using AVCollectionType = search::attribute::CollectionType; diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index 5741a844ded..513b95eb975 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -51,6 +51,7 @@ using namespace search::transactionlog; using namespace search; using namespace std::chrono_literals; +using vespalib::IDestructorCallback; using document::DocumenttypesConfig; using document::test::makeBucketSpace; using search::TuneFileDocumentDB; diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp index 05ea54606f8..9389a60997d 100644 --- a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp @@ -4,7 +4,7 @@ #include <vespa/searchcore/proton/feedoperation/operations.h> #include <vespa/searchcore/proton/server/combiningfeedview.h> #include <vespa/searchcore/proton/test/test.h> -#include <vespa/searchlib/common/idestructorcallback.h> +#include <vespa/vespalib/util/idestructorcallback.h> #include <vespa/document/update/documentupdate.h> #include <vespa/vespalib/testkit/testapp.h> @@ -14,7 +14,7 @@ LOG_SETUP("combiningfeedview_test"); using document::DocumentTypeRepo; using document::DocumentUpdate; using document::test::makeBucketSpace; -using search::IDestructorCallback; +using vespalib::IDestructorCallback; using search::SerialNum; using storage::spi::Timestamp; using namespace proton; diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp index 06f0ba4109e..1f5382eb68b 100644 --- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp @@ -23,7 +23,7 @@ #include <vespa/searchcore/proton/matching/querylimiter.h> #include <vespa/searchcore/proton/test/test.h> #include <vespa/searchcore/proton/test/thread_utils.h> -#include <vespa/searchlib/common/idestructorcallback.h> +#include <vespa/vespalib/util/idestructorcallback.h> #include <vespa/searchlib/index/docbuilder.h> #include <vespa/searchlib/test/directory_handler.h> #include <vespa/vespalib/test/insertion_operators.h> @@ -46,7 +46,7 @@ using document::test::makeBucketSpace; using proton::bucketdb::BucketDBHandler; using proton::bucketdb::IBucketDBHandler; using proton::bucketdb::IBucketDBHandlerInitializer; -using search::IDestructorCallback; +using vespalib::IDestructorCallback; using search::test::DirectoryHandler; using searchcorespi::IFlushTarget; using searchcorespi::index::IThreadingService; diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp index 35954fbc1b1..0cc9a92895b 100644 --- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp @@ -31,7 +31,7 @@ using document::test::makeBucketSpace; using proton::bucketdb::BucketCreateNotifier; using search::DocumentIdT; using search::DocumentMetaData; -using search::IDestructorCallback; +using vespalib::IDestructorCallback; using search::index::DocBuilder; using search::index::Schema; using storage::spi::BucketInfo; diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp index 7d75d1a6327..be730a24b87 100644 --- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp @@ -47,7 +47,7 @@ using document::DocumentUpdate; using document::GlobalId; using document::TensorDataType; using document::TensorFieldValue; -using search::IDestructorCallback; +using vespalib::IDestructorCallback; using search::SerialNum; using search::index::schema::CollectionType; using search::index::schema::DataType; diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp index 2b2b8acbc50..bf2265ed9a0 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp @@ -36,7 +36,7 @@ using proton::test::MockGidToLidChangeHandler; using search::AttributeVector; using search::CacheStats; using search::DocumentMetaData; -using search::IDestructorCallback; +using vespalib::IDestructorCallback; using search::SearchableStats; using search::index::schema::CollectionType; using search::index::schema::DataType; diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp index a9058a83af8..4f36608aace 100644 --- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp +++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp @@ -8,7 +8,7 @@ #include <vespa/searchcore/proton/test/clusterstatehandler.h> #include <vespa/searchcore/proton/test/disk_mem_usage_notifier.h> #include <vespa/searchcore/proton/test/test.h> -#include <vespa/searchlib/common/idestructorcallback.h> +#include <vespa/vespalib/util/idestructorcallback.h> #include <vespa/searchlib/index/docbuilder.h> #include <vespa/vespalib/gtest/gtest.h> @@ -20,7 +20,7 @@ using namespace proton; using namespace search::index; using namespace search; using namespace vespalib; -using search::IDestructorCallback; +using vespalib::IDestructorCallback; using storage::spi::Timestamp; using BlockedReason = IBlockableMaintenanceJob::BlockedReason; using TimePoint = LidUsageStats::TimePoint; diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp index 6bcdea95a5a..2ef479bdcf3 100644 --- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp +++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp @@ -55,7 +55,7 @@ using proton::matching::ISessionCachePruner; using search::AttributeGuard; using search::DocumentIdT; using search::DocumentMetaData; -using search::IDestructorCallback; +using vespalib::IDestructorCallback; using search::SerialNum; using storage::spi::BucketInfo; using storage::spi::Timestamp; diff --git a/searchcore/src/tests/proton/documentdb/move_operation_limiter/move_operation_limiter_test.cpp b/searchcore/src/tests/proton/documentdb/move_operation_limiter/move_operation_limiter_test.cpp index 77150370406..92ec0d6185b 100644 --- a/searchcore/src/tests/proton/documentdb/move_operation_limiter/move_operation_limiter_test.cpp +++ b/searchcore/src/tests/proton/documentdb/move_operation_limiter/move_operation_limiter_test.cpp @@ -29,7 +29,7 @@ struct MyBlockableMaintenanceJob : public IBlockableMaintenanceJob { }; struct Fixture { - using OpsQueue = std::queue<std::shared_ptr<search::IDestructorCallback>>; + using OpsQueue = std::queue<std::shared_ptr<vespalib::IDestructorCallback>>; using MoveOperationLimiterSP = std::shared_ptr<MoveOperationLimiter>; MyBlockableMaintenanceJob job; diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp index f6d2842accf..3b98206e9cf 100644 --- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp @@ -27,7 +27,7 @@ using document::DocumentUpdate; using document::GlobalId; using namespace proton; using search::DocumentIdT; -using search::IDestructorCallback; +using vespalib::IDestructorCallback; using search::SerialNum; using search::index::DocBuilder; using search::index::Schema; diff --git a/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp b/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp index cd48256792f..59b1fc80ab0 100644 --- a/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp +++ b/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp @@ -163,7 +163,7 @@ void Test::requireThatMemoryIndexCanBeDumpedAndSearched() { doc = buildDocument(doc_builder, doc_id2, word2); memory_index.insertDocument(doc_id2, *doc.get()); - memory_index.commit(std::shared_ptr<search::IDestructorCallback>()); + memory_index.commit(std::shared_ptr<vespalib::IDestructorCallback>()); indexFieldWriter->sync(); testSearch(memory_index, word1, doc_id1); diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp index 80e6e8b3db8..5243b50eac2 100644 --- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp +++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp @@ -156,7 +156,7 @@ void addDocument(DocBuilder & doc_builder, MemoryIndex &index, ISourceSelector & uint8_t index_id, uint32_t docid, const string &word) { Document::UP doc = buildDocument(doc_builder, docid, word); index.insertDocument(docid, *doc); - index.commit(std::shared_ptr<search::IDestructorCallback>()); + index.commit(std::shared_ptr<vespalib::IDestructorCallback>()); selector.setSource(docid, index_id); } diff --git a/searchcore/src/tests/proton/index/index_writer/index_writer_test.cpp b/searchcore/src/tests/proton/index/index_writer/index_writer_test.cpp index 73919a7c628..a2d08f0121e 100644 --- a/searchcore/src/tests/proton/index/index_writer/index_writer_test.cpp +++ b/searchcore/src/tests/proton/index/index_writer/index_writer_test.cpp @@ -1,16 +1,18 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("index_writer_test"); + #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchcore/proton/index/index_writer.h> #include <vespa/searchcore/proton/test/mock_index_manager.h> #include <vespa/searchlib/index/docbuilder.h> +#include <vespa/log/log.h> +LOG_SETUP("index_writer_test"); using namespace proton; using namespace search; using namespace search::index; using namespace searchcorespi; +using vespalib::IDestructorCallback; using document::Document; diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp index 5ce4a1e949d..50d23529413 100644 --- a/searchcore/src/tests/proton/index/indexmanager_test.cpp +++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp @@ -94,7 +94,7 @@ Document::UP buildDocument(DocBuilder &doc_builder, int id, return doc_builder.endDocument(); } -std::shared_ptr<search::IDestructorCallback> emptyDestructorCallback; +std::shared_ptr<vespalib::IDestructorCallback> emptyDestructorCallback; struct IndexManagerTest : public ::testing::Test { SerialNum _serial_num; @@ -398,7 +398,7 @@ TEST_F(IndexManagerTest, require_that_flush_stats_are_calculated) Document::UP doc = addDocument(docid); inverter.invertDocument(docid, *doc); invertThreads->sync(); - inverter.pushDocuments(std::shared_ptr<search::IDestructorCallback>()); + inverter.pushDocuments(std::shared_ptr<vespalib::IDestructorCallback>()); pushThreads->sync(); index_size = fic.getMemoryUsage().allocatedBytes() - fixed_index_size; @@ -417,7 +417,7 @@ TEST_F(IndexManagerTest, require_that_flush_stats_are_calculated) doc = addDocument(docid + 100); inverter.invertDocument(docid + 100, *doc); invertThreads->sync(); - inverter.pushDocuments(std::shared_ptr<search::IDestructorCallback>()); + inverter.pushDocuments(std::shared_ptr<vespalib::IDestructorCallback>()); pushThreads->sync(); index_size = fic.getMemoryUsage().allocatedBytes() - fixed_index_size; /// Must account for both docid 0 being reserved and the extra after. diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp index 9d72045c918..9ba6de043be 100644 --- a/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp +++ b/searchcore/src/tests/proton/reference/gid_to_lid_change_handler/gid_to_lid_change_handler_test.cpp @@ -150,7 +150,7 @@ struct Fixture } void notifyPut(GlobalId gid, uint32_t lid, SerialNum serial_num) { - _handler->notifyPut(std::shared_ptr<search::IDestructorCallback>(), gid, lid, serial_num); + _handler->notifyPut(std::shared_ptr<vespalib::IDestructorCallback>(), gid, lid, serial_num); } void notifyRemove(GlobalId gid, SerialNum serialNum) { |