diff options
Diffstat (limited to 'searchcore/src/tests/proton/documentdb')
8 files changed, 46 insertions, 46 deletions
diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp index a57787d417e..7af4378ff83 100644 --- a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp @@ -21,11 +21,11 @@ using search::SerialNum; using storage::spi::Timestamp; using namespace proton; -typedef std::vector<IFeedView::SP> FeedViewVector; +using FeedViewVector = std::vector<IFeedView::SP>; struct MyFeedView : public test::DummyFeedView { - typedef std::shared_ptr<MyFeedView> SP; + using SP = std::shared_ptr<MyFeedView>; DocumentMetaStore _metaStore; uint32_t _preparePut; uint32_t _handlePut; diff --git a/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp b/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp index 4825dc6e8a7..2e82b5b9c79 100644 --- a/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp @@ -13,10 +13,10 @@ using namespace search; using vespalib::make_string; -typedef DocumentMetaStore::Result DMSResult; -typedef DocumentMetaStore::Timestamp Timestamp; -typedef std::set<uint32_t> LidSet; -typedef std::vector<uint32_t> LidVector; +using DMSResult = DocumentMetaStore::Result; +using Timestamp = DocumentMetaStore::Timestamp; +using LidSet = std::set<uint32_t>; +using LidVector = std::vector<uint32_t>; struct Fixture { 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 13cc4030262..ca03a49ea8d 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 @@ -75,12 +75,12 @@ using vespa::config::content::core::BucketspacesConfig; using vespalib::datastore::CompactionStrategy; using proton::index::IndexConfig; -typedef StoreOnlyDocSubDB::Config StoreOnlyConfig; -typedef StoreOnlyDocSubDB::Context StoreOnlyContext; -typedef FastAccessDocSubDB::Config FastAccessConfig; -typedef FastAccessDocSubDB::Context FastAccessContext; -typedef SearchableDocSubDB::Context SearchableContext; -typedef std::vector<AttributeGuard> AttributeGuardList; +using StoreOnlyConfig = StoreOnlyDocSubDB::Config; +using StoreOnlyContext = StoreOnlyDocSubDB::Context; +using FastAccessConfig = FastAccessDocSubDB::Config; +using FastAccessContext = FastAccessDocSubDB::Context; +using SearchableContext = SearchableDocSubDB::Context; +using AttributeGuardList = std::vector<AttributeGuard>; const std::string DOCTYPE_NAME = "searchdocument"; const std::string SUB_NAME = "subdb"; @@ -282,7 +282,7 @@ make_all_attr_schema(bool has_attr2) struct MyConfigSnapshot { - typedef std::unique_ptr<MyConfigSnapshot> UP; + using UP = std::unique_ptr<MyConfigSnapshot>; Schema _schema; DocBuilder _builder; DocumentDBConfig::SP _cfg; @@ -410,11 +410,11 @@ template <bool has_attr2_in, typename ConfigDirT, uint32_t ConfigSerial = CFG_SE struct BaseTraitsT { static constexpr bool has_attr2 = has_attr2_in; - typedef ConfigDirT ConfigDir; + using ConfigDir = ConfigDirT; static uint32_t configSerial() { return ConfigSerial; } }; -typedef BaseTraitsT<one_attr_schema, ConfigDir1> BaseTraits; +using BaseTraits = BaseTraitsT<one_attr_schema, ConfigDir1>; struct StoreOnlyTraits : public BaseTraits { @@ -424,7 +424,7 @@ struct StoreOnlyTraits : public BaseTraits using FeedView = StoreOnlyFeedView; }; -typedef FixtureBase<StoreOnlyTraits> StoreOnlyFixture; +using StoreOnlyFixture = FixtureBase<StoreOnlyTraits>; struct FastAccessTraits : public BaseTraits { @@ -434,7 +434,7 @@ struct FastAccessTraits : public BaseTraits using FeedView = FastAccessFeedView; }; -typedef FixtureBase<FastAccessTraits> FastAccessFixture; +using FastAccessFixture = FixtureBase<FastAccessTraits>; template <typename ConfigDirT> struct FastAccessOnlyTraitsBase : public BaseTraitsT<two_attr_schema, ConfigDirT> @@ -446,8 +446,8 @@ struct FastAccessOnlyTraitsBase : public BaseTraitsT<two_attr_schema, ConfigDirT }; // Setup with 1 fast-access attribute -typedef FastAccessOnlyTraitsBase<ConfigDir3> FastAccessOnlyTraits; -typedef FixtureBase<FastAccessOnlyTraits> FastAccessOnlyFixture; +using FastAccessOnlyTraits = FastAccessOnlyTraitsBase<ConfigDir3>; +using FastAccessOnlyFixture = FixtureBase<FastAccessOnlyTraits>; template <bool has_attr2_in, typename ConfigDirT> struct SearchableTraitsBase : public BaseTraitsT<has_attr2_in, ConfigDirT> @@ -458,8 +458,8 @@ struct SearchableTraitsBase : public BaseTraitsT<has_attr2_in, ConfigDirT> using FeedView = proton::SearchableFeedView; }; -typedef SearchableTraitsBase<one_attr_schema, ConfigDir1> SearchableTraits; -typedef FixtureBase<SearchableTraits> SearchableFixture; +using SearchableTraits = SearchableTraitsBase<one_attr_schema, ConfigDir1>; +using SearchableFixture = FixtureBase<SearchableTraits>; void assertAttributes1(const AttributeGuardList &attributes) @@ -711,8 +711,8 @@ getFlushTargets(Fixture &f) return targets; } -typedef IFlushTarget::Type FType; -typedef IFlushTarget::Component FComponent; +using FType = IFlushTarget::Type; +using FComponent = IFlushTarget::Component; bool assertTarget(const vespalib::string &name, @@ -927,8 +927,8 @@ TEST_F("require that fast-access attributes are populated during reprocessing", } // Setup with 2 fields (1 attribute according to config in dir) -typedef SearchableTraitsBase<two_attr_schema, ConfigDir1> SearchableTraitsTwoField; -typedef FixtureBase<SearchableTraitsTwoField> SearchableFixtureTwoField; +using SearchableTraitsTwoField = SearchableTraitsBase<two_attr_schema, ConfigDir1>; +using SearchableFixtureTwoField = FixtureBase<SearchableTraitsTwoField>; TEST_F("require that regular attributes are populated during reprocessing", SearchableFixtureTwoField) @@ -1009,10 +1009,10 @@ struct ExplorerFixture : public FixtureType } }; -typedef ExplorerFixture<StoreOnlyFixture> StoreOnlyExplorerFixture; -typedef ExplorerFixture<FastAccessFixture> FastAccessExplorerFixture; -typedef ExplorerFixture<SearchableFixture> SearchableExplorerFixture; -typedef std::vector<vespalib::string> StringVector; +using StoreOnlyExplorerFixture = ExplorerFixture<StoreOnlyFixture>; +using FastAccessExplorerFixture = ExplorerFixture<FastAccessFixture>; +using SearchableExplorerFixture = ExplorerFixture<SearchableFixture>; +using StringVector = std::vector<vespalib::string>; void assertExplorer(const StringVector &extraNames, const vespalib::StateExplorer &explorer) diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp index 3a0ae8576ca..08d4c7d7773 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp @@ -15,7 +15,7 @@ using namespace vespa::config::search; using std::shared_ptr; using std::make_shared; -typedef shared_ptr<DocumentDBConfig> DDBCSP; +using DDBCSP = shared_ptr<DocumentDBConfig>; namespace { diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp index d31ae33dd15..2c396f8c946 100644 --- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp @@ -75,7 +75,7 @@ using vespalib::eval::ValueType; using namespace proton; using namespace search::index; -typedef std::unique_ptr<vespalib::CountDownLatch> CountDownLatchUP; +using CountDownLatchUP = std::unique_ptr<vespalib::CountDownLatch>; namespace { @@ -83,7 +83,7 @@ struct Rendezvous { vespalib::Gate enter; vespalib::Gate leave; vespalib::Gate gone; - typedef std::unique_ptr<Rendezvous> UP; + using UP = std::unique_ptr<Rendezvous>; Rendezvous() : enter(), leave(), gone() {} bool run(vespalib::duration timeout = 80s) { enter.countDown(); diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp index b52078e98ec..fdfa7522350 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp @@ -62,8 +62,8 @@ using vespalib::eval::ValueType; using namespace proton; using namespace search::index; -typedef SearchableFeedView::SerialNum SerialNum; -typedef search::DocumentIdT DocumentIdT; +using SerialNum = SearchableFeedView::SerialNum; +using DocumentIdT = search::DocumentIdT; struct MyLidVector : public std::vector<DocumentIdT> { @@ -225,7 +225,7 @@ public: struct MyDocumentStore : public test::DummyDocumentStore { - typedef std::map<DocumentIdT, document::Document::SP> DocMap; + using DocMap = std::map<DocumentIdT, document::Document::SP>; const document::DocumentTypeRepo & _repo; DocMap _docs; uint64_t _lastSyncToken; @@ -462,7 +462,7 @@ struct DocumentContext DocumentUpdate::SP upd; BucketId bid; Timestamp ts; - typedef std::vector<DocumentContext> List; + using List = std::vector<DocumentContext>; DocumentContext(const vespalib::string &docId, uint64_t timestamp, DocBuilder &builder); ~DocumentContext(); void addFieldUpdate(DocBuilder &builder, const vespalib::string &fieldName) { @@ -488,8 +488,8 @@ struct FeedTokenContext { MyTransport mt; FeedToken ft; - typedef std::shared_ptr<FeedTokenContext> SP; - typedef std::vector<SP> List; + using SP = std::shared_ptr<FeedTokenContext>; + using List = std::vector<SP>; FeedTokenContext(MyTracer &tracer); ~FeedTokenContext(); }; diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp index e1ec5916291..99915a1b50f 100644 --- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp +++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp @@ -34,8 +34,8 @@ using proton::matching::RankingConstants; using proton::matching::RankingExpressions; using proton::matching::OnnxModels; -typedef DocumentDBConfigHelper DBCM; -typedef DocumentDBConfig::DocumenttypesConfigSP DocumenttypesConfigSP; +using DBCM = DocumentDBConfigHelper; +using DocumenttypesConfigSP = DocumentDBConfig::DocumenttypesConfigSP; using vespalib::nbostream; vespalib::string myId("myconfigid"); diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp index 95f03558231..0234d5fbedf 100644 --- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp +++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp @@ -73,7 +73,7 @@ using storage::spi::dummy::DummyBucketExecutor; using BlockedReason = IBlockableMaintenanceJob::BlockedReason; -typedef BucketId::List BucketIdVector; +using BucketIdVector = BucketId::List; constexpr vespalib::duration TIMEOUT = 60s; @@ -92,7 +92,7 @@ sampleThreadId(FastOS_ThreadId *threadId) class MyDocumentSubDB { - typedef std::map<DocumentIdT, Document::SP> DocMap; + using DocMap = std::map<DocumentIdT, Document::SP>; DocMap _docs; uint32_t _subDBId; DocumentMetaStore::SP _metaStoreSP; @@ -441,7 +441,7 @@ void MyDocumentSubDB::handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &op) { assert(_subDBId == 1u); - typedef LidVectorContext::LidVector LidVector; + using LidVector = LidVectorContext::LidVector; const SerialNum serialNum = op.getSerialNum(); const LidVectorContext &lidCtx = *op.getLidsToRemove(); const LidVector &lidsToRemove(lidCtx.getLidVector()); @@ -464,7 +464,7 @@ MyDocumentSubDB::handlePut(PutOperation &op) bool needCommit = false; if (op.getValidDbdId(_subDBId)) { - typedef DocumentMetaStore::Result PutRes; + using PutRes = DocumentMetaStore::Result; PutRes putRes(_metaStore.put(gid, op.getBucketId(), @@ -506,7 +506,7 @@ MyDocumentSubDB::handleRemove(RemoveOperationWithDocId &op) bool needCommit = false; if (op.getValidDbdId(_subDBId)) { - typedef DocumentMetaStore::Result PutRes; + using PutRes = DocumentMetaStore::Result; PutRes putRes(_metaStore.put(gid, op.getBucketId(), @@ -564,7 +564,7 @@ MyDocumentSubDB::handleMove(const MoveOperation &op) bool needCommit = false; if (op.getValidDbdId(_subDBId)) { - typedef DocumentMetaStore::Result PutRes; + using PutRes = DocumentMetaStore::Result; PutRes putRes(_metaStore.put(gid, op.getBucketId(), |