Merge pull request #30198 from vespa-engine/balder/empty-index-is-default-index

Empty index => 'default' index

4 files changed, 10 insertions, 3 deletions

diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
index 596ad53c014..77cf20e4c10 100644
--- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
+++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.cpp
@@ -14,6 +14,8 @@ using search::query::StringTermVector;
 
 namespace search {
 
+vespalib::stringref SimpleQueryStackDumpIterator::DEFAULT_INDEX = "default";
+
 SimpleQueryStackDumpIterator::SimpleQueryStackDumpIterator(vespalib::stringref buf)
     : _buf(buf.begin()),
       _bufEnd(buf.end()),
diff --git a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h
index e04f6379434..0f80661bf38 100644
--- a/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h
+++ b/searchlib/src/vespa/searchlib/parsequery/stackdumpiterator.h
@@ -137,6 +137,8 @@ public:
     vespalib::stringref getIndexName() const { return _curr_index_name; }
     vespalib::stringref getTerm() const { return _curr_term; }
     int64_t getIntergerTerm() const { return _curr_integer_term; }
+
+    static vespalib::stringref DEFAULT_INDEX;
 };
 
 }
diff --git a/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp
index 44df253a2fd..d1f894063f8 100644
--- a/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp
+++ b/searchlib/src/vespa/searchlib/query/streaming/querynode.cpp
@@ -21,7 +21,6 @@ namespace search::streaming {
 
 namespace {
 
-vespalib::stringref DEFAULT("default");
 bool disableRewrite(const QueryNode * qn) {
     return dynamic_cast<const NearQueryNode *> (qn) ||
            dynamic_cast<const PhraseQueryNode *> (qn) ||
@@ -105,7 +104,7 @@ QueryNode::Build(const QueryNode * parent, const QueryNodeResultFactory & factor
             if ((type == ParseItem::ITEM_PURE_WEIGHTED_STRING) || (type == ParseItem::ITEM_PURE_WEIGHTED_LONG)) {
                 index = parent->getIndex();
             } else {
-                index = DEFAULT;
+                index = SimpleQueryStackDumpIterator::DEFAULT_INDEX;
             }
         }
         if (dynamic_cast<const SameElementQueryNode *>(parent) != nullptr) {
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp
index 03979675c99..d55b5adff17 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/juniper_query_adapter.cpp
@@ -80,7 +80,11 @@ JuniperQueryAdapter::Traverse(juniper::IQueryVisitor *v) const
             {
                 vespalib::string term = iterator.getTerm();
                 if (_query_normalization) {
-                    Normalizing normalization = _query_normalization->normalizing_mode(iterator.getIndexName());
+                    vespalib::string index = iterator.getIndexName();
+                    if (index.empty()) {
+                        index = SimpleQueryStackDumpIterator::DEFAULT_INDEX;
+                    }
+                    Normalizing normalization = _query_normalization->normalizing_mode(index);
                     TermType termType = ParseItem::toTermType(iterator.getType());
                     v->visitKeyword(&item, QueryNormalization::optional_fold(term, termType, normalization),
                                     prefix_like, isSpecialToken);