fix: corrected regression in case of let subquery and index detection

orientechnologies · Jun 17, 2024 · 0baedd4 · 0baedd4
1 parent a6303f1
commit 0baedd4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/...src/main/java/com/orientechnologies/orient/core/sql/executor/OSelectExecutionPlanner.java b/...src/main/java/com/orientechnologies/orient/core/sql/executor/OSelectExecutionPlanner.java
@@ -926,6 +926,8 @@ private static void splitLet(QueryPlanningInfo info, OCommandContext ctx) {
       while (iterator.hasNext()) {
         OLetItem item = iterator.next();
         if (item.getExpression() != null
+            && item.getExpression().getMathExpression() != null
+            && !item.getExpression().getMathExpression().isParentesis()
             && (item.getExpression().isEarlyCalculated(ctx)
                 || isUnionAllOfQueries(info, item.getVarName(), item.getExpression()))) {
           iterator.remove();

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OMathExpression.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OMathExpression.java
@@ -44,6 +44,10 @@ public boolean isIndexChain(OCommandContext ctx, OClass clazz) {
     return false;
   }
 
+  public boolean isParentesis() {
+    return false;
+  }
+
   public enum Operator {
     STAR(10) {
       @Override

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OParenthesisExpression.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OParenthesisExpression.java
@@ -32,6 +32,10 @@ public OParenthesisExpression(OExpression exp) {
     this.expression = exp;
   }
 
+  public boolean isParentesis() {
+    return true;
+  }
+
   @Override
   public Object execute(OIdentifiable iCurrentRecord, OCommandContext ctx) {
     if (expression != null) {