Change in asterixdb[master]: Fixing issue when trailing % is after escaping Method

[AsterixDB Code Review]

>From Ayush Tripathi <ayush.tripa...@couchbase.com>:

Ayush Tripathi has uploaded this change for review. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19064 )


Change subject: Fixing issue when trailing % is after escaping Method
......................................................................

Fixing issue when trailing % is after escaping Method

Change-Id: I88661621467405cf2b37da6dcb81015467d7d759
---
M 
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ConstantUtil.java
M 
asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
2 files changed, 14 insertions(+), 2 deletions(-)



  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/64/19064/1

diff --git 
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ConstantUtil.java
 
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ConstantUtil.java
index 8bee6b2..2929585 100644
--- 
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ConstantUtil.java
+++ 
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ConstantUtil.java
@@ -23,4 +23,5 @@

     public static final String PERCENT = "%";
     public static final String UNDERSCORE = "_";
+    public static final String likeEscapeChar = "\\";
 }
diff --git 
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
 
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
index 83ca05f..f63cb57 100644
--- 
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
+++ 
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
@@ -19,8 +19,7 @@

 package org.apache.asterix.lang.sqlpp.rewrites.visitor;

-import static org.apache.asterix.common.utils.ConstantUtil.PERCENT;
-import static org.apache.asterix.common.utils.ConstantUtil.UNDERSCORE;
+import static org.apache.asterix.common.utils.ConstantUtil.*;

 import java.util.ArrayList;
 import java.util.Collections;
@@ -100,6 +99,9 @@
                 if (patternStr != null && patternStr.endsWith(PERCENT) && 
patternStr.length() > 1) {
                     String prefix = patternStr.substring(0, 
patternStr.length() - 1);
                     if (!prefix.contains(PERCENT) && 
!prefix.contains(UNDERSCORE)) {
+                        if (prefix.endsWith(likeEscapeChar)) {
+                            prefix = prefix.substring(0, prefix.length() - 1) 
+ PERCENT;
+                        }
                         return convertLikeToRange(operatorExpr, target, 
prefix);
                     }
                 }

--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19064
To unsubscribe, or for help writing mail filters, visit 
https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I88661621467405cf2b37da6dcb81015467d7d759
Gerrit-Change-Number: 19064
Gerrit-PatchSet: 1
Gerrit-Owner: Ayush Tripathi <ayush.tripa...@couchbase.com>
Gerrit-MessageType: newchange