10000 feat: add bidirectional motif pattern by goungoun · Pull Request #717 · graphframes/graphframes · GitHub
[go: up one dir, main page]
Skip to content

feat: add bidirectional motif pattern #717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SemyonSinchenko merged 3 commits into from
Oct 9, 2025
Merged

feat: add bidirectional motif pattern #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hol 8000 d shift + click to select a range
57d7f64
rewrite incomming edges
goungoun Oct 1, 2025
a7fc140
fix: implicit conversions from Array to immutable
goungoun Oct 1, 2025
7cc8da1
fix: typo
goungoun Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion core/src/main/scala/org/graphframes/pattern/patterns.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ private[graphframes] object PatternParser extends RegexParsers {
private[graphframes] object Pattern {
def parse(s: String): Seq[Pattern] = {
import PatternParser._
val result = parseAll(patterns, s) match {
val rewrittenStr: String = rewriteIncomingEdges(s)
val result = parseAll(patterns, rewrittenStr) match {
case result: Success[_] =>
result.asInstanceOf[Success[Seq[Pattern]]].get
case result: NoSuccess =>
Expand All @@ -87,6 +88,28 @@ private[graphframes] object Pattern {
result
}

/**
* Rewirte a motif string if there are incomming edges
*/
private[graphframes] def rewriteIncomingEdges(patterns: String): String = {
val reversedEdge =
"""(!*)\(([a-zA-Z0-9_]*)\)<-\[([a-zA-Z0-9_.*]*)\]-\(([a-zA-Z0-9_]*)\)""".r
val bidirectionalEdge =
"""(!*)\(([a-zA-Z0-9_]*)\)<-\[([a-zA-Z0-9_.*]*)\]->\(([a-zA-Z0-9_]*)\)""".r

val outgoingEdges: Seq[String] = patterns.split(";").toSeq.map { pattern =>
pattern.trim match {
case reversedEdge(negation, dst, edge, src) =>
s"$negation($src)-[$edge]->($dst)"
case bidirectionalEdge(negation, src, edge, dst) =>
s"$negation($src)-[$edge]->($dst);($dst)-[$edge]->($src)"
case original => original
}
}

outgoingEdges.mkString(";")
}

/**
* Checks all Patterns for validity:
* - Disallow named edges within negated terms
Expand Down
24 changes: 24 additions & 0 deletions core/src/test/scala/org/graphframes/pattern/PatternSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,30 @@ class PatternSuite extends SparkFunSuite {
AnonymousEdge(NamedVertex("_v9"), NamedVertex("v"))))
}

test("rewrite incomming edges") {
assert(Pattern.rewriteIncomingEdges("(u)<-[e]-(v);") === "(v)-[e]->(u)")
assert(Pattern.rewriteIncomingEdges("!(u)<-[e]-(v);") === "!(v)-[e]->(u)")
assert(
Pattern.rewriteIncomingEdges("(u)<-[]-(v);(u)-[e]->(v)") === "(v)-[]->(u);(u)-[e]->(v)")
assert(Pattern.rewriteIncomingEdges("(u)<-[]->(v)") === "(u)-[]->(v);(v)-[]->(u)")
assert(Pattern.rewriteIncomingEdges("(u)<-[e]->(v)") === "(u)-[e]->(v);(v)-[e]->(u)")
assert(Pattern.rewriteIncomingEdges("(u)<-[*5]-(v)") === "(v)-[*5]->(u)")
assert(Pattern.rewriteIncomingEdges("(u)<-[*5]->(v)") === "(u)-[*5]->(v);(v)-[*5]->(u)")
assert(
Pattern.rewriteIncomingEdges(
"(v1)<-[e*1..2]->(v2)") === "(v1)-[e*1..2]->(v2);(v2)-[e*1..2]->(v1)")
}

test("rewrite incomming edges and parse") {
Pattern.parse("(v)<-[e]-(u)") === Pattern.parse("(u)-[e]->(v)")
Pattern.parse("(v)<-[]-(u)") === Pattern.parse("(u)-[]->(v)")
Pattern.parse("!(v)<-[]-(u)") === Pattern.parse("!(u)-[]->(v)")
Pattern.parse("()<-[e]-()") === Pattern.parse("()-[e]->()")
Pattern.parse("(u)-[]->(v); (w)<-[]-(v); !(w)<-[]-(u)") === Pattern.parse(
"(u)-[]->(v); (v)-[]->(w); !(u)-[]->(w)")
Pattern.parse("(v)<-[*5]-(u)") === Pattern.parse("(u)-[*5]->(v)")
}

test("bad parses") {
withClue("Failed to catch parse error with lone anonymous vertex") {
intercept[InvalidParseException] {
Expand Down
0