database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](mtmv) Fix npe when the id of base table in mv is lager than Integer.MAX_VALUE (#35294) (#35384)

Browse Source 
This brought by #34768
This commit is contained in:
seawinde
2024-05-24 23:27:08 +08:00
committed by GitHub
parent 9af493f3f9
commit 9c6a6893d9
4 changed files with 99 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/mv/MaterializationContext.java
View File

@ -113,12 +113,12 @@ public abstract class MaterializationContext {
viewStructInfos = MaterializedViewUtils.extractStructInfo(mvPlan, cascadesContext, new BitSet());
if (viewStructInfos.size() > 1) {
// view struct info should only have one, log error and use the first struct info
LOG.warn(String.format("view strut info is more than one, materialization name is %s, mv plan is %s",
getMaterializationQualifier(), getMvPlan().treeString()));
LOG.warn(String.format("view strut info is more than one, mv scan plan is %s, mv plan is %s",
mvScanPlan.treeString(), mvPlan.treeString()));
}
} catch (Exception exception) {
LOG.warn(String.format("construct mv struct info fail, materialization name is %s, mv plan is %s",
getMaterializationQualifier(), getMvPlan().treeString()), exception);
LOG.warn(String.format("construct mv struct info fail, mv scan plan is %s, mv plan is %s",
mvScanPlan.treeString(), mvPlan.treeString()), exception);
this.available = false;
this.structInfo = null;
return;

22
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/exploration/mv/StructInfo.java
View File

@ -119,7 +119,7 @@ public class StructInfo {
@Nullable Predicates predicates,
Map<ExpressionPosition, Map<Expression, Expression>> shuttledExpressionsToExpressionsMap,
Map<ExprId, Expression> namedExprIdAndExprMapping,
BitSet talbeIdSet) {
BitSet tableIdSet) {
this.originalPlan = originalPlan;
this.originalPlanId = originalPlanId;
this.hyperGraph = hyperGraph;
@ -128,7 +128,7 @@ public class StructInfo {
this.topPlan = topPlan;
this.bottomPlan = bottomPlan;
this.relations = relations;
this.tableBitSet = talbeIdSet;
this.tableBitSet = tableIdSet;
this.relationIdStructInfoNodeMap = relationIdStructInfoNodeMap;
this.predicates = predicates;
if (predicates == null) {
@ -159,17 +159,19 @@ public class StructInfo {
Map<ExpressionPosition, Map<Expression, Expression>> shuttledExpressionsToExpressionsMap,
Map<ExprId, Expression> namedExprIdAndExprMapping,
List<CatalogRelation> relations,
Map<RelationId, StructInfoNode> relationIdStructInfoNodeMap) {
Map<RelationId, StructInfoNode> relationIdStructInfoNodeMap,
BitSet hyperTableBitSet,
CascadesContext cascadesContext) {
// Collect relations from hyper graph which in the bottom plan firstly
BitSet hyperTableBitSet = new BitSet();
hyperGraph.getNodes().forEach(node -> {
// plan relation collector and set to map
Plan nodePlan = node.getPlan();
List<CatalogRelation> nodeRelations = new ArrayList<>();
nodePlan.accept(RELATION_COLLECTOR, nodeRelations);
relations.addAll(nodeRelations);
nodeRelations.forEach(relation -> hyperTableBitSet.set((int) relation.getTable().getId()));
nodeRelations.forEach(relation -> hyperTableBitSet.set(
cascadesContext.getStatementContext().getTableId(relation.getTable()).asInt()));
// every node should only have one relation, this is for LogicalCompatibilityContext
if (!nodeRelations.isEmpty()) {
relationIdStructInfoNodeMap.put(nodeRelations.get(0).getRelationId(), (StructInfoNode) node);
@ -308,15 +310,13 @@ public class StructInfo {
Map<ExpressionPosition, Map<Expression, Expression>> shuttledHashConjunctsToConjunctsMap =
new LinkedHashMap<>();
Map<ExprId, Expression> namedExprIdAndExprMapping = new LinkedHashMap<>();
BitSet tableBitSet = new BitSet();
boolean valid = collectStructInfoFromGraph(hyperGraph, topPlan, shuttledHashConjunctsToConjunctsMap,
namedExprIdAndExprMapping,
relationList,
relationIdStructInfoNodeMap);
// Get mapped table id in relation and set
BitSet tableBitSet = new BitSet();
for (CatalogRelation relation : relationList) {
tableBitSet.set(cascadesContext.getStatementContext().getTableId(relation.getTable()).asInt());
}
relationIdStructInfoNodeMap,
tableBitSet,
cascadesContext);
return new StructInfo(originalPlan, originalPlanId, hyperGraph, valid, topPlan, bottomPlan,
relationList, relationIdStructInfoNodeMap, null, shuttledHashConjunctsToConjunctsMap,
namedExprIdAndExprMapping, tableBitSet);