diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-04-18 15:53:19 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-04-18 15:53:19 +0200 |
commit | 352b828e91711ab1384213ad7f741d423688eeca (patch) | |
tree | 55094ccb785eeca6156f8445cd45a1c5e868bbba /searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp | |
parent | 76497a12e6ec76d82527b2bd2fbe3de8bba6eb63 (diff) | |
parent | bd5edd2681f6b0a3282cd053acb98d4b0ee126c4 (diff) |
Merge branch 'master' into bratseth/receive-wanted-version
Diffstat (limited to 'searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp')
-rw-r--r-- | searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp b/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp index 37fc78df460..2d12b5c1782 100644 --- a/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp +++ b/searchlib/src/tests/diskindex/pagedict4/pagedict4test.cpp @@ -16,30 +16,33 @@ #include <vespa/log/log.h> LOG_SETUP("pagedict4test"); -using search::bitcompression::PostingListCountFileEncodeContext; -using search::bitcompression::PostingListCountFileDecodeContext; -using search::index::PostingListCounts; -using search::index::PostingListOffsetAndCounts; -using search::index::PostingListParams; -using search::bitcompression::PageDict4SSWriter; -using search::bitcompression::PageDict4SPWriter; +using search::bitcompression::PageDict4PLookupRes; using search::bitcompression::PageDict4PWriter; using search::bitcompression::PageDict4Reader; -using search::bitcompression::PageDict4SSReader; -using search::bitcompression::PageDict4SSLookupRes; using search::bitcompression::PageDict4SPLookupRes; -using search::bitcompression::PageDict4PLookupRes; -using search::index::Schema; -using search::index::DictionaryFileSeqRead; -using search::index::DictionaryFileSeqWrite; -using search::index::DictionaryFileRandRead; +using search::bitcompression::PageDict4SPWriter; +using search::bitcompression::PageDict4SSLookupRes; +using search::bitcompression::PageDict4SSReader; +using search::bitcompression::PageDict4SSWriter; +using search::bitcompression::PostingListCountFileDecodeContext; +using search::bitcompression::PostingListCountFileEncodeContext; using search::diskindex::PageDict4FileSeqRead; using search::diskindex::PageDict4FileSeqWrite; using search::diskindex::PageDict4RandRead; +using search::index::DictionaryFileRandRead; +using search::index::DictionaryFileSeqRead; +using search::index::DictionaryFileSeqWrite; using search::index::DummyFileHeaderContext; +using search::index::PostingListCounts; +using search::index::PostingListOffsetAndCounts; +using search::index::PostingListParams; +using search::index::Schema; +using search::index::schema::CollectionType; +using search::index::schema::DataType; + using namespace search::index; -typedef search::bitcompression::PageDict4StartOffset StartOffset; +using StartOffset = search::bitcompression::PageDict4StartOffset; namespace { @@ -216,7 +219,7 @@ public: usage(void); int - Main(void); + Main(void) override; void testWords(void); @@ -645,8 +648,8 @@ testWords(const std::string &logname, fn << "f0"; schema.addIndexField(Schema:: IndexField(fn.str(), - schema::STRING, - schema::SINGLE)); + DataType::STRING, + CollectionType::SINGLE)); indexes.push_back(0); } { |