wangshuo128 commented on code in PR #17853:
URL: https://github.com/apache/doris/pull/17853#discussion_r1138324839
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/mv/SelectMaterializedIndexWithAggregate.java:
##########
@@ -780,35 +779,60 @@ private static class CheckContext {
public final LogicalOlapScan scan;
+ public final Map<ExprId, ExprId> baseExprIdToIndexExprId;
+
public CheckContext(LogicalOlapScan scan, long indexId) {
this.scan = scan;
// map<is_key, map<column_name, column>>
Map<Boolean, Map<String, Column>> nameToColumnGroupingByIsKey
= scan.getTable().getSchemaByIndexId(indexId)
.stream()
.collect(Collectors.groupingBy(
- Column::isKey,
- Collectors.toMap(Column::getNameWithoutMvPrefix,
Function.identity())));
+ Column::isKey,
+ Collectors.toMap(c ->
normalizeName(c.getNameWithoutMvPrefix()), Function.identity())));
Map<String, Column> keyNameToColumn =
nameToColumnGroupingByIsKey.get(true);
Map<String, Column> valueNameToColumn =
nameToColumnGroupingByIsKey.getOrDefault(false, ImmutableMap.of());
- Map<String, ExprId> nameToExprId = Stream.concat(
- scan.getOutput().stream(),
scan.getNonUserVisibleOutput().stream())
- .collect(Collectors.toMap(
- NamedExpression::getName,
- NamedExpression::getExprId)
- );
+ Map<String, ExprId> nameToExprId =
+ scan.getOutputByMvIndex(indexId).stream()
+ .collect(Collectors.toMap(
+ c ->
normalizeName(Column.getNameWithoutMvPrefix(c.getName())),
+ NamedExpression::getExprId
+ ));
this.exprIdToKeyColumn = keyNameToColumn.entrySet()
.stream()
.collect(Collectors.toMap(
- e -> nameToExprId.get(e.getKey()),
- Entry::getValue)
+ e -> nameToExprId.get(e.getKey()),
+ Map.Entry::getValue)
);
this.exprIdToValueColumn = valueNameToColumn.entrySet()
.stream()
.collect(Collectors.toMap(
- e -> nameToExprId.get(e.getKey()),
- Entry::getValue)
+ e -> nameToExprId.get(e.getKey()),
+ Map.Entry::getValue)
);
+ this.baseExprIdToIndexExprId = scan.getOutput().stream()
+ .filter(s -> nameToExprId.containsKey(s.getName()))
+ .collect(Collectors.toMap(Slot::getExprId,
+ e -> nameToExprId.get(e.getName())));
+ }
+
+ public boolean checkKeyColContainsKey(ExprId exprId) {
Review Comment:
```suggestion
public boolean keyColumnsContains(ExprId exprId) {
```
##########
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/mv/SelectMaterializedIndexWithAggregate.java:
##########
@@ -780,35 +779,60 @@ private static class CheckContext {
public final LogicalOlapScan scan;
+ public final Map<ExprId, ExprId> baseExprIdToIndexExprId;
+
public CheckContext(LogicalOlapScan scan, long indexId) {
this.scan = scan;
// map<is_key, map<column_name, column>>
Map<Boolean, Map<String, Column>> nameToColumnGroupingByIsKey
= scan.getTable().getSchemaByIndexId(indexId)
.stream()
.collect(Collectors.groupingBy(
- Column::isKey,
- Collectors.toMap(Column::getNameWithoutMvPrefix,
Function.identity())));
+ Column::isKey,
+ Collectors.toMap(c ->
normalizeName(c.getNameWithoutMvPrefix()), Function.identity())));
Map<String, Column> keyNameToColumn =
nameToColumnGroupingByIsKey.get(true);
Map<String, Column> valueNameToColumn =
nameToColumnGroupingByIsKey.getOrDefault(false, ImmutableMap.of());
- Map<String, ExprId> nameToExprId = Stream.concat(
- scan.getOutput().stream(),
scan.getNonUserVisibleOutput().stream())
- .collect(Collectors.toMap(
- NamedExpression::getName,
- NamedExpression::getExprId)
- );
+ Map<String, ExprId> nameToExprId =
+ scan.getOutputByMvIndex(indexId).stream()
+ .collect(Collectors.toMap(
+ c ->
normalizeName(Column.getNameWithoutMvPrefix(c.getName())),
+ NamedExpression::getExprId
+ ));
this.exprIdToKeyColumn = keyNameToColumn.entrySet()
.stream()
.collect(Collectors.toMap(
- e -> nameToExprId.get(e.getKey()),
- Entry::getValue)
+ e -> nameToExprId.get(e.getKey()),
+ Map.Entry::getValue)
);
this.exprIdToValueColumn = valueNameToColumn.entrySet()
.stream()
.collect(Collectors.toMap(
- e -> nameToExprId.get(e.getKey()),
- Entry::getValue)
+ e -> nameToExprId.get(e.getKey()),
+ Map.Entry::getValue)
);
+ this.baseExprIdToIndexExprId = scan.getOutput().stream()
+ .filter(s -> nameToExprId.containsKey(s.getName()))
+ .collect(Collectors.toMap(Slot::getExprId,
+ e -> nameToExprId.get(e.getName())));
+ }
+
+ public boolean checkKeyColContainsKey(ExprId exprId) {
+ return baseExprIdToIndexExprId.containsKey(exprId)
+ &&
exprIdToKeyColumn.containsKey(baseExprIdToIndexExprId.get(exprId));
+ }
+
+ public boolean checkValueColContainsKey(ExprId exprId) {
Review Comment:
```suggestion
public boolean valueColumnContains(ExprId exprId) {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
