Merge pull request #30474 from vespa-engine/arnej/handle-multiple-sortspecs-for-same-field

avoid re-using attributeField for sorting, would overwrite

1 files changed, 10 insertions, 1 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index a68fe7c6aed..52dd1c52fc2 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -966,6 +966,15 @@ void SearchVisitor::setupAttributeVector(const FieldPath &fieldPath) {
     }
 }
 
+namespace {
+bool notContained(const std::vector<size_t> &sortList, size_t idx) {
+    for (size_t v : sortList) {
+        if (v == idx) return false;
+    }
+    return true;
+}
+}
+
 void
 SearchVisitor::setupAttributeVectorsForSorting(const search::common::SortSpec & sortList)
 {
@@ -977,7 +986,7 @@ SearchVisitor::setupAttributeVectorsForSorting(const search::common::SortSpec &
                 if (attr->valid()) {
                     size_t index(_attributeFields.size());
                     for(size_t j(0); j < index; j++) {
-                        if (_attributeFields[j]._field == fid) {
+                        if ((_attributeFields[j]._field == fid) && notContained(_sortList, j)) {
                             index = j;
                             _attributeFields[index]._ascending = sInfo._ascending;
                             _attributeFields[index]._converter = sInfo._converter.get();