feat: avoid looping through the tokens every single time

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -632,6 +632,7 @@ TOKEN : /* Statement Separators */
 TOKEN : /* Operators */
 {
     <OP_GREATERTHANEQUALS: ">" (<WHITESPACE>)* "=">
+|   <OP_COSINESIMILARITY: "<=>">
 |   <OP_MINORTHANEQUALS: "<" (<WHITESPACE>)* "=">
 |   <OP_NOTEQUALSSTANDARD: "<" (<WHITESPACE>)* ">">
 |   <OP_NOTEQUALSBANG: "!" (<WHITESPACE>)* "=">
@@ -758,11 +759,15 @@ TOKEN:
         // 2) continue tokenizing after that <SPECIAL_ESC> with a new <S_CHAR_LITERAL> or any other Token
         if ( !configuration.getAsBoolean(Feature.allowBackslashEscapeCharacter)
             && matchedToken.image.contains("\\'") ) {
+
             matchedToken.image = "'" + image.substring( 0, image.indexOf("\\'") + 1 ) + "'";
             // `charLiteralIndex` defined in TokenManagerDeclaration above
             matchedToken.kind = charLiteralIndex;
             input_stream.backup(image.length() + 1 - matchedToken.image.length());
-        } else if ( configuration.getAsBoolean(Feature.allowBackslashEscapeCharacter) && matchedToken.image.contains("\\''") ) {
+
+        } else if ( configuration.getAsBoolean(Feature.allowBackslashEscapeCharacter)
+            && matchedToken.image.contains("\\''") ) {
+
             matchedToken.image = "'" + image.substring( 0, image.lastIndexOf("\\'") + 3);
             // `charLiteralIndex` defined in TokenManagerDeclaration above
             matchedToken.kind = charLiteralIndex;
@@ -771,7 +776,9 @@ TOKEN:
     }
 | < S_QUOTED_IDENTIFIER: "\"" ( "\"\"" | ~["\n","\r","\""])* "\"" | "$$" (~["$"])* "$$" | ("`" (~["\n","\r","`"])+ "`") | ( "[" (~["\n","\r","]"])* "]" ) >
     {
-        if ( !configuration.getAsBoolean(Feature.allowSquareBracketQuotation) && matchedToken.image.charAt(0) == '[' ) {
+        if ( !configuration.getAsBoolean(Feature.allowSquareBracketQuotation)
+            && matchedToken.image.charAt(0) == '[' ) {
+
             matchedToken.image = "[";
             // `squaredBracketOpenIndex` defined in TokenManagerDeclaration above
             matchedToken.kind = squaredBracketOpenIndex;
@@ -4624,7 +4631,7 @@ Expression RegularCondition() #RegularCondition:
         | "-#" { result = new JsonOperator("-#"); }
         | "<->" { result = new GeometryDistance("<->"); }
         | "<#>" { result = new GeometryDistance("<#>"); }
-        | "<=>" { result = new CosineSimilarity(); }
+        | <OP_COSINESIMILARITY> { result = new CosineSimilarity(); }
     )
 
     ( LOOKAHEAD(2) <K_PRIOR> rightExpression=ComparisonItem() { oraclePrior = EqualsTo.ORACLE_PRIOR_END; }

src/test/java/net/sf/jsqlparser/benchmark/DynamicParserRunner.java

@@ -34,7 +34,7 @@ public DynamicParserRunner(URLClassLoader loader) throws Exception {
     @Override
     public Statements parseStatements(String sql,
             ExecutorService executorService,
-            Consumer<CCJSqlParser> consumer) throws Exception {
-        return (Statements) parseStatementsMethod.invoke(null, sql, executorService, null);
+            Consumer<?> consumer) throws Exception {
+        return (Statements) parseStatementsMethod.invoke(null, sql, executorService, consumer);
     }
 }

src/test/java/net/sf/jsqlparser/benchmark/JSQLParserBenchmark.java

@@ -10,8 +10,11 @@
 package net.sf.jsqlparser.benchmark;
 
 import net.sf.jsqlparser.parser.CCJSqlParser;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.Statements;
 import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,7 +36,7 @@ public class JSQLParserBenchmark {
     SqlParserRunner runner;
 
     // @Param({ "latest", "5.2", "5.1", "5.0", "4.9", "4.8", "4.7", "4.6", "4.5" })
-    @Param({"latest", "5.2", "5.1"})
+    @Param({"latest"})
     public String version;
 
     @Setup(Level.Trial)
@@ -71,15 +74,26 @@ private Path downloadJsqlparserJar(String version) throws IOException {
         return jarFile;
     }
 
-    @Benchmark
-    public void parseSQLStatements() throws Exception {
+    //@Benchmark
+    public void parseSQLStatements(Blackhole blackhole) throws Exception {
         final Statements statements = runner.parseStatements(
                 sqlContent,
                 executorService,
-                (Consumer<CCJSqlParser>) parser -> {
-                    // No-op consumer (or you can log/validate each parser if desired)
-                });
-        assert statements.size() == 4;
+                null);
+        blackhole.consume(statements);
+    }
+
+    @Benchmark
+    public void parseQuotedText(Blackhole blackhole) throws Exception {
+        String sqlStr = "SELECT ('\\'', 'a');\n"
+                        + "INSERT INTO recycle_record (a,f) VALUES ('\\'anything', 'abc');\n"
+                        + "INSERT INTO recycle_record (a,f) VALUES ('\\'','83653692186728700711687663398101');\n";
+
+        final Statements statements = runner.parseStatements(
+                sqlStr,
+                executorService,
+                (Consumer<CCJSqlParser>) parser -> parser.withBackslashEscapeCharacter(true));
+        blackhole.consume(statements);
     }
 
     @TearDown(Level.Trial)

src/test/java/net/sf/jsqlparser/benchmark/LatestClasspathRunner.java

@@ -20,9 +20,10 @@ public class LatestClasspathRunner implements SqlParserRunner {
     @Override
     public Statements parseStatements(String sql,
             ExecutorService executorService,
-            Consumer<CCJSqlParser> consumer) throws Exception {
+            Consumer<?> consumer) throws Exception {
         return net.sf.jsqlparser.parser.CCJSqlParserUtil.parseStatements(sql, executorService,
-                consumer);
+                                                                         (Consumer<CCJSqlParser>) consumer
+        );
     }
 }
 

src/test/java/net/sf/jsqlparser/benchmark/SqlParserRunner.java

@@ -17,5 +17,5 @@
 
 public interface SqlParserRunner {
     Statements parseStatements(String sql, ExecutorService executorService,
-            Consumer<CCJSqlParser> consumer) throws Exception;
+            Consumer<?> consumer) throws Exception;
 }