mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
improved sql parser. for issue #2080
This commit is contained in:
@@ -49,7 +49,7 @@ public class InsertColumnsCache {
|
||||
return null;
|
||||
}
|
||||
|
||||
public boolean put(long hashCode64, String columnsString, List<SQLExpr> columns) {
|
||||
public boolean put(long hashCode64, String columnsString, String columnsFormattedString, List<SQLExpr> columns) {
|
||||
final int bucket = ((int) hashCode64) & indexMask;
|
||||
|
||||
for (Entry entry = buckets[bucket]; entry != null; entry = entry.next) {
|
||||
@@ -58,7 +58,7 @@ public class InsertColumnsCache {
|
||||
}
|
||||
}
|
||||
|
||||
Entry entry = new Entry(hashCode64, columnsString, columns, buckets[bucket]);
|
||||
Entry entry = new Entry(hashCode64, columnsString, columnsFormattedString, columns, buckets[bucket]);
|
||||
buckets[bucket] = entry; // 并发是处理时会可能导致缓存丢失,但不影响正确性
|
||||
|
||||
return false;
|
||||
@@ -67,12 +67,14 @@ public class InsertColumnsCache {
|
||||
public final static class Entry {
|
||||
public final long hashCode64;
|
||||
public final String columnsString;
|
||||
public final String columnsFormattedString;
|
||||
public final List<SQLExpr> columns;
|
||||
public final Entry next;
|
||||
|
||||
public Entry(long hashCode64, String columnsString, List<SQLExpr> columns, Entry next) {
|
||||
public Entry(long hashCode64, String columnsString, String columnsFormattedString, List<SQLExpr> columns, Entry next) {
|
||||
this.hashCode64 = hashCode64;
|
||||
this.columnsString = columnsString;
|
||||
this.columnsFormattedString = columnsFormattedString;
|
||||
this.columns = columns;
|
||||
this.next = next;
|
||||
}
|
||||
|
||||
@@ -15,25 +15,24 @@
|
||||
*/
|
||||
package com.alibaba.druid.sql.parser;
|
||||
|
||||
import com.alibaba.druid.sql.SQLUtils;
|
||||
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
|
||||
import com.alibaba.druid.support.logging.Log;
|
||||
import com.alibaba.druid.support.logging.LogFactory;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
|
||||
public class SQLSelectListCache {
|
||||
private final String dbType;
|
||||
private final List<String> sqlCache = new ArrayList<String>();
|
||||
private final List<SQLSelectQueryBlock> queryBlockCache = new ArrayList<SQLSelectQueryBlock>();
|
||||
private final List<String> printSqlList = new ArrayList<String>();
|
||||
private final static Log LOG = LogFactory.getLog(SQLSelectListCache.class);
|
||||
private final String dbType;
|
||||
private final List<Entry> entries = new CopyOnWriteArrayList<Entry>();
|
||||
|
||||
public SQLSelectListCache(String dbType) {
|
||||
this.dbType = dbType;
|
||||
}
|
||||
|
||||
public synchronized void add(String select) {
|
||||
public void add(String select) {
|
||||
if (select == null || select.length() == 0) {
|
||||
return;
|
||||
}
|
||||
@@ -48,9 +47,23 @@ public class SQLSelectListCache {
|
||||
selectParser.accept(Token.FROM);
|
||||
selectParser.accept(Token.EOF);
|
||||
|
||||
queryBlockCache.add(queryBlock);
|
||||
printSqlList.add(queryBlock.toString());
|
||||
sqlCache.add(select.substring(6));
|
||||
entries.add(
|
||||
new Entry(select.substring(6)
|
||||
, queryBlock
|
||||
, queryBlock.toString())
|
||||
);
|
||||
|
||||
if (entries.size() > 5) {
|
||||
LOG.warn("SelectListCache is too large.");
|
||||
}
|
||||
}
|
||||
|
||||
public int getSize() {
|
||||
return entries.size();
|
||||
}
|
||||
|
||||
public void clear() {
|
||||
entries.clear();
|
||||
}
|
||||
|
||||
public boolean match(Lexer lexer, SQLSelectQueryBlock queryBlock) {
|
||||
@@ -61,12 +74,13 @@ public class SQLSelectListCache {
|
||||
int pos = lexer.pos;
|
||||
String text = lexer.text;
|
||||
|
||||
for (int i = 0; i < sqlCache.size(); i++) {
|
||||
String block = sqlCache.get(i);
|
||||
for (int i = 0; i < entries.size(); i++) {
|
||||
Entry entry = entries.get(i);
|
||||
String block = entry.sql;
|
||||
if (text.startsWith(block, pos)) {
|
||||
//SQLSelectQueryBlock queryBlockCached = queryBlockCache.get(i);
|
||||
// queryBlockCached.cloneSelectListTo(queryBlock);
|
||||
String printSql = printSqlList.get(i);
|
||||
String printSql = entry.printSql;
|
||||
queryBlock.setCachedSelectList(printSql);
|
||||
|
||||
int len = pos + block.length();
|
||||
@@ -76,4 +90,16 @@ public class SQLSelectListCache {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static class Entry {
|
||||
public final String sql;
|
||||
public final SQLSelectQueryBlock queryBlock;
|
||||
public final String printSql;
|
||||
|
||||
public Entry(String sql, SQLSelectQueryBlock queryBlock, String printSql) {
|
||||
this.sql = sql;
|
||||
this.queryBlock = queryBlock;
|
||||
this.printSql = printSql;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3134,6 +3134,8 @@ public class SQLStatementParser extends SQLParser {
|
||||
}
|
||||
|
||||
protected void parseValueClause(List<SQLInsertStatement.ValuesClause> valueClauseList, int columnSize, SQLObject parent) {
|
||||
final boolean optimizedForParameterized = lexer.isEnabled(SQLParserFeature.OptimizedForParameterized);
|
||||
|
||||
for (int i = 0; ; ++i) {
|
||||
int startPos = lexer.pos() - 1;
|
||||
|
||||
@@ -3149,17 +3151,34 @@ public class SQLStatementParser extends SQLParser {
|
||||
} else {
|
||||
valueExprList = new ArrayList<SQLExpr>();
|
||||
}
|
||||
SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(valueExprList);
|
||||
values.setParent(parent);
|
||||
|
||||
for (; ; ) {
|
||||
SQLExpr expr;
|
||||
if (lexer.token() == Token.LITERAL_INT) {
|
||||
expr = new SQLIntegerExpr(lexer.integerValue());
|
||||
if (optimizedForParameterized) {
|
||||
expr = new SQLVariantRefExpr("?");
|
||||
values.incrementReplaceCount();
|
||||
} else {
|
||||
expr = new SQLIntegerExpr(lexer.integerValue());
|
||||
}
|
||||
lexer.nextTokenComma();
|
||||
} else if (lexer.token() == Token.LITERAL_CHARS) {
|
||||
expr = new SQLCharExpr(lexer.stringVal());
|
||||
if (optimizedForParameterized) {
|
||||
expr = new SQLVariantRefExpr("?");
|
||||
values.incrementReplaceCount();
|
||||
} else {
|
||||
expr = new SQLCharExpr(lexer.stringVal());
|
||||
}
|
||||
lexer.nextTokenComma();
|
||||
} else if (lexer.token() == Token.LITERAL_NCHARS) {
|
||||
expr = new SQLNCharExpr(lexer.stringVal());
|
||||
if (optimizedForParameterized) {
|
||||
expr = new SQLVariantRefExpr("?");
|
||||
values.incrementReplaceCount();
|
||||
} else {
|
||||
expr = new SQLNCharExpr(lexer.stringVal());
|
||||
}
|
||||
lexer.nextTokenComma();
|
||||
} else {
|
||||
expr = exprParser.expr();
|
||||
@@ -3167,10 +3186,12 @@ public class SQLStatementParser extends SQLParser {
|
||||
|
||||
if (lexer.token() == Token.COMMA) {
|
||||
valueExprList.add(expr);
|
||||
expr.setParent(values);
|
||||
lexer.nextTokenValue();
|
||||
continue;
|
||||
} else if (lexer.token() == Token.RPAREN) {
|
||||
valueExprList.add(expr);
|
||||
expr.setParent(values);
|
||||
break;
|
||||
} else {
|
||||
expr = this.exprParser.primaryRest(expr);
|
||||
@@ -3188,9 +3209,6 @@ public class SQLStatementParser extends SQLParser {
|
||||
}
|
||||
}
|
||||
|
||||
SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(valueExprList);
|
||||
values.setParent(parent);
|
||||
|
||||
if (lexer.isEnabled(SQLParserFeature.KeepInsertValueClauseOriginalString)) {
|
||||
int endPos = lexer.pos();
|
||||
String orginalString = lexer.subString(startPos, endPos - startPos);
|
||||
|
||||
Reference in New Issue
Block a user