AqlSubqueryExecutionBlockImplExecuteImplementation use moveValueInto instead of cloneValueInto (#11213)

markuspf · web-flow · commit 41ce86054219 · 2020-03-03T11:43:26.000+01:00
* Fix memory leak in traversal

* Use move instead of clone for AqlValues
diff --git a/arangod/Aql/TraversalExecutor.cpp b/arangod/Aql/TraversalExecutor.cpp
@@ -185,18 +185,18 @@ auto TraversalExecutor::doOutput(OutputAqlItemRow& output) -> void {
     if (_infos.useVertexOutput()) {
       AqlValue vertex = _traverser.lastVertexToAqlValue();
       AqlValueGuard guard{vertex, true};
-      output.cloneValueInto(_infos.vertexRegister(), _inputRow, vertex);
+      output.moveValueInto(_infos.vertexRegister(), _inputRow, guard);
     }
     if (_infos.useEdgeOutput()) {
       AqlValue edge = _traverser.lastEdgeToAqlValue();
       AqlValueGuard guard{edge, true};
-      output.cloneValueInto(_infos.edgeRegister(), _inputRow, edge);
+      output.moveValueInto(_infos.edgeRegister(), _inputRow, guard);
     }
     if (_infos.usePathOutput()) {
       transaction::BuilderLeaser tmp(_traverser.trx());
       AqlValue path = _traverser.pathToAqlValue(*tmp.builder());
       AqlValueGuard guard{path, true};
-      output.cloneValueInto(_infos.pathRegister(), _inputRow, path);
+      output.moveValueInto(_infos.pathRegister(), _inputRow, guard);
     }
     output.advanceRow();
   }

Original file line number	Diff line number	Diff line change
`@@ -185,18 +185,18 @@ auto TraversalExecutor::doOutput(OutputAqlItemRow& output) -> void {`
`185`	`185`	`if (_infos.useVertexOutput()) {`
`186`	`186`	`AqlValue vertex = _traverser.lastVertexToAqlValue();`
`187`	`187`	`AqlValueGuard guard{vertex, true};`
`188`		`- output.cloneValueInto(_infos.vertexRegister(), _inputRow, vertex);`
	`188`	`+ output.moveValueInto(_infos.vertexRegister(), _inputRow, guard);`
`189`	`189`	`}`
`190`	`190`	`if (_infos.useEdgeOutput()) {`
`191`	`191`	`AqlValue edge = _traverser.lastEdgeToAqlValue();`
`192`	`192`	`AqlValueGuard guard{edge, true};`
`193`		`- output.cloneValueInto(_infos.edgeRegister(), _inputRow, edge);`
	`193`	`+ output.moveValueInto(_infos.edgeRegister(), _inputRow, guard);`
`194`	`194`	`}`
`195`	`195`	`if (_infos.usePathOutput()) {`
`196`	`196`	`transaction::BuilderLeaser tmp(_traverser.trx());`
`197`	`197`	`AqlValue path = _traverser.pathToAqlValue(*tmp.builder());`
`198`	`198`	`AqlValueGuard guard{path, true};`
`199`		`- output.cloneValueInto(_infos.pathRegister(), _inputRow, path);`
	`199`	`+ output.moveValueInto(_infos.pathRegister(), _inputRow, guard);`
`200`	`200`	`}`
`201`	`201`	`output.advanceRow();`
`202`	`202`	`}`