Skip to content

[Fix] Fix generated column, static variables should not be used in ExpressionToExpr #36824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morrySnow merged 2 commits into from
Jun 26, 2024
Merged

[Fix] Fix generated column, static variables should not be used in ExpressionToExpr #36824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b5a0ce
[Fix](nereids) fix generated column, static variables should not be u…
feiniaofeiafei Jun 25, 2024
b7e5443
[Fix]fix generated column, static variables should not be used in Exp…
feiniaofeiafei Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,14 +732,13 @@ private void generatedColumnCheck(Analyzer analyzer) throws AnalysisException {
ColumnDef columnDef = columnDefs.get(i);
nameToColumnDef.put(columnDef.getName(), Pair.of(columnDef, i));
}
SlotRefRewriteRule.initializeslotRefMap(nameToColumnDef);
List<GeneratedColumnUtil.ExprAndname> exprAndnames = Lists.newArrayList();
for (int i = 0; i < columnDefs.size(); i++) {
ColumnDef columnDef = columnDefs.get(i);
if (!columnDef.getGeneratedColumnInfo().isPresent()) {
continue;
}
SlotRefRewriteRule slotRefRewriteRule = new SlotRefRewriteRule(i);
SlotRefRewriteRule slotRefRewriteRule = new SlotRefRewriteRule(i, nameToColumnDef);
ExprRewriter rewriter = new ExprRewriter(slotRefRewriteRule);
GeneratedColumnInfo generatedColumnInfo = columnDef.getGeneratedColumnInfo().get();
Expr expr = rewriter.rewrite(generatedColumnInfo.getExpr(), analyzer);
Expand Down Expand Up @@ -830,15 +829,12 @@ private boolean checkFunctionInGeneratedColumn(FunctionCallExpr funcExpr) {
}

public static final class SlotRefRewriteRule implements ExprRewriteRule {
private static Map<String, Pair<ColumnDef, Integer>> nameToColumnDefMap = new HashMap<>();
private final Map<String, Pair<ColumnDef, Integer>> nameToColumnDefMap;
private final int index;

public SlotRefRewriteRule(int index) {
public SlotRefRewriteRule(int index, Map<String, Pair<ColumnDef, Integer>> nameToColumnDefMap) {
this.index = index;
}

public static void initializeslotRefMap(Map<String, Pair<ColumnDef, Integer>> map) {
nameToColumnDefMap = map;
this.nameToColumnDefMap = nameToColumnDefMap;
}

@Override
Expand Down
12 changes: 4 additions & 8 deletions ...ore/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,6 @@ private void generatedColumnCheck(ConnectContext ctx) {
slotRef.setType(column.getType().toCatalogDataType());
translateMap.put(slot, new SlotRefAndIdx(slotRef, i, column.getGeneratedColumnDesc().isPresent()));
}
ExpressionToExpr.initializeslotRefMap(translateMap);
PlanTranslatorContext planTranslatorContext = new PlanTranslatorContext(cascadesContext);
List<Slot> slots = Lists.newArrayList(columnToSlotReference.values());
List<GeneratedColumnUtil.ExprAndname> exprAndnames = Lists.newArrayList();
Expand All @@ -898,7 +897,7 @@ private void generatedColumnCheck(ConnectContext ctx) {
}
checkExpressionInGeneratedColumn(expr, column, nameToColumnDefinition);
TypeCoercionUtils.checkCanCastTo(expr.getDataType(), column.getType());
ExpressionToExpr translator = new ExpressionToExpr(i);
ExpressionToExpr translator = new ExpressionToExpr(i, translateMap);
Expr e = expr.accept(translator, planTranslatorContext);
info.get().setExpr(e);
exprAndnames.add(new GeneratedColumnUtil.ExprAndname(e.clone(), column.getName()));
Expand Down Expand Up @@ -998,15 +997,12 @@ boolean checkFunctionInGeneratedColumn(Expression expr) {
}

private static class ExpressionToExpr extends ExpressionTranslator {
private static Map<Slot, SlotRefAndIdx> slotRefMap;
private final Map<Slot, SlotRefAndIdx> slotRefMap;
private final int index;

public ExpressionToExpr(int index) {
public ExpressionToExpr(int index, Map<Slot, SlotRefAndIdx> slotRefMap) {
this.index = index;
}

public static void initializeslotRefMap(Map<Slot, SlotRefAndIdx> map) {
slotRefMap = map;
this.slotRefMap = slotRefMap;
}

@Override
Expand Down