fix: correct the delete edge with single from or to

orientechnologies · Aug 24, 2023 · ec69ca0 · ec69ca0
1 parent 3f9b97d
commit ec69ca0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/...ain/java/com/orientechnologies/orient/core/sql/executor/FetchEdgesFromToVerticesStep.java b/...ain/java/com/orientechnologies/orient/core/sql/executor/FetchEdgesFromToVerticesStep.java
@@ -33,7 +33,7 @@ public class FetchEdgesFromToVerticesStep extends AbstractExecutionStep {
   private Iterator<OEdge> currentFromEdgesIter;
   private Iterator toIterator;
 
-  private Set<ORID> toList = new HashSet<>();
+  private Set<ORID> toList;
   private boolean inited = false;
 
   private OEdge nextEdge = null;
@@ -124,7 +124,7 @@ private void init() {
     fromValues = ctx.getVariable(fromAlias);
     if (fromValues instanceof Iterable && !(fromValues instanceof OIdentifiable)) {
       fromValues = ((Iterable) fromValues).iterator();
-    } else if (!(fromValues instanceof Iterator)) {
+    } else if (!(fromValues instanceof Iterator) && fromValues != null) {
       fromValues = Collections.singleton(fromValues).iterator();
     }
 
@@ -133,29 +133,31 @@ private void init() {
     toValues = ctx.getVariable(toAlias);
     if (toValues instanceof Iterable && !(toValues instanceof OIdentifiable)) {
       toValues = ((Iterable) toValues).iterator();
-    } else if (!(toValues instanceof Iterator)) {
+    } else if (!(toValues instanceof Iterator) && toValues != null) {
       toValues = Collections.singleton(toValues).iterator();
     }
 
     fromIter = (Iterator) fromValues;
 
     Iterator toIter = (Iterator) toValues;
-
-    while (toIter != null && toIter.hasNext()) {
-      Object elem = toIter.next();
-      if (elem instanceof OResult) {
-        elem = ((OResult) elem).toElement();
-      }
-      if (elem instanceof OIdentifiable && !(elem instanceof OElement)) {
-        elem = ((OIdentifiable) elem).getRecord();
-      }
-      if (!(elem instanceof OElement)) {
-        throw new OCommandExecutionException("Invalid vertex: " + elem);
+    if (toIter != null) {
+      toList = new HashSet<ORID>();
+      while (toIter.hasNext()) {
+        Object elem = toIter.next();
+        if (elem instanceof OResult) {
+          elem = ((OResult) elem).toElement();
+        }
+        if (elem instanceof OIdentifiable && !(elem instanceof OElement)) {
+          elem = ((OIdentifiable) elem).getRecord();
+        }
+        if (!(elem instanceof OElement)) {
+          throw new OCommandExecutionException("Invalid vertex: " + elem);
+        }
+        ((OElement) elem).asVertex().ifPresent(x -> toList.add(x.getIdentity()));
       }
-      ((OElement) elem).asVertex().ifPresent(x -> toList.add(x.getIdentity()));
-    }
 
-    toIterator = toList.iterator();
+      toIterator = toList.iterator();
+    }
 
     fetchNextEdge();
   }

diff --git a/...main/java/com/orientechnologies/orient/core/sql/executor/ODeleteEdgeExecutionPlanner.java b/...main/java/com/orientechnologies/orient/core/sql/executor/ODeleteEdgeExecutionPlanner.java
@@ -100,10 +100,14 @@ public OInternalExecutionPlan createExecutionPlan(
           rightExpression,
           ctx,
           enableProfiling);
+      String fromLabel = null;
+      if (leftExpression != null) {
+        fromLabel = "$__ORIENT_DELETE_EDGE_fromV";
+      }
       handleFetchFromTo(
           result,
           ctx,
-          "$__ORIENT_DELETE_EDGE_fromV",
+          fromLabel,
           "$__ORIENT_DELETE_EDGE_toV",
           className,
           targetClusterName,