diff options
Diffstat (limited to 'searchlib/src')
7 files changed, 9 insertions, 9 deletions
diff --git a/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp b/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp index 524ad9b0fff..e5df22509be 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp @@ -58,7 +58,7 @@ CompactDocumentWordsStore::Iterator::nextWord() } CompactDocumentWordsStore::Iterator::Iterator() - : _buf(NULL), + : _buf(nullptr), _remainingWords(0), _wordRef(0), _valid(false) diff --git a/searchlib/src/vespa/searchlib/memoryindex/featurestore.cpp b/searchlib/src/vespa/searchlib/memoryindex/featurestore.cpp index 9fdb23876d8..46b0fe36302 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/featurestore.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/featurestore.cpp @@ -73,9 +73,9 @@ FeatureStore::moveFeatures(datastore::EntryRef ref, uint64_t bitLen) FeatureStore::FeatureStore(const Schema &schema) : _store(), - _f(NULL), + _f(nullptr), _fctx(_f), - _d(NULL), + _d(nullptr), _fieldsParams(), _schema(schema), _type(RefType::align(1u), MIN_BUFFER_ARRAYS, diff --git a/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp index 996193d93b2..32ca3f75c61 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp @@ -110,7 +110,7 @@ FieldInverter::processAnnotations(const StringFieldValue &value) _terms.clear(); StringFieldValue::SpanTrees spanTrees = value.getSpanTrees(); const SpanTree *tree = StringFieldValue::findTree(spanTrees, linguistics::SPANTREE_NAME); - if (tree == NULL) { + if (tree == nullptr) { /* This is wrong unless field is exact match */ const vespalib::string &text = value.getValue(); if (text.empty()) diff --git a/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.cpp b/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.cpp index 4e02c3cb09d..22f76e9393e 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/memoryfieldindex.cpp @@ -149,7 +149,7 @@ void MemoryFieldIndex::dump(search::index::IndexBuilder & indexBuilder) { vespalib::stringref word; - FeatureStore::DecodeContextCooked decoder(NULL); + FeatureStore::DecodeContextCooked decoder(nullptr); DocIdAndFeatures features; vespalib::Array<uint32_t> wordMap(_numUniqueWords + 1, 0); _featureStore.setupForField(_fieldId, decoder); diff --git a/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp b/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp index 4c9ea41183a..d984a4bb9d4 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/memoryindex.cpp @@ -265,7 +265,7 @@ void MemoryIndex::pruneRemovedFields(const Schema &schema) { LockGuard lock(_lock); - if (_prunedSchema.get() == NULL) { + if (_prunedSchema.get() == nullptr) { Schema::UP newSchema = Schema::intersect(_schema, schema); if (_schema == *newSchema) return; diff --git a/searchlib/src/vespa/searchlib/memoryindex/postingiterator.cpp b/searchlib/src/vespa/searchlib/memoryindex/postingiterator.cpp index dd940c2d2d3..210e097b5d5 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/postingiterator.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/postingiterator.cpp @@ -19,7 +19,7 @@ PostingIterator::PostingIterator(Dictionary::PostingList::ConstIterator itr, queryeval::RankedSearchIteratorBase(matchData), _itr(itr), _featureStore(featureStore), - _featureDecoder(NULL) + _featureDecoder(nullptr) { _featureStore.setupForField(packedIndex, _featureDecoder); } diff --git a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp index 9356889a70e..c67a378fa46 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp @@ -173,7 +173,7 @@ UrlFieldInverter::processUrlField(const FieldValue &url_field) static_cast<const StructFieldValue &>(url_field); const FieldValue::UP all_val = field.getValue("all"); - if (all_val.get() == NULL) { + if (all_val.get() == nullptr) { if (_useAnnotations) { // New style, use annotations processAnnotatedUrlField(field); @@ -192,7 +192,7 @@ UrlFieldInverter::processUrlField(const FieldValue &url_field) if (_useAnnotations) { StringFieldValue::SpanTrees trees = all_sfv.getSpanTrees(); const SpanTree *tree = StringFieldValue::findTree(trees, SPANTREE_NAME); - if (tree != NULL) { + if (tree != nullptr) { // New style, use annotations processAnnotatedUrlField(field); return; |