Merge pull request #10 from vdebergue/improve-graph-ops

To-om · web-flow · commit 5e8f8f71652d · 2021-07-05T16:03:08.000+02:00
Improve graph ops
diff --git a/core/src/main/scala/org/thp/scalligraph/query/Filter.scala b/core/src/main/scala/org/thp/scalligraph/query/Filter.scala
@@ -77,7 +77,7 @@ case class NotFilter(inputFilter: InputQuery[Traversal.Unk, Traversal.Unk]) exte
       traversal: Traversal.Unk,
       authContext: AuthContext
   ): Traversal.Unk =
-    traversal.filter(_.not(t => inputFilter(publicProperties, traversalType, t, authContext)))
+    traversal.not(t => inputFilter(publicProperties, traversalType, t, authContext))
 }
 
 object YesFilter extends InputQuery[Traversal.Unk, Traversal.Unk] {
diff --git a/core/src/main/scala/org/thp/scalligraph/traversal/TraversalOps.scala b/core/src/main/scala/org/thp/scalligraph/traversal/TraversalOps.scala
@@ -111,13 +111,15 @@ trait TraversalOps extends TraversalPrinter {
     }
 
     def getCount: Long = {
-      debug("count")
-      count._toIterator.next()
+      val newTraversal = count
+      newTraversal.debug("count")
+      newTraversal._toIterator.next()
     }
 
     def getLimitedCount(threshold: Long): Long = {
-      debug(s"limitedCount($threshold)")
-      limitedCount(threshold)._toIterator.next()
+      val newTraversal = limitedCount(threshold)
+      newTraversal.debug(s"limitedCount($threshold)")
+      newTraversal._toIterator.next()
     }
 
     def head: D = {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ case class NotFilter(inputFilter: InputQuery[Traversal.Unk, Traversal.Unk]) exte`
`77`	`77`	`traversal: Traversal.Unk,`
`78`	`78`	`authContext: AuthContext`
`79`	`79`	`): Traversal.Unk =`
`80`		`- traversal.filter(_.not(t => inputFilter(publicProperties, traversalType, t, authContext)))`
	`80`	`+ traversal.not(t => inputFilter(publicProperties, traversalType, t, authContext))`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`object YesFilter extends InputQuery[Traversal.Unk, Traversal.Unk] {`
Original file line number	Diff line number	Diff line change
`@@ -111,13 +111,15 @@ trait TraversalOps extends TraversalPrinter {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`def getCount: Long = {`
`114`		`- debug("count")`
`115`		`- count._toIterator.next()`
	`114`	`+ val newTraversal = count`
	`115`	`+ newTraversal.debug("count")`
	`116`	`+ newTraversal._toIterator.next()`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`def getLimitedCount(threshold: Long): Long = {`
`119`		`- debug(s"limitedCount($threshold)")`
`120`		`- limitedCount(threshold)._toIterator.next()`
	`120`	`+ val newTraversal = limitedCount(threshold)`
	`121`	`+ newTraversal.debug(s"limitedCount($threshold)")`
	`122`	`+ newTraversal._toIterator.next()`
`121`	`123`	`}`
`122`	`124`
`123`	`125`	`def head: D = {`