diff options
Diffstat (limited to 'streamingvisitors/src')
24 files changed, 59 insertions, 56 deletions
diff --git a/streamingvisitors/src/tests/hitcollector/hitcollector.cpp b/streamingvisitors/src/tests/hitcollector/hitcollector.cpp index 30e6b8a7adb..bd567964e8d 100644 --- a/streamingvisitors/src/tests/hitcollector/hitcollector.cpp +++ b/streamingvisitors/src/tests/hitcollector/hitcollector.cpp @@ -23,7 +23,7 @@ using vespalib::eval::TensorSpec; using vespalib::tensor::DefaultTensorEngine; -namespace storage { +namespace streaming { class HitCollectorTest : public vespalib::TestApp { @@ -347,6 +347,6 @@ HitCollectorTest::Main() TEST_DONE(); } -} // namespace storage +} // namespace streaming -TEST_APPHOOK(storage::HitCollectorTest) +TEST_APPHOOK(streaming::HitCollectorTest) diff --git a/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp b/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp index ee8e5a322e2..8135f378dd3 100644 --- a/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp +++ b/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp @@ -44,8 +44,8 @@ using search::query::StackDumpCreator; using search::query::Weight; using search::streaming::Query; using search::streaming::QueryNodeResultFactory; -using storage::HitCollector; -using storage::MatchingElementsFiller; +using streaming::HitCollector; +using streaming::MatchingElementsFiller; using vdslib::SearchResult; using vsm::FieldIdTList; using vsm::IntFieldSearcher; diff --git a/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp b/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp index ffdddec676e..5357b8d8113 100644 --- a/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp +++ b/streamingvisitors/src/tests/querywrapper/querywrapper_test.cpp @@ -11,7 +11,7 @@ using namespace search; using namespace search::query; using namespace search::streaming; -namespace storage { +namespace streaming { class QueryWrapperTest : public vespalib::TestApp { @@ -103,6 +103,6 @@ QueryWrapperTest::Main() TEST_DONE(); } -} // namespace storage +} // namespace streaming -TEST_APPHOOK(storage::QueryWrapperTest) +TEST_APPHOOK(::streaming::QueryWrapperTest) diff --git a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp index 793aa31b3ac..18cd7fab2b8 100644 --- a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp +++ b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp @@ -14,11 +14,12 @@ #include <vespa/log/log.h> LOG_SETUP("searchvisitor_test"); -using namespace search; -using namespace search::query; using namespace document; +using namespace search::query; +using namespace search; +using namespace storage; -namespace storage { +namespace streaming { class SearchVisitorTest : public vespalib::TestApp { @@ -124,6 +125,6 @@ SearchVisitorTest::Main() TEST_DONE(); } -} // namespace storage +} // namespace streaming -TEST_APPHOOK(storage::SearchVisitorTest) +TEST_APPHOOK(::streaming::SearchVisitorTest) diff --git a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp index ce0cd967e06..f3850154505 100644 --- a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp @@ -15,7 +15,7 @@ using search::FeatureSet; using search::fef::MatchData; using vdslib::SearchResult; -namespace storage { +namespace streaming { HitCollector::Hit::Hit(const vsm::StorageDocument * doc, uint32_t docId, const search::fef::MatchData & matchData, double score, const void * sortData, size_t sortDataLen) : @@ -180,5 +180,5 @@ HitCollector::getFeatureSet(IRankProgram &rankProgram, return retval; } -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/hitcollector.h b/streamingvisitors/src/vespa/searchvisitor/hitcollector.h index 2f71c5d7a71..d032d99ec70 100644 --- a/streamingvisitors/src/vespa/searchvisitor/hitcollector.h +++ b/streamingvisitors/src/vespa/searchvisitor/hitcollector.h @@ -11,7 +11,7 @@ namespace search { namespace fef { class FeatureResolver; } } -namespace storage { +namespace streaming { /** * This class is used to store hits and MatchData objects for the m best hits. @@ -136,5 +136,5 @@ public: }; -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp index 53e1910b564..481e8c37fbe 100644 --- a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp @@ -4,7 +4,7 @@ using namespace search::fef; -namespace storage { +namespace streaming { IndexEnvironment::IndexEnvironment(const ITableManager & tableManager) : _tableManager(&tableManager), @@ -45,5 +45,5 @@ IndexEnvironment::hintAttributeAccess(const string & name) const { } } -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h index 832d99b4dde..5d684c4fea4 100644 --- a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h +++ b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h @@ -12,7 +12,7 @@ #include <vespa/vespalib/stllike/hash_map.h> #include <set> -namespace storage { +namespace streaming { /** * Implementation of the feature execution framework @@ -83,5 +83,5 @@ public: }; -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.cpp b/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.cpp index 780b67ada0c..994a7993666 100644 --- a/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.cpp @@ -21,7 +21,7 @@ using vdslib::SearchResult; using vsm::FieldIdTSearcherMap; using vsm::StorageDocument; -namespace storage { +namespace streaming { namespace { diff --git a/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.h b/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.h index 9a18fb818b1..c93f89ac43d 100644 --- a/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.h +++ b/streamingvisitors/src/vespa/searchvisitor/matching_elements_filler.h @@ -11,7 +11,7 @@ class FieldIdTSearcherMap; class StorageDocument; } -namespace storage { +namespace streaming { class HitCollector; diff --git a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp index 76d5387ec8b..37809b207ad 100644 --- a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp @@ -10,7 +10,7 @@ using search::IAttributeManager; using search::fef::Properties; using vespalib::string; -namespace storage { +namespace streaming { namespace { @@ -60,5 +60,5 @@ QueryEnvironment::QueryEnvironment(const string & location_str, QueryEnvironment::~QueryEnvironment() {} -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h index db0f95cb6bb..f580cec8870 100644 --- a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h +++ b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h @@ -10,7 +10,7 @@ #include <vespa/searchlib/fef/properties.h> #include "indexenvironment.h" -namespace storage { +namespace streaming { /** * Implementation of the feature execution framework @@ -62,5 +62,5 @@ public: void addTerm(const search::fef::ITermData *term) { _queryTerms.push_back(term); } }; -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/querytermdata.cpp b/streamingvisitors/src/vespa/searchvisitor/querytermdata.cpp index cca7946f57a..8ec285abfcb 100644 --- a/streamingvisitors/src/vespa/searchvisitor/querytermdata.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/querytermdata.cpp @@ -4,7 +4,7 @@ using namespace search::fef; -namespace storage { +namespace streaming { -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/querytermdata.h b/streamingvisitors/src/vespa/searchvisitor/querytermdata.h index 99179dba691..cabfd5accc9 100644 --- a/streamingvisitors/src/vespa/searchvisitor/querytermdata.h +++ b/streamingvisitors/src/vespa/searchvisitor/querytermdata.h @@ -6,7 +6,7 @@ #include <vespa/searchlib/fef/simpletermdata.h> #include <vespa/searchlib/query/streaming/querynoderesultbase.h> -namespace storage { +namespace streaming { /** * This class keeps data for a query term that is used by the ranking framework. @@ -29,5 +29,5 @@ public: }; -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp b/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp index 73aa0c8a97e..6a3c381e16d 100644 --- a/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp @@ -4,7 +4,7 @@ using namespace search::streaming; -namespace storage { +namespace streaming { QueryWrapper::PhraseList::PhraseList(Query & query) : _phrases() @@ -45,5 +45,5 @@ QueryWrapper::QueryWrapper(Query & query) : QueryWrapper::~QueryWrapper() = default; -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/querywrapper.h b/streamingvisitors/src/vespa/searchvisitor/querywrapper.h index 8952ca302fb..e569010ffe7 100644 --- a/streamingvisitors/src/vespa/searchvisitor/querywrapper.h +++ b/streamingvisitors/src/vespa/searchvisitor/querywrapper.h @@ -5,7 +5,7 @@ #include <vespa/searchlib/query/streaming/query.h> #include <vespa/searchlib/query/streaming/querynode.h> -namespace storage { +namespace streaming { /** * This class wraps a query and adds extra information to the list of leaf terms. @@ -62,5 +62,5 @@ public: const TermList & getTermList() const { return _termList; } }; -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp b/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp index ba94caa8965..8dbbbba98cf 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp @@ -21,7 +21,7 @@ using vsm::VsmfieldsHandle; using vsm::VSMAdapter; using vsm::FieldIdTList; -namespace storage { +namespace streaming { void RankManager::Snapshot::addProperties(const vespa::config::search::RankProfilesConfig & cfg) diff --git a/streamingvisitors/src/vespa/searchvisitor/rankmanager.h b/streamingvisitors/src/vespa/searchvisitor/rankmanager.h index 573833a93f8..f408872d578 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankmanager.h +++ b/streamingvisitors/src/vespa/searchvisitor/rankmanager.h @@ -9,7 +9,7 @@ #include <vespa/searchlib/fef/tablemanager.h> #include <vespa/vsm/vsm/vsm-adapter.h> -namespace storage { +namespace streaming { /** * This class subscribes to the rank-profiles config and keeps a setup per rank profile. @@ -89,5 +89,5 @@ public: Snapshot::SP getSnapshot() const { return _snapshot.get(); } }; -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp index 690e750503b..2d3a9b17d33 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp @@ -28,7 +28,7 @@ using search::streaming::QueryTerm; using search::streaming::QueryTermList; using vdslib::SearchResult; -namespace storage { +namespace streaming { namespace { @@ -290,5 +290,5 @@ RankProcessor::unpackMatchData(MatchData &matchData) } } -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h index 7dd921af69e..03a3f0cb338 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h +++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h @@ -14,7 +14,7 @@ #include "querywrapper.h" #include "rankmanager.h" -namespace storage { +namespace streaming { /** * This class is associated with a query and a rank profile and @@ -75,5 +75,5 @@ public: uint32_t getDocId() const { return _docId; } }; -} // namespace storage +} // namespace streaming diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp index 7de96f0c4ab..107a1b44208 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp @@ -9,7 +9,7 @@ LOG_SETUP(".visitor.instance.searchenvironment"); using search::docsummary::JuniperProperties; using vsm::VSMAdapter; -namespace storage { +namespace streaming { __thread SearchEnvironment::EnvMap * SearchEnvironment::_localEnvMap=0; diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h index 86456d4d3d2..126b8370105 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h @@ -10,9 +10,9 @@ #include <vespa/vsm/vsm/vsm-adapter.h> #include <vespa/fastlib/text/normwordfolder.h> -namespace storage { +namespace streaming { -class SearchEnvironment : public VisitorEnvironment +class SearchEnvironment : public storage::VisitorEnvironment { private: class Env : public config::SimpleConfigurable { diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index 55a3d313da9..94026ffaa19 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -20,7 +20,7 @@ #include <vespa/log/log.h> LOG_SETUP(".visitor.instance.searchvisitor"); -namespace storage { +namespace streaming { using document::DataType; using document::PositionDataType; @@ -31,6 +31,8 @@ using search::attribute::IAttributeVector; using search::expression::ConfigureStaticParams; using search::streaming::Query; using search::streaming::QueryTermList; +using storage::StorageComponent; +using storage::VisitorEnvironment; using vdslib::Parameters; using vsm::DocsumFilter; using vsm::FieldPath; @@ -869,7 +871,7 @@ SearchVisitor::compatibleDocumentTypes(const document::DocumentType& typeA, void SearchVisitor::handleDocuments(const document::BucketId&, - std::vector<spi::DocEntry::UP>& entries, + std::vector<storage::spi::DocEntry::UP>& entries, HitCounter& hitCounter) { (void) hitCounter; diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h index c7463f7c7b7..9f1887c3b53 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h @@ -31,7 +31,7 @@ using namespace search::aggregation; -namespace storage { +namespace streaming { /** * @class storage::SearchVisitor @@ -39,9 +39,9 @@ namespace storage { * @brief Visitor that applies a search query to visitor data and * converts them to a SearchResultCommand and a DocumentSummaryCommand. **/ -class SearchVisitor : public Visitor { +class SearchVisitor : public storage::Visitor { public: - SearchVisitor(StorageComponent&, VisitorEnvironment& vEnv, + SearchVisitor(storage::StorageComponent&, storage::VisitorEnvironment& vEnv, const vdslib::Parameters & params); ~SearchVisitor(); @@ -298,7 +298,7 @@ private: // Inherit doc from Visitor void handleDocuments(const document::BucketId&, - std::vector<spi::DocEntry::UP>& entries, + std::vector<storage::spi::DocEntry::UP>& entries, HitCounter& hitCounter) override; bool compatibleDocumentTypes(const document::DocumentType& typeA, @@ -347,9 +347,9 @@ private: // Inherit doc from Visitor void completedVisiting(HitCounter& counter) override; - spi::ReadConsistency getRequiredReadConsistency() const override { + storage::spi::ReadConsistency getRequiredReadConsistency() const override { // Searches are not considered to require strong consistency. - return spi::ReadConsistency::WEAK; + return storage::spi::ReadConsistency::WEAK; } /** @@ -454,11 +454,11 @@ private: void setupAttributeVector(const vsm::FieldPath &fieldPath); }; -class SearchVisitorFactory : public VisitorFactory { +class SearchVisitorFactory : public storage::VisitorFactory { config::ConfigUri _configUri; - VisitorEnvironment::UP makeVisitorEnvironment(StorageComponent&) override; + storage::VisitorEnvironment::UP makeVisitorEnvironment(storage::StorageComponent&) override; - Visitor* makeVisitor(StorageComponent&, VisitorEnvironment&env, + storage::Visitor* makeVisitor(storage::StorageComponent&, storage::VisitorEnvironment&env, const vdslib::Parameters& params) override; public: SearchVisitorFactory(const config::ConfigUri & configUri); |