updated the logic of semicolon handling in the sql

Manish Soni · Manish Soni · commit 96af9029cc5b · 2021-12-04T10:48:39.000+05:30
diff --git a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java
@@ -106,17 +106,13 @@ private CalciteSqlParser() {
   private static String removeTerminatingSemicolon(String sql) {
     // trim all the leading and trailing whitespaces
     sql = sql.trim();
-
-    // Check if the query has semicolon
-    int semiColonIndex = sql.lastIndexOf(';');
     int sqlLength = sql.length();
-    boolean stripSemiColon = semiColonIndex >= 0;
 
-    // check if semicolons is followed by whitespaces, only then it needs to be terminated
-    for (int i = semiColonIndex + 1; i < sqlLength && stripSemiColon; i++) {
-      stripSemiColon = Character.isWhitespace(sql.charAt(i));
+    // Terminate the semicolon only if the last character of the query is semicolon
+    if (sql.charAt(sqlLength - 1) == ';') {
+      return sql.substring(0, sqlLength - 1);
     }
-    return stripSemiColon ? sql.substring(0, semiColonIndex) : sql;
+    return sql;
   }
 
   public static PinotQuery compileToPinotQuery(String sql)
