Simplify how to read strings.

2 files changed, 86 insertions, 107 deletions

diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
index 18cb2025425..140992e1b59 100644
--- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
+++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
@@ -25,10 +25,8 @@ SimpleQueryStackDumpIterator::SimpleQueryStackDumpIterator(vespalib::stringref b
     _currArg2(0),
     _currArg3(0),
     _predicate_query_term(),
-    _currIndexName(nullptr),
-    _currIndexNameLen(0),
-    _currTerm(nullptr),
-    _currTermLen(0),
+    _curr_index_name(),
+    _curr_term(),
     _generatedTerm()
 {
 }
@@ -44,6 +42,19 @@ vespalib::string SimpleQueryStackDumpIterator::readString(const char *&p) {
     return s;
 }
 
+vespalib::stringref
+SimpleQueryStackDumpIterator::read_stringref(const char *&p)
+{
+    if (p >= _bufEnd) throw false;
+    uint64_t len;
+    p += vespalib::compress::Integer::decompressPositive(len, p);
+    if (p > _bufEnd) throw false;
+    vespalib::stringref result(p, len);
+    p += len;
+    if (p > _bufEnd) throw false;
+    return result;
+}
+
 uint64_t SimpleQueryStackDumpIterator::readUint64(const char *&p) {
     if (p + sizeof(uint64_t) > _bufEnd) throw false;
     uint64_t l = vespalib::nbo::n2h(*(const uint64_t *)(const void *)p);
@@ -113,10 +124,8 @@ SimpleQueryStackDumpIterator::next()
         _currArity = tmp;
         if (p > _bufEnd) return false;
         _currArg1 = 0;
-        _currIndexName = nullptr;
-        _currIndexNameLen = 0;
-        _currTerm = nullptr;
-        _currTermLen = 0;
+        _curr_index_name = vespalib::stringref();
+        _curr_term = vespalib::stringref();
         break;
 
     case ParseItem::ITEM_NEAR:
@@ -128,62 +137,52 @@ SimpleQueryStackDumpIterator::next()
         p += vespalib::compress::Integer::decompressPositive(tmp, p);
         _currArg1 = tmp;
         if (p > _bufEnd) return false;
-        _currIndexName = nullptr;
-        _currIndexNameLen = 0;
-        _currTerm = nullptr;
-        _currTermLen = 0;
+        _curr_index_name = vespalib::stringref();
+        _curr_term = vespalib::stringref();
         break;
 
     case ParseItem::ITEM_WEAK_AND:
-        if (p >= _bufEnd) return false;
-        p += vespalib::compress::Integer::decompressPositive(tmp, p);
-        _currArity = tmp;
-        if (p > _bufEnd) return false;
-        p += vespalib::compress::Integer::decompressPositive(tmp, p);
-        _currArg1 = tmp;
-        if (p > _bufEnd) return false;
-        p += vespalib::compress::Integer::decompressPositive(tmp, p);
-        _currIndexNameLen = tmp;
-        if (p > _bufEnd) return false;
-        _currIndexName = p;
-        p += _currIndexNameLen;
-        if (p > _bufEnd) return false;
-        _currTerm = nullptr;
-        _currTermLen = 0;
+        try {
+            if (p >= _bufEnd) return false;
+            p += vespalib::compress::Integer::decompressPositive(tmp, p);
+            _currArity = tmp;
+            if (p > _bufEnd) return false;
+            p += vespalib::compress::Integer::decompressPositive(tmp, p);
+            _currArg1 = tmp;
+            if (p > _bufEnd) return false;
+            _curr_index_name = read_stringref(p);
+            _curr_term = vespalib::stringref();
+        } catch (...) {
+            return false;
+        }
         break;
     case ParseItem::ITEM_SAME_ELEMENT:
-        if (p >= _bufEnd) return false;
-        p += vespalib::compress::Integer::decompressPositive(tmp, p);
-        _currArity = tmp;
-        _currArg1 = 0;
-        p += vespalib::compress::Integer::decompressPositive(tmp, p);
-        _currIndexNameLen = tmp;
-        if (p > _bufEnd) return false;
-        _currIndexName = p;
-        p += _currIndexNameLen;
-        if (p > _bufEnd) return false;
-        _currTerm = nullptr;
-        _currTermLen = 0;
+        try {
+            if (p >= _bufEnd) return false;
+            p += vespalib::compress::Integer::decompressPositive(tmp, p);
+            _currArity = tmp;
+            _currArg1 = 0;
+            _curr_index_name = read_stringref(p);
+            _curr_term = vespalib::stringref();
+        } catch (...) {
+            return false;
+        }
         break;
 
     case ParseItem::ITEM_PURE_WEIGHTED_STRING:
-        if (p >= _bufEnd) return false;
-        p += vespalib::compress::Integer::decompressPositive(tmp, p);
-        _currTermLen = tmp;
-        if (p > _bufEnd) return false;
-        _currTerm = p;
-        p += _currTermLen;
-        if (p > _bufEnd) return false;
-
-        _currArg1 = 0;
-        _currArity = 0;
+        try {
+            _curr_term = read_stringref(p);
+            _currArg1 = 0;
+            _currArity = 0;
+        } catch (...) {
+            return false;
+        }
         break;
     case ParseItem::ITEM_PURE_WEIGHTED_LONG:
         if (p + sizeof(int64_t) > _bufEnd) return false;
         _generatedTerm.clear();
         _generatedTerm << vespalib::nbo::n2h(*reinterpret_cast<const int64_t *>(p));
-        _currTerm = _generatedTerm.c_str();
-        _currTermLen = _generatedTerm.size();
+        _curr_term = vespalib::stringref(_generatedTerm.c_str(), _generatedTerm.size());
         p += sizeof(int64_t);
         if (p > _bufEnd) return false;
 
@@ -192,12 +191,9 @@ SimpleQueryStackDumpIterator::next()
         break;
     case ParseItem::ITEM_WORD_ALTERNATIVES:
         try {
-            _currIndexNameLen = readCompressedPositiveInt(p);
-            _currIndexName = p;
-            p += _currIndexNameLen;
+            _curr_index_name = read_stringref(p);
             _currArity = readCompressedPositiveInt(p);
-            _currTerm = nullptr;
-            _currTermLen = 0;
+            _curr_term = vespalib::stringref();
             if (p > _bufEnd) return false;
         } catch (...) {
             return false;
@@ -210,30 +206,18 @@ SimpleQueryStackDumpIterator::next()
     case ParseItem::ITEM_EXACTSTRINGTERM:
     case ParseItem::ITEM_SUFFIXTERM:
     case ParseItem::ITEM_REGEXP:
-        p += vespalib::compress::Integer::decompressPositive(tmp, p);
-        _currIndexNameLen = tmp;
-        if (p > _bufEnd) return false;
-        _currIndexName = p;
-        p += _currIndexNameLen;
-        if (p > _bufEnd) return false;
-        p += vespalib::compress::Integer::decompressPositive(tmp, p);
-        _currTermLen = tmp;
-        if (p > _bufEnd) return false;
-        _currTerm = p;
-        p += _currTermLen;
-        if (p > _bufEnd) return false;
-
-        _currArg1 = 0;
-        _currArity = 0;
+        try {
+            _curr_index_name = read_stringref(p);
+            _curr_term = read_stringref(p);
+            _currArg1 = 0;
+            _currArity = 0;
+        } catch (...) {
+            return false;
+        }
         break;
     case ParseItem::ITEM_PREDICATE_QUERY:
         try {
-            if (p >= _bufEnd) return false;
-            p += vespalib::compress::Integer::decompressPositive(tmp, p);
-            _currIndexNameLen = tmp;
-            if (p > _bufEnd) return false;
-            _currIndexName = p;
-            p += _currIndexNameLen;
+            _curr_index_name = read_stringref(p);
             _predicate_query_term.reset(new PredicateQueryTerm);
 
             size_t count = readCompressedPositiveInt(p);
@@ -261,27 +245,25 @@ SimpleQueryStackDumpIterator::next()
     case ParseItem::ITEM_DOT_PRODUCT:
     case ParseItem::ITEM_WAND:
     case ParseItem::ITEM_PHRASE:
-        p += vespalib::compress::Integer::decompressPositive(tmp, p);
-        _currArity = tmp;
-        if (p > _bufEnd) return false;
-        p += vespalib::compress::Integer::decompressPositive(tmp, p);
-        _currIndexNameLen = tmp;
-        if (p > _bufEnd) return false;
-        _currIndexName = p;
-        p += _currIndexNameLen;
-        if (p > _bufEnd) return false;
-        if (_currType == ParseItem::ITEM_WAND) {
-            p += vespalib::compress::Integer::decompressPositive(tmp, p); // targetNumHits
-            _currArg1 = tmp;
-            _currArg2 = vespalib::nbo::n2h(*reinterpret_cast<const double *>(p)); // scoreThreshold
-            p += sizeof(double);
-            _currArg3 = vespalib::nbo::n2h(*reinterpret_cast<const double *>(p)); // thresholdBoostFactor
-            p += sizeof(double);
-        } else {
-            _currArg1 = 0;
+        try {
+            p += vespalib::compress::Integer::decompressPositive(tmp, p);
+            _currArity = tmp;
+            if (p > _bufEnd) return false;
+            _curr_index_name = read_stringref(p);
+            if (_currType == ParseItem::ITEM_WAND) {
+                p += vespalib::compress::Integer::decompressPositive(tmp, p); // targetNumHits
+                _currArg1 = tmp;
+                _currArg2 = vespalib::nbo::n2h(*reinterpret_cast<const double *>(p)); // scoreThreshold
+                p += sizeof(double);
+                _currArg3 = vespalib::nbo::n2h(*reinterpret_cast<const double *>(p)); // thresholdBoostFactor
+                p += sizeof(double);
+            } else {
+                _currArg1 = 0;
+            }
+            _curr_term = vespalib::stringref();
+        } catch (...) {
+            return false;
         }
-        _currTerm = nullptr;
-        _currTermLen = 0;
         break;
 
     default:
diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h
index 82e99b786d7..1441983118b 100644
--- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h
+++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h
@@ -50,17 +50,14 @@ private:
     double _currArg3;
     /** The predicate query specification */
     query::PredicateQueryTerm::UP _predicate_query_term;
-    /** Pointer to the position of the index name in the current item */
-    const char *_currIndexName;
-    /** The length of the index name in the current item */
-    size_t _currIndexNameLen;
-    /** Pointer to the position of the term in the current item */
-    const char *_currTerm;
-    /** The length of the term in the current item */
-    size_t _currTermLen;
+    /** The index name (field name) in the current item */
+    vespalib::stringref _curr_index_name;
+    /** The term in the current item */
+    vespalib::stringref _curr_term;
     vespalib::asciistream _generatedTerm;
 
     vespalib::string readString(const char *&p);
+    vespalib::stringref read_stringref(const char *&p);
     uint64_t readUint64(const char *&p);
     uint64_t readCompressedPositiveInt(const char *&p);
 
@@ -136,8 +133,8 @@ public:
     query::PredicateQueryTerm::UP getPredicateQueryTerm()
     { return std::move(_predicate_query_term); }
 
-    vespalib::stringref getIndexName() const { return vespalib::stringref(_currIndexName, _currIndexNameLen); }
-    vespalib::stringref getTerm() const { return vespalib::stringref(_currTerm, _currTermLen); }
+    vespalib::stringref getIndexName() const { return _curr_index_name; }
+    vespalib::stringref getTerm() const { return _curr_term; }
 };
 
 }