improved sql parser.

This commit is contained in:
wenshao
2017-11-06 16:58:58 +08:00
parent d94b773de9
commit d6e9cfbd4f
14 changed files with 255 additions and 20 deletions
@@ -16,6 +16,7 @@
package com.alibaba.druid.sql.parser;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.util.FnvHash;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -68,6 +69,7 @@ public class InsertColumnsCache {
public final long hashCode64;
public final String columnsString;
public final String columnsFormattedString;
public final long columnsFormattedStringHash;
public final List<SQLExpr> columns;
public final Entry next;
@@ -75,6 +77,7 @@ public class InsertColumnsCache {
this.hashCode64 = hashCode64;
this.columnsString = columnsString;
this.columnsFormattedString = columnsFormattedString;
this.columnsFormattedStringHash = FnvHash.fnv1a_64_lower(columnsFormattedString);
this.columns = columns;
this.next = next;
}
@@ -21,6 +21,7 @@ public enum SQLParserFeature {
UseInsertColumnsCache,
EnableSQLBinaryOpExprGroup,
OptimizedForParameterized,
OptimizedForForParameterizedSkipValue,
KeepComments,
SkipComments,
StrictForWall
@@ -18,6 +18,7 @@ package com.alibaba.druid.sql.parser;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.FnvHash;
import java.util.ArrayList;
import java.util.List;
@@ -47,10 +48,13 @@ public class SQLSelectListCache {
selectParser.accept(Token.FROM);
selectParser.accept(Token.EOF);
String printSql = queryBlock.toString();
long printSqlHash = FnvHash.fnv1a_64_lower(printSql);
entries.add(
new Entry(select.substring(6)
, queryBlock
, queryBlock.toString())
, printSql
, printSqlHash)
);
if (entries.size() > 5) {
@@ -80,8 +84,7 @@ public class SQLSelectListCache {
if (text.startsWith(block, pos)) {
//SQLSelectQueryBlock queryBlockCached = queryBlockCache.get(i);
// queryBlockCached.cloneSelectListTo(queryBlock);
String printSql = entry.printSql;
queryBlock.setCachedSelectList(printSql);
queryBlock.setCachedSelectList(entry.printSql, entry.printSqlHash);
int len = pos + block.length();
lexer.reset(len, text.charAt(len), Token.FROM);
@@ -92,14 +95,16 @@ public class SQLSelectListCache {
}
private static class Entry {
public final String sql;
public final String sql;
public final SQLSelectQueryBlock queryBlock;
public final String printSql;
public final String printSql;
public final long printSqlHash;
public Entry(String sql, SQLSelectQueryBlock queryBlock, String printSql) {
public Entry(String sql, SQLSelectQueryBlock queryBlock, String printSql, long printSqlHash) {
this.sql = sql;
this.queryBlock = queryBlock;
this.printSql = printSql;
this.printSqlHash = printSqlHash;
}
}
}
@@ -3145,7 +3145,7 @@ public class SQLStatementParser extends SQLParser {
}
protected void parseValueClause(List<SQLInsertStatement.ValuesClause> valueClauseList, int columnSize, SQLObject parent) {
final boolean optimizedForParameterized = lexer.isEnabled(SQLParserFeature.OptimizedForParameterized);
final boolean optimizedForParameterized = lexer.isEnabled(SQLParserFeature.OptimizedForForParameterizedSkipValue);
for (int i = 0; ; ++i) {
int startPos = lexer.pos() - 1;