Fix execution planning of inner TRAVERSE statements

Resolves: #8592
orientechnologies · Oct 10, 2018 · 28c3939 · 28c3939
1 parent f26edd7
commit 28c3939
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OTraverseProjectionItem.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OTraverseProjectionItem.java
@@ -40,6 +40,16 @@ private boolean isStar() {
     return base.toString().equals("*") && modifier == null;
   }
 
+  public boolean refersToParent() {
+    if (base != null && base.refersToParent()) {
+      return true;
+    }
+    if (modifier != null && modifier.refersToParent()) {
+      return true;
+    }
+    return false;
+  }
+
   private Object handleStar(OResult iCurrentRecord, OCommandContext ctx) {
     Set<Object> result = new HashSet<>();
     for (String prop : iCurrentRecord.getPropertyNames()) {
@@ -101,7 +111,8 @@ public OTraverseProjectionItem copy() {
     return result;
   }
 
-  @Override public boolean equals(Object o) {
+  @Override
+  public boolean equals(Object o) {
     if (this == o)
       return true;
     if (o == null || getClass() != o.getClass())
@@ -117,7 +128,8 @@ public OTraverseProjectionItem copy() {
     return true;
   }
 
-  @Override public int hashCode() {
+  @Override
+  public int hashCode() {
     int result = (base != null ? base.hashCode() : 0);
     result = 31 * result + (modifier != null ? modifier.hashCode() : 0);
     return result;

diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OTraverseStatement.java b/core/src/main/java/com/orientechnologies/orient/core/sql/parser/OTraverseStatement.java
@@ -142,6 +142,19 @@ public void toString(Map<Object, Object> params, StringBuilder builder) {
 
   }
 
+  public boolean refersToParent() {
+    if (projections != null && projections.stream().anyMatch(x -> x.refersToParent())) {
+      return true;
+    }
+    if (this.target != null && this.target.refersToParent()) {
+      return true;
+    }
+    if (this.whileClause != null && this.whileClause.refersToParent()) {
+      return true;
+    }
+    return false;
+  }
+
   @Override
   public OStatement copy() {
     OTraverseStatement result = new OTraverseStatement(-1);