Fix data anonymizer failures by updating legacy parser.

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
Bit-Quill · Jun 28, 2022 · d9d25ad · d9d25ad
1 parent 9e2a9ff
commit d9d25ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticSqlExprParser.java b/legacy/src/main/java/org/opensearch/sql/legacy/parser/ElasticSqlExprParser.java
@@ -146,11 +146,13 @@ public SQLExpr primary() {
             lexer.nextToken();
             String prefix = "";
             while (lexer.token() != Token.RBRACKET) {
+                /*
                 if (lexer.token() != Token.IDENTIFIER && lexer.token() != Token.INDEX
-                        && lexer.token() != Token.LITERAL_CHARS) {
+                        && lexer.token() != Token.LITERAL_CHARS && lexer.token() != Token.LITERAL_ALIAS) {
                     throw new ParserException("All items between Brackets should be identifiers , got:"
                             + lexer.token());
                 }
+                */
                 identifier.append(prefix);
                 identifier.append(lexer.stringVal());
                 prefix = " ";
@@ -496,7 +498,7 @@ public final SQLExpr primaryRest(SQLExpr expr) {
                 expr = methodInvokeExpr;
 
                 return primaryRest(expr);
-            } else if ("MATCH".equalsIgnoreCase(ident)) {
+            }/* else if ("MATCH".equalsIgnoreCase(ident)) {
                 lexer.nextToken();
                 MySqlMatchAgainstExpr matchAgainstExpr = new MySqlMatchAgainstExpr();
 
@@ -545,7 +547,7 @@ public final SQLExpr primaryRest(SQLExpr expr) {
                 expr = matchAgainstExpr;
 
                 return primaryRest(expr);
-            } else if ("CONVERT".equalsIgnoreCase(ident)) {
+            }*/ else if ("CONVERT".equalsIgnoreCase(ident)) {
                 lexer.nextToken();
                 SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr(ident);
 

diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/utils/QueryDataAnonymizer.java b/legacy/src/main/java/org/opensearch/sql/legacy/utils/QueryDataAnonymizer.java
@@ -39,7 +39,7 @@ public static String anonymizeData(String query) {
                     .replaceAll("[\\n][\\t]+", " ");
         } catch (Exception e) {
             LOG.warn("Caught an exception when anonymizing sensitive data");
-            resultQuery = query;
+            resultQuery = "";
         }
         return resultQuery;
     }