From cb053fd844a01b158909c589bfbb665caf3197bc Mon Sep 17 00:00:00 2001 From: bytesmithing <261807903@qq.com> Date: Wed, 16 Dec 2020 22:58:30 +0800 Subject: [PATCH] fix typo: aggrete -> aggregate keywod -> keyword Localtion -> location --- .../sql/dialect/ads/parser/AdsLexer.java | 4 +-- .../antspark/parser/AntsparkLexer.java | 2 +- .../sql/dialect/blink/parser/BlinkLexer.java | 4 +-- .../clickhouse/parser/ClickhouseLexer.java | 4 +-- .../sql/dialect/db2/parser/DB2Lexer.java | 4 +-- .../druid/sql/dialect/h2/parser/H2Lexer.java | 4 +-- .../sql/dialect/hive/parser/HiveLexer.java | 4 +-- .../sql/dialect/mysql/parser/MySqlLexer.java | 8 ++--- .../sql/dialect/odps/parser/OdpsLexer.java | 8 ++--- .../dialect/oracle/parser/OracleLexer.java | 8 ++--- .../dialect/phoenix/parser/PhoenixLexer.java | 2 +- .../dialect/postgresql/parser/PGLexer.java | 2 +- .../dialect/presto/parser/PrestoLexer.java | 2 +- .../sqlserver/parser/SQLServerLexer.java | 6 ++-- .../com/alibaba/druid/sql/parser/Lexer.java | 16 +++++----- .../druid/sql/parser/SQLExprParser.java | 30 +++++++++---------- 16 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsLexer.java index 6c7c522527..539940b890 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/ads/parser/AdsLexer.java @@ -34,12 +34,12 @@ public class AdsLexer extends Lexer { public AdsLexer(String input) { super(input); dbType = DbType.ads; - super.keywods = DEFAULT_ADS_KEYWORDS; + super.keywords = DEFAULT_ADS_KEYWORDS; } public AdsLexer(String input, SQLParserFeature... features){ super(input); - super.keywods = DEFAULT_ADS_KEYWORDS; + super.keywords = DEFAULT_ADS_KEYWORDS; for (SQLParserFeature feature : features) { config(feature, true); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkLexer.java index 9590bf0323..98014c79be 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/antspark/parser/AntsparkLexer.java @@ -49,7 +49,7 @@ public class AntsparkLexer extends Lexer { public AntsparkLexer(String input) { super(input); dbType= DbType.antspark; - super.keywods = DEFAULT_ANTSPARK_KEYWORDS; + super.keywords = DEFAULT_ANTSPARK_KEYWORDS; } } \ No newline at end of file diff --git a/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkLexer.java index 9d116e6622..0ccf723c5b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/blink/parser/BlinkLexer.java @@ -33,13 +33,13 @@ public class BlinkLexer extends Lexer { public BlinkLexer(String input){ super(input); - super.keywods = DEFAULT_BLINK_KEYWORDS; + super.keywords = DEFAULT_BLINK_KEYWORDS; dbType = DbType.blink; } public BlinkLexer(String input, SQLParserFeature... features){ super(input); - super.keywods = DEFAULT_BLINK_KEYWORDS; + super.keywords = DEFAULT_BLINK_KEYWORDS; dbType = DbType.blink; for (SQLParserFeature feature : features) { config(feature, true); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java index a8acd4d8f2..dceb7838c1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/clickhouse/parser/ClickhouseLexer.java @@ -35,12 +35,12 @@ public class ClickhouseLexer extends Lexer { public ClickhouseLexer(String input) { super(input); dbType = DbType.clickhouse; - super.keywods = DEFAULT_KEYWORDS; + super.keywords = DEFAULT_KEYWORDS; } public ClickhouseLexer(String input, SQLParserFeature... features){ super(input); - super.keywods = DEFAULT_KEYWORDS; + super.keywords = DEFAULT_KEYWORDS; for (SQLParserFeature feature : features) { config(feature, true); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java index 4466e5fbae..afd8978105 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java @@ -50,12 +50,12 @@ public class DB2Lexer extends Lexer { public DB2Lexer(String input){ super(input); - super.keywods = DEFAULT_DB2_KEYWORDS; + super.keywords = DEFAULT_DB2_KEYWORDS; } public DB2Lexer(String input, SQLParserFeature... features){ super(input); - super.keywods = DEFAULT_DB2_KEYWORDS; + super.keywords = DEFAULT_DB2_KEYWORDS; for (SQLParserFeature feature : features) { config(feature, true); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java index e23a84453d..48af73bce6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java @@ -47,12 +47,12 @@ public class H2Lexer extends Lexer { public H2Lexer(String input){ super(input, null, DbType.h2); - super.keywods = DEFAULT_H2_KEYWORDS; + super.keywords = DEFAULT_H2_KEYWORDS; } public H2Lexer(String input, SQLParserFeature... features){ super(input, null, DbType.h2); - super.keywods = DEFAULT_H2_KEYWORDS; + super.keywords = DEFAULT_H2_KEYWORDS; for (SQLParserFeature feature : features) { config(feature, true); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java index 699a38b2a5..7e15ac9209 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java @@ -60,7 +60,7 @@ public class HiveLexer extends Lexer { this.keepComments = true; dbType = DbType.hive; this.features |= SQLParserFeature.SupportUnicodeCodePoint.mask; - super.keywods = DEFAULT_HIVE_KEYWORDS; + super.keywords = DEFAULT_HIVE_KEYWORDS; } public HiveLexer(String input, SQLParserFeature... features){ @@ -68,7 +68,7 @@ public class HiveLexer extends Lexer { dbType = DbType.hive; this.skipComment = true; this.keepComments = true; - super.keywods = DEFAULT_HIVE_KEYWORDS; + super.keywords = DEFAULT_HIVE_KEYWORDS; this.features |= SQLParserFeature.SupportUnicodeCodePoint.mask; for (SQLParserFeature feature : features) { config(feature, true); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java index f1b8b0fb83..e8fae62bd9 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java @@ -75,7 +75,7 @@ public class MySqlLexer extends Lexer { public MySqlLexer(char[] input, int inputLength, boolean skipComment){ super(input, inputLength, skipComment); - super.keywods = DEFAULT_MYSQL_KEYWORDS; + super.keywords = DEFAULT_MYSQL_KEYWORDS; } public MySqlLexer(String input){ @@ -85,7 +85,7 @@ public class MySqlLexer extends Lexer { public MySqlLexer(String input, SQLParserFeature... features){ super(input, true); this.keepComments = true; - super.keywods = DEFAULT_MYSQL_KEYWORDS; + super.keywords = DEFAULT_MYSQL_KEYWORDS; for (SQLParserFeature feature : features) { config(feature, true); @@ -96,7 +96,7 @@ public class MySqlLexer extends Lexer { super(input, skipComment); this.skipComment = skipComment; this.keepComments = keepComments; - super.keywods = DEFAULT_MYSQL_KEYWORDS; + super.keywords = DEFAULT_MYSQL_KEYWORDS; } public void scanSharp() { @@ -443,7 +443,7 @@ public class MySqlLexer extends Lexer { return; } - Token tok = keywods.getKeyword(hash_lower); + Token tok = keywords.getKeyword(hash_lower); if (tok != null) { token = tok; if (token == Token.IDENTIFIER) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java index 6cc58ad47c..021dd3c22f 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/odps/parser/OdpsLexer.java @@ -55,7 +55,7 @@ public class OdpsLexer extends Lexer { public OdpsLexer(String input, SQLParserFeature... features){ super(input); dbType = DbType.odps; - super.keywods = DEFAULT_ODPS_KEYWORDS; + super.keywords = DEFAULT_ODPS_KEYWORDS; this.skipComment = true; this.keepComments = false; @@ -69,13 +69,13 @@ public class OdpsLexer extends Lexer { dbType = DbType.odps; this.skipComment = skipComment; this.keepComments = keepComments; - super.keywods = DEFAULT_ODPS_KEYWORDS; + super.keywords = DEFAULT_ODPS_KEYWORDS; } public OdpsLexer(String input, CommentHandler commentHandler){ super(input, commentHandler); dbType = DbType.odps; - super.keywods = DEFAULT_ODPS_KEYWORDS; + super.keywords = DEFAULT_ODPS_KEYWORDS; } public void scanComment() { @@ -167,7 +167,7 @@ public class OdpsLexer extends Lexer { this.ch = charAt(pos); stringVal = addSymbol(); - Token tok = keywods.getKeyword(stringVal); + Token tok = keywords.getKeyword(stringVal); if (tok != null) { token = tok; } else { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java index 5650b2d68d..67c7eb3d06 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java @@ -120,21 +120,21 @@ public class OracleLexer extends Lexer { public OracleLexer(char[] input, int inputLength, boolean skipComment){ super(input, inputLength, skipComment); - super.keywods = DEFAULT_ORACLE_KEYWORDS; + super.keywords = DEFAULT_ORACLE_KEYWORDS; } public OracleLexer(String input){ super(input); this.skipComment = true; this.keepComments = true; - super.keywods = DEFAULT_ORACLE_KEYWORDS; + super.keywords = DEFAULT_ORACLE_KEYWORDS; } public OracleLexer(String input, SQLParserFeature... features){ super(input); this.skipComment = true; this.keepComments = true; - super.keywods = DEFAULT_ORACLE_KEYWORDS; + super.keywords = DEFAULT_ORACLE_KEYWORDS; for (SQLParserFeature feature : features) { config(feature, true); @@ -212,7 +212,7 @@ public class OracleLexer extends Lexer { this.ch = charAt(pos); stringVal = addSymbol(); - Token tok = keywods.getKeyword(stringVal); + Token tok = keywords.getKeyword(stringVal); if (tok != null) { token = tok; } else { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixLexer.java index 3279b9b681..fed8596b89 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/phoenix/parser/PhoenixLexer.java @@ -52,7 +52,7 @@ public class PhoenixLexer extends Lexer { public PhoenixLexer(String input, SQLParserFeature... features){ super(input); - super.keywods = DEFAULT_PHOENIX_KEYWORDS; + super.keywords = DEFAULT_PHOENIX_KEYWORDS; for (SQLParserFeature feature : features) { config(feature, true); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java index ba07542f55..47d915947d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java @@ -78,7 +78,7 @@ public class PGLexer extends Lexer { public PGLexer(String input, SQLParserFeature... features){ super(input, true); this.keepComments = true; - super.keywods = DEFAULT_PG_KEYWORDS; + super.keywords = DEFAULT_PG_KEYWORDS; super.dbType = DbType.postgresql; for (SQLParserFeature feature : features) { config(feature, true); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoLexer.java index 309dde4af9..359ac9816e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/presto/parser/PrestoLexer.java @@ -39,7 +39,7 @@ public class PrestoLexer extends Lexer { public PrestoLexer(String input, SQLParserFeature... features){ super(input); - super.keywods = DEFAULT_PHOENIX_KEYWORDS; + super.keywords = DEFAULT_PHOENIX_KEYWORDS; for (SQLParserFeature feature : features) { config(feature, true); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java index 37eccfc244..08c418b4a8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java @@ -53,17 +53,17 @@ public class SQLServerLexer extends Lexer { public SQLServerLexer(char[] input, int inputLength, boolean skipComment){ super(input, inputLength, skipComment); - super.keywods = DEFAULT_SQL_SERVER_KEYWORDS; + super.keywords = DEFAULT_SQL_SERVER_KEYWORDS; } public SQLServerLexer(String input){ super(input); - super.keywods = DEFAULT_SQL_SERVER_KEYWORDS; + super.keywords = DEFAULT_SQL_SERVER_KEYWORDS; } public SQLServerLexer(String input, SQLParserFeature... features){ super(input); - super.keywods = DEFAULT_SQL_SERVER_KEYWORDS; + super.keywords = DEFAULT_SQL_SERVER_KEYWORDS; for (SQLParserFeature feature : features) { config(feature, true); } diff --git a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java index 792d9b2250..84f743f59b 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java @@ -82,7 +82,7 @@ public class Lexer { protected Token token; - protected Keywords keywods = Keywords.DEFAULT_KEYWORDS; + protected Keywords keywords = Keywords.DEFAULT_KEYWORDS; protected String stringVal; protected long hash_lower; // fnv1a_64 @@ -106,7 +106,7 @@ public class Lexer { protected DbType dbType; protected boolean optimizedForParameterized = false; - protected boolean keepSourceLocaltion = false; + protected boolean keepSourceLocation = false; protected int startPos; protected int posLine; @@ -131,9 +131,9 @@ public class Lexer { this.dbType = dbType; if (DbType.sqlite == dbType) { - this.keywods = Keywords.SQLITE_KEYWORDS; + this.keywords = Keywords.SQLITE_KEYWORDS; } else if (DbType.dm == dbType) { - this.keywods = Keywords.DM_KEYWORDS; + this.keywords = Keywords.DM_KEYWORDS; } } @@ -214,8 +214,8 @@ public class Lexer { String stringVal; } - public Keywords getKeywods() { - return keywods; + public Keywords getKeywords() { + return keywords; } public SavePoint mark() { @@ -2337,7 +2337,7 @@ public class Lexer { return; } - Token tok = keywods.getKeyword(hash_lower); + Token tok = keywords.getKeyword(hash_lower); if (tok != null) { token = tok; if (token == Token.IDENTIFIER) { @@ -2858,7 +2858,7 @@ public class Lexer { } else if (feature == KeepComments) { this.keepComments = state; } else if (feature == KeepSourceLocation) { - this.keepSourceLocaltion = state; + this.keepSourceLocation = state; } else if (feature == SkipComments) { this.skipComment = state; } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index 7e39babb44..3493039c82 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -365,7 +365,7 @@ public class SQLExprParser extends SQLParser { long hash_lower = lexer.hash_lower(); int sourceLine = -1, sourceColumn = -1; - if (lexer.keepSourceLocaltion) { + if (lexer.keepSourceLocation) { lexer.computeRowAndColumn(); sourceLine = lexer.posLine; sourceColumn = lexer.posColumn; @@ -1539,20 +1539,20 @@ public class SQLExprParser extends SQLParser { if (distinct) { aggMethodName = methodName; } else { - aggMethodName = getAggreateFunction(hash_lower); + aggMethodName = getAggregateFunction(hash_lower); } } else if (expr instanceof SQLPropertyExpr) { methodName = ((SQLPropertyExpr) expr).getSimpleName(); aggMethodName = SQLUtils.normalize(methodName); hash_lower = FnvHash.fnv1a_64_lower(aggMethodName); - aggMethodName = getAggreateFunction(hash_lower); + aggMethodName = getAggregateFunction(hash_lower); owner = ((SQLPropertyExpr) expr).getOwner(); } else if (expr instanceof SQLDefaultExpr) { methodName = "DEFAULT"; } else if (expr instanceof SQLCharExpr) { methodName = ((SQLCharExpr) expr).getText(); - if (isAggreateFunction(methodName)) { + if (isAggregateFunction(methodName)) { aggMethodName = methodName; } } else if (expr instanceof SQLDbLinkExpr) { @@ -1731,7 +1731,7 @@ public class SQLExprParser extends SQLParser { || lexer.token == Token.LITERAL_ALIAS) { name = lexer.stringVal(); lexer.nextToken(); - } else if (lexer.getKeywods().containsValue(lexer.token)) { + } else if (lexer.getKeywords().containsValue(lexer.token)) { name = lexer.stringVal(); lexer.nextToken(); } else if (lexer.token == Token.VARIANT && lexer.stringVal().startsWith("$")) { @@ -2040,7 +2040,7 @@ public class SQLExprParser extends SQLParser { } SQLIdentifierExpr identifierExpr = new SQLIdentifierExpr(identName, hash); - if (lexer.keepSourceLocaltion) { + if (lexer.keepSourceLocation) { lexer.computeRowAndColumn(); identifierExpr.setSourceLine(lexer.posLine); identifierExpr.setSourceColumn(lexer.posColumn); @@ -2064,7 +2064,7 @@ public class SQLExprParser extends SQLParser { } if (lexer.token != Token.LITERAL_ALIAS && lexer.token != Token.IDENTIFIER - && (!lexer.getKeywods().containsValue(lexer.token))) { + && (!lexer.getKeywords().containsValue(lexer.token))) { throw new ParserException("error, " + lexer.info()); } @@ -2081,16 +2081,16 @@ public class SQLExprParser extends SQLParser { return name; } - public boolean isAggreateFunction(String word) { + public boolean isAggregateFunction(String word) { long hash_lower = FnvHash.fnv1a_64_lower(word); - return isAggreateFunction(hash_lower); + return isAggregateFunction(hash_lower); } - protected boolean isAggreateFunction(long hash_lower) { + protected boolean isAggregateFunction(long hash_lower) { return Arrays.binarySearch(aggregateFunctionHashCodes, hash_lower) >= 0; } - protected String getAggreateFunction(long hash_lower) { + protected String getAggregateFunction(long hash_lower) { int index = Arrays.binarySearch(aggregateFunctionHashCodes, hash_lower); if (index < 0) { return null; @@ -5049,9 +5049,9 @@ public class SQLExprParser extends SQLParser { if (strVal.startsWith("--")) { strVal = strVal.substring(2); } - SQLIntegerExpr intergerExpr = SQLIntegerExpr.ofIntOrLong(Long.parseLong(strVal)); - intergerExpr.setType("INTEGER"); - expr = intergerExpr; + SQLIntegerExpr integerExpr = SQLIntegerExpr.ofIntOrLong(Long.parseLong(strVal)); + integerExpr.setType("INTEGER"); + expr = integerExpr; lexer.nextToken(); } else if (hash_lower == FnvHash.Constants.SMALLINT && lexer.token == Token.LITERAL_CHARS) { @@ -5294,7 +5294,7 @@ public class SQLExprParser extends SQLParser { hash_lower = FnvHash.hashCode64(ident); } SQLIdentifierExpr identifierExpr = new SQLIdentifierExpr(ident, hash_lower); - if (lexer.keepSourceLocaltion) { + if (lexer.keepSourceLocation) { lexer.computeRowAndColumn(); identifierExpr.setSourceLine(lexer.posLine); identifierExpr.setSourceColumn(lexer.posColumn);