Skip to content

Changes the output label of CC to min of original ID #320

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
Apr 1, 2025
Merged

Changes the output label of CC to min of original ID #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dac6e7
Changes the output label of CC to min of original ID
architch Feb 9, 2019
9da7973
Merge branch 'master' into CC-original-label
architch Apr 1, 2025
23c771c
fix formatting and add ORIG_ID
architch Apr 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: 21 additions & 4 deletions src/main/scala/org/graphframes/lib/ConnectedComponents.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ object ConnectedComponents extends Logging {
import org.graphframes.GraphFrame._

private val COMPONENT = "component"
private val ORIG_ID = "orig_id"
private val MIN_NBR = "min_nbr"
private val CNT = "cnt"
private val CHECKPOINT_NAME_PREFIX = "connected-components"
Expand Down Expand Up @@ -435,11 +436,27 @@ object ConnectedComponents extends Logging {
logInfo(s"$logPrefix Connected components converged in ${iteration - 1} iterations.")

logInfo(s"$logPrefix Join and return component assignments with original vertex IDs.")
val output = vv
val indexedLabel = vv
.join(ee, vv(ID) === ee(DST), "left_outer")
.select(vv(ATTR), when(ee(SRC).isNull, vv(ID)).otherwise(ee(SRC)).as(COMPONENT))
.select(col(s"$ATTR.*"), col(COMPONENT))
.persist(intermediateStorageLevel)
.select(
vv(ATTR),
when(ee(SRC).isNull, vv(ID)).otherwise(ee(SRC)).as(COMPONENT),
col(ATTR + "." + ID).as(ID))
val output = if (graph.hasIntegralIdType) {
indexedLabel
.select(col(s"$ATTR.*"), col(COMPONENT))
.persist(intermediateStorageLevel)
} else {
indexedLabel
.join(
indexedLabel
.groupBy(col(COMPONENT))
.agg(min(col(ID)).as(ORIG_ID))
.select(col(COMPONENT), col(ORIG_ID)),
COMPONENT)
.select(col(s"$ATTR.*"), col(ORIG_ID).as(COMPONENT))
.persist(intermediateStorageLevel)
}

// An action must be performed on the DataFrame for the cache to load
output.count()
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/org/graphframes/lib/ConnectedComponentsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class ConnectedComponentsSuite extends SparkFunSuite with GraphFrameTestSparkCon
// note: not using agg + collect_list because collect_list is not available in 1.6.2 w/o hive
val actualComponents = actual
.select("component", "id")
.as[(Long, T)]
.as[(T, T)]
.rdd
.groupByKey()
.values
Expand Down