Fix Select and grouping bugs

- Deep copy the grouping structure on query copy.
  It is mutable but we have neglected doing this right until now.
- Fix a bug in the previous commit where the last constructed Query.Model was shared between all instances.
- Fix a bug in the previous commit where the query string instead of the query tree was reset when a new select
  expression is set.
- Don't use deprecated method.
- Clean up Javadoc and formatting.

1 files changed, 1 insertions, 2 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java b/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java
index 12a775e0a62..58eafef79de 100644
--- a/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java
+++ b/container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java
@@ -37,7 +37,6 @@ import java.util.Set;
 // We are checking if there is a grouping expression, not if there is a raw grouping instruction property,
 // so we must run after the property is transferred to a grouping expression
 @After(GroupingQueryParser.SELECT_PARAMETER_PARSING)
-
 public class SortingDegrader extends Searcher {
 
     /** Set this to false in query.properties to turn off degrading. Default: on */
@@ -56,7 +55,7 @@ public class SortingDegrader extends Searcher {
     private boolean shouldBeDegraded(Query query, IndexFacts.Session indexFacts) {
         if (query.getRanking().getSorting() == null) return false;
         if (query.getRanking().getSorting().fieldOrders().isEmpty()) return false;
-        if ( ! GroupingRequest.getRequests(query).isEmpty()) return false;
+        if ( ! query.getSelect().getGrouping().isEmpty()) return false;
         if ( ! query.properties().getBoolean(DEGRADING, true)) return false;
 
         Index index = indexFacts.getIndex(query.getRanking().getSorting().fieldOrders().get(0).getFieldName());