Skip to content

Commit

Permalink
[incubator-kie-issues#1206] Removing duplication of same nodes in cod…
Browse files Browse the repository at this point in the history 
…egen
  • Loading branch information
Gabriele-Cardosi committed Jun 6, 2024
1 parent 9b89ee1 commit a6075f0
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 38 deletions.
94 changes: 57 additions & 37 deletions kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/ASTCompilerHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;

Expand Down Expand Up @@ -150,16 +151,22 @@
public class ASTCompilerHelper {

private static final Logger LOGGER = LoggerFactory.getLogger(ASTCompilerVisitor.class);
private static final String EXTENDED_FUNCTION_PACKAGE = "org.kie.dmn.feel.runtime.functions.extended";
private final ASTCompilerVisitor astCompilerVisitor;
private final BlockStmt toPopulate;
private final AtomicInteger variableCounter;
private final Map<BaseNode, NameExpr> baseNodeCache;
private final Map<Type, Expression> typeCache;
private final Map<Object, NameExpr> objectCache;
private AtomicReference<String> lastVariableName = new AtomicReference<>();
private static final String EXTENDED_FUNCTION_PACKAGE = "org.kie.dmn.feel.runtime.functions.extended";

public ASTCompilerHelper(ASTCompilerVisitor astCompilerVisitor) {
this.astCompilerVisitor = astCompilerVisitor;
toPopulate = new BlockStmt();
variableCounter = new AtomicInteger(0);
baseNodeCache = new ConcurrentHashMap<>();
typeCache = new ConcurrentHashMap<>();
objectCache = new ConcurrentHashMap<>();
}

public BlockStmt add(AtLiteralNode n) {
Expand All @@ -177,6 +184,11 @@ public BlockStmt add(BetweenNode n) {
endExpression), n.getText());
}

public BlockStmt add(BooleanNode n) {
Expression valueExpression = new BooleanLiteralExpr(n.getValue());
return addVariableDeclaratorWithObjectCreation(BOOLEANNODE_CT, NodeList.nodeList(valueExpression), n.getText());
}

public BlockStmt add(ContextEntryNode n) {
Expression nameExpression = getNodeExpression(n.getName());
Expression valueExpression = getNodeExpression(n.getValue());
Expand Down Expand Up @@ -473,11 +485,6 @@ public BlockStmt add(UnaryTestNode n) {
n.getText());
}

public BlockStmt add(BooleanNode n) {
Expression valueExpression = new BooleanLiteralExpr(n.getValue());
return addVariableDeclaratorWithObjectCreation(BOOLEANNODE_CT, NodeList.nodeList(valueExpression), n.getText());
}

public String getLastVariableName() {
return lastVariableName.get();
}
Expand Down Expand Up @@ -539,34 +546,41 @@ private BlockStmt addStatement(Statement toAdd) {
}

private Expression getTypeExpression(Type type) {
if (type instanceof AliasFEELType aliasFEELType) {
return getAliasFEELType(aliasFEELType);
} else if (type instanceof Enum typeEnum) {
return getEnumExpression(typeEnum);
} else if (type instanceof JavaBackedType javaBackedType) {
return getJavaBackedTypeExpression(javaBackedType);
} else if (type instanceof MapBackedType mapBackedType) {
return getMapBackedTypeExpression(mapBackedType);
} else {
return parseExpression(type.getClass().getCanonicalName());
if (!typeCache.containsKey(type)) {
Expression toPut;
if (type instanceof AliasFEELType aliasFEELType) {
toPut = getAliasFEELType(aliasFEELType);
} else if (type instanceof Enum typeEnum) {
toPut = getEnumExpression(typeEnum);
} else if (type instanceof JavaBackedType javaBackedType) {
toPut = getJavaBackedTypeExpression(javaBackedType);
} else if (type instanceof MapBackedType mapBackedType) {
toPut = getMapBackedTypeExpression(mapBackedType);
} else {
toPut = parseExpression(type.getClass().getCanonicalName());
}
typeCache.put(type, toPut);
}
return typeCache.get(type);
}

private Expression getAliasFEELType(AliasFEELType aliasFEELType) {
BuiltInType feelCType = aliasFEELType.getBuiltInType();
Expression typeExpression = new FieldAccessExpr(BUILTINTYPE_E, feelCType.name());
// Creating the AliasFEELType
String aliasFeelTypeVariableName = getNextVariableName();
final VariableDeclarator aliasFeelTypeVariableDeclarator =
new VariableDeclarator(ALIASFEELTYPE_CT, aliasFeelTypeVariableName);
NodeList<Expression> arguments = NodeList.nodeList(new StringLiteralExpr(aliasFEELType.getName()), typeExpression);
final ObjectCreationExpr objectCreationExpr = new ObjectCreationExpr(null, ALIASFEELTYPE_CT,
arguments);
aliasFeelTypeVariableDeclarator.setInitializer(objectCreationExpr);
VariableDeclarationExpr mapVariableDeclarationExpr = new VariableDeclarationExpr(aliasFeelTypeVariableDeclarator);
addExpression(mapVariableDeclarationExpr, aliasFeelTypeVariableName);
return new NameExpr(aliasFeelTypeVariableName);
}
private Expression getAliasFEELType(AliasFEELType aliasFEELType) {
BuiltInType feelCType = aliasFEELType.getBuiltInType();
Expression typeExpression = new FieldAccessExpr(BUILTINTYPE_E, feelCType.name());
// Creating the AliasFEELType
String aliasFeelTypeVariableName = getNextVariableName();
final VariableDeclarator aliasFeelTypeVariableDeclarator =
new VariableDeclarator(ALIASFEELTYPE_CT, aliasFeelTypeVariableName);
NodeList<Expression> arguments = NodeList.nodeList(new StringLiteralExpr(aliasFEELType.getName()),
typeExpression);
final ObjectCreationExpr objectCreationExpr = new ObjectCreationExpr(null, ALIASFEELTYPE_CT,
arguments);
aliasFeelTypeVariableDeclarator.setInitializer(objectCreationExpr);
VariableDeclarationExpr mapVariableDeclarationExpr =
new VariableDeclarationExpr(aliasFeelTypeVariableDeclarator);
addExpression(mapVariableDeclarationExpr, aliasFeelTypeVariableName);
return new NameExpr(aliasFeelTypeVariableName);
}

private Expression getJavaBackedTypeExpression(JavaBackedType javaBackedType) {
// Creating the JavaBackedType
Expand Down Expand Up @@ -613,16 +627,22 @@ private Expression getObjectExpression(Object object) {
if (object == null) {
return new NullLiteralExpr();
}
String variableName = getNextVariableName();
Expression objectExpression = CodegenUtils.getObjectExpression(object, variableName);
addExpression(objectExpression, variableName);
return new NameExpr(variableName);
if (!objectCache.containsKey(object)) {
String variableName = getNextVariableName();
Expression objectExpression = CodegenUtils.getObjectExpression(object, variableName);
addExpression(objectExpression, variableName);
objectCache.put(object, new NameExpr(lastVariableName.get()));
}
return objectCache.get(object);
}

private Expression getNodeExpression(BaseNode node) {
if (node != null) {
node.accept(astCompilerVisitor);
return new NameExpr(lastVariableName.get());
if (!baseNodeCache.containsKey(node)) {
node.accept(astCompilerVisitor);
baseNodeCache.put(node, new NameExpr(lastVariableName.get()));
}
return baseNodeCache.get(node);
} else {
return new NullLiteralExpr();
}
Expand Down
1 change: 0 additions & 1 deletion ...mn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/CompilerBytecodeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ public <T> T compileUnit(String cuPackage, String cuClass, CompilationUnit cu)
Class<T> loaded =
(Class<T>) new TemplateLoader(Thread.currentThread().getContextClassLoader()).load(pStore,
fqnClassName);

return loaded.newInstance();
} catch (Exception e) {
LOG.error("Exception", e);
Expand Down
17 changes: 17 additions & 0 deletions kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/BaseNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.kie.dmn.feel.lang.ast;

import java.util.Objects;
import java.util.function.Supplier;

import org.antlr.v4.runtime.ParserRuleContext;
Expand Down Expand Up @@ -162,4 +163,20 @@ public ASTNode[] getChildrenNode() {
public <T> T accept(Visitor<T> v) {
return v.visit(this);
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof BaseNode baseNode)) {
return false;
}
return Objects.equals(this.getClass(), o.getClass()) && Objects.equals(text, baseNode.text);
}

@Override
public int hashCode() {
return Objects.hash(text);
}
}

0 comments on commit a6075f0

Please sign in to comment.