diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-08-15 15:11:38 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-08-15 15:11:38 +0200 |
commit | 3ad3382721036e58dab67a0d2cc79dfa93263087 (patch) | |
tree | 317f08cb4cb2b21879ed6380b242c2104daa698c /container-search/src/main/java/com/yahoo/search/querytransform | |
parent | 506ea9c1367748ddd4ff20203fc13211d635f5a6 (diff) |
Revert "Merge pull request #6582 from vespa-engine/revert-6557-revert-6553-revert-6512-henrhoi/object-structured-grouping"
This reverts commit 506ea9c1367748ddd4ff20203fc13211d635f5a6, reversing
changes made to 4f6b34dcf9ad904f0ddb89eb506f5920360d5344.
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/querytransform')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/querytransform/SortingDegrader.java | 3 |
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()); |