Support nested aggregation when calcite enabled #4979
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.sql.calcite.utils; | ||
|
|
||
| import com.google.common.base.Suppliers; | ||
| import java.util.function.Supplier; | ||
| import lombok.experimental.UtilityClass; | ||
| import org.apache.calcite.rel.core.Aggregate; | ||
| import org.apache.calcite.rel.hint.HintStrategyTable; | ||
| import org.apache.calcite.rel.hint.RelHint; | ||
| import org.apache.calcite.rel.logical.LogicalAggregate; | ||
| import org.apache.calcite.tools.RelBuilder; | ||
|
|
||
| @UtilityClass | ||
| public class PPLHintUtils { | ||
| private static final String HINT_AGG_ARGUMENTS = "AGG_ARGS"; | ||
| private static final String KEY_IGNORE_NULL_BUCKET = "ignoreNullBucket"; | ||
| private static final String KEY_HAS_NESTED_AGG_CALL = "hasNestedAggCall"; | ||
|
|
||
| private static final Supplier<HintStrategyTable> HINT_STRATEGY_TABLE = | ||
| Suppliers.memoize( | ||
| () -> | ||
| HintStrategyTable.builder() | ||
| .hintStrategy( | ||
| HINT_AGG_ARGUMENTS, | ||
| (hint, rel) -> { | ||
| return rel instanceof LogicalAggregate; | ||
| }) | ||
| // add more here | ||
| .build()); | ||
|
|
||
| /** | ||
| * Add hint to aggregate to indicate that the aggregate will ignore null value bucket. Notice, the | ||
| * current peek of relBuilder is expected to be LogicalAggregate. | ||
| */ | ||
| public static void addIgnoreNullBucketHintToAggregate(RelBuilder relBuilder) { | ||
| assert relBuilder.peek() instanceof LogicalAggregate | ||
| : "Hint HINT_AGG_ARGUMENTS can be added to LogicalAggregate only"; | ||
| final RelHint statHint = | ||
| RelHint.builder(HINT_AGG_ARGUMENTS).hintOption(KEY_IGNORE_NULL_BUCKET, "true").build(); | ||
| relBuilder.hints(statHint); | ||
| if (relBuilder.getCluster().getHintStrategies() == HintStrategyTable.EMPTY) { | ||
| relBuilder.getCluster().setHintStrategies(HINT_STRATEGY_TABLE.get()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Add hint to aggregate to indicate that the aggregate has nested agg call. Notice, the current | ||
| * peek of relBuilder is expected to be LogicalAggregate. | ||
| */ | ||
| public static void addNestedAggCallHintToAggregate(RelBuilder relBuilder) { | ||
| assert relBuilder.peek() instanceof LogicalAggregate | ||
| : "Hint HINT_AGG_ARGUMENTS can be added to LogicalAggregate only"; | ||
| final RelHint statHint = | ||
| RelHint.builder(HINT_AGG_ARGUMENTS).hintOption(KEY_HAS_NESTED_AGG_CALL, "true").build(); | ||
| relBuilder.hints(statHint); | ||
| if (relBuilder.getCluster().getHintStrategies() == HintStrategyTable.EMPTY) { | ||
| relBuilder.getCluster().setHintStrategies(HINT_STRATEGY_TABLE.get()); | ||
| } | ||
| } | ||
|
|
||
| /** Return true if the aggregate will ignore null value bucket. */ | ||
| public static boolean ignoreNullBucket(Aggregate aggregate) { | ||
| return aggregate.getHints().stream() | ||
| .anyMatch( | ||
| hint -> | ||
| hint.hintName.equals(PPLHintUtils.HINT_AGG_ARGUMENTS) | ||
| && hint.kvOptions.getOrDefault(KEY_IGNORE_NULL_BUCKET, "false").equals("true")); | ||
| } | ||
|
|
||
| /** Return true if the aggregate has any nested agg call. */ | ||
| public static boolean hasNestedAggCall(Aggregate aggregate) { | ||
| return aggregate.getHints().stream() | ||
| .anyMatch( | ||
| hint -> | ||
| hint.hintName.equals(PPLHintUtils.HINT_AGG_ARGUMENTS) | ||
| && hint.kvOptions | ||
| .getOrDefault(KEY_HAS_NESTED_AGG_CALL, "false") | ||
| .equals("true")); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.sql.utils; | ||
|
|
||
| import java.util.Iterator; | ||
| import java.util.LinkedList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import javax.annotation.Nullable; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.commons.lang3.tuple.Pair; | ||
| import org.opensearch.sql.data.type.ExprCoreType; | ||
| import org.opensearch.sql.data.type.ExprType; | ||
|
|
||
| public interface Utils { | ||
| static <I> List<Pair<I, Integer>> zipWithIndex(List<I> input) { | ||
| LinkedList<Pair<I, Integer>> result = new LinkedList<>(); | ||
| Iterator<I> iter = input.iterator(); | ||
| int index = 0; | ||
| while (iter.hasNext()) { | ||
| result.add(Pair.of(iter.next(), index++)); | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| /** | ||
| * Resolve the nested path from the field name. | ||
| * | ||
| * @param path the field name | ||
| * @param fieldTypes the field types | ||
| * @return the nested path if exists, otherwise null | ||
| */ | ||
| static @Nullable String resolveNestedPath(String path, Map<String, ExprType> fieldTypes) { | ||
| if (path == null || fieldTypes == null || fieldTypes.isEmpty()) { | ||
| return null; | ||
| } | ||
| boolean found = false; | ||
| String current = path; | ||
| String parent = StringUtils.substringBeforeLast(current, "."); | ||
| while (parent != null && !parent.equals(current)) { | ||
| ExprType pathType = fieldTypes.get(parent); | ||
| // Nested is mapped to ExprCoreType.ARRAY | ||
| if (pathType == ExprCoreType.ARRAY) { | ||
| found = true; | ||
| break; | ||
| } | ||
| current = parent; | ||
| parent = StringUtils.substringBeforeLast(current, "."); | ||
| } | ||
| if (found) { | ||
| return parent; | ||
| } else { | ||
| return null; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After upgraded to 1.41. this method was not called any more, change it to
createPrepare()