diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-03-23 14:54:41 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-03-23 15:06:03 +0100 |
commit | 9b505f09092c7df8900da85b9f1d08149466c96d (patch) | |
tree | e77f48aaa7cfe3db2aedc1d77f36b25d4656cd81 | |
parent | da82f0eb66032d2e2de918bc60fe0dfb2a45d610 (diff) |
Move all max resolving to resolveMax
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/grouping/vespa/RequestBuilder.java | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/RequestBuilder.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/RequestBuilder.java index a77e83e0078..78452b36cd5 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/RequestBuilder.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/RequestBuilder.java @@ -179,16 +179,10 @@ class RequestBuilder { grpLevel.setPrecision(frame.state.precision + offset); frame.state.precision = null; } - int max = GroupingOperation.UNSPECIFIED_MAX; if (frame.state.max != null) { - max = frame.state.max; + transform.putMax(tag, frame.state.max, "group list"); + grpLevel.setMaxGroups(LOOKAHEAD + frame.state.max + offset); frame.state.max = null; - } else if (defaultMaxGroups >= 0) { - max = defaultMaxGroups; - } - if (max >= 0 && max != GroupingOperation.UNLIMITED_MAX) { - transform.putMax(tag, max, "group list"); - grpLevel.setMaxGroups(LOOKAHEAD + max + offset); } frame.grouping.getLevels().add(grpLevel); } @@ -245,13 +239,19 @@ class RequestBuilder { return (oldMax < 0) ? newMax : Math.min(oldMax, newMax); } private void resolveMax(BuildFrame frame) { - if (frame.astNode.hasMax()) { - if (isTopNAllowed(frame)) { - if (!frame.astNode.hasUnlimitedMax()) { - frame.grouping.setTopN(computeNewTopN(frame.grouping.getTopN(), frame.astNode.getMax())); - } - } else { + if (isTopNAllowed(frame)) { + if (frame.astNode.hasMax() && !frame.astNode.hasUnlimitedMax()) { + frame.grouping.setTopN(computeNewTopN(frame.grouping.getTopN(), frame.astNode.getMax())); + } + } else { + if (frame.astNode.hasUnlimitedMax()) { + frame.state.max = null; + } else if (frame.astNode.hasMax()) { frame.state.max = frame.astNode.getMax(); + } else if (frame.state.groupBy != null && defaultMaxGroups != -1) { + frame.state.max = defaultMaxGroups; + } else if (frame.state.groupBy == null && defaultMaxHits != -1) { + frame.state.max = defaultMaxHits; } } } @@ -298,17 +298,11 @@ class RequestBuilder { throw new UnsupportedOperationException("Can not label expression '" + exp + "'."); } HitsAggregationResult hits = (HitsAggregationResult)result; - int max = GroupingOperation.UNSPECIFIED_MAX; if (frame.state.max != null) { - max = frame.state.max; - frame.state.max = null; - } else if (defaultMaxHits >= 0) { - max = defaultMaxHits; - } - if (max >= 0 && max != GroupingOperation.UNLIMITED_MAX) { - transform.putMax(tag, max, "hit list"); + transform.putMax(tag, frame.state.max, "hit list"); int offset = transform.getOffset(tag); - hits.setMaxHits(LOOKAHEAD + max + offset); + hits.setMaxHits(LOOKAHEAD + frame.state.max + offset); + frame.state.max = null; } transform.putLabel(group.getTag(), tag, frame.state.label, "hit list"); } else { |