Skip to content

Reuse SqlNode instance created for virtually empty text node #3418

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
merged 3 commits into from
Mar 14, 2025
Merged

Reuse SqlNode instance created for virtually empty text node #3418

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2433820
Share blank nodes
nieqiurong Feb 22, 2025
9a66c60
Merge master into pr/3418
harawata Mar 12, 2025
f28e63a
Use simpler/faster `SqlNode` implementation for empty nodes
harawata Mar 12, 2025
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
20 changes: 20 additions & 0 deletions src/main/java/org/apache/ibatis/scripting/xmltags/XMLScriptBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import org.apache.ibatis.builder.BaseBuilder;
import org.apache.ibatis.builder.BuilderException;
Expand All @@ -38,6 +39,7 @@ public class XMLScriptBuilder extends BaseBuilder {
private boolean isDynamic;
private final Class<?> parameterType;
private final Map<String, NodeHandler> nodeHandlerMap = new HashMap<>();
private static final Map<String, SqlNode> emptyNodeCache = new ConcurrentHashMap<>();

public XMLScriptBuilder(Configuration configuration, XNode context) {
this(configuration, context, null);
Expand Down Expand Up @@ -80,6 +82,10 @@ protected MixedSqlNode parseDynamicTags(XNode node) {
XNode child = node.newXNode(children.item(i));
if (child.getNode().getNodeType() == Node.CDATA_SECTION_NODE || child.getNode().getNodeType() == Node.TEXT_NODE) {
String data = child.getStringBody("");
if (data.trim().isEmpty()) {
contents.add(emptyNodeCache.computeIfAbsent(data, EmptySqlNode::new));
continue;
}
TextSqlNode textSqlNode = new TextSqlNode(data);
if (textSqlNode.isDynamic()) {
contents.add(textSqlNode);
Expand Down Expand Up @@ -248,4 +254,18 @@ private SqlNode getDefaultSqlNode(List<SqlNode> defaultSqlNodes) {
}
}

private static class EmptySqlNode implements SqlNode {
private final String whitespaces;

public EmptySqlNode(String whitespaces) {
super();
this.whitespaces = whitespaces;
}

@Override
public boolean apply(DynamicContext context) {
context.appendSql(whitespaces);
return true;
}
}
}