Skip to content

Commit

Permalink
[CH][CELEBORN] CHCelebornColumnarShuffleWriter supports celeborn.clie…
Browse files Browse the repository at this point in the history
…nt.spark.shuffle.writer to use memory sort shuffle in ClickHouse backend (#6454)

[CH][CELEBORN] CHCelebornColumnarShuffleWriter supports celeborn.client.spark.shuffle.writer to use memory sort shuffle in ClickHouse backend
  • Loading branch information
SteNicholas authored Jul 15, 2024
1 parent 8883b5b commit de26785
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/clickhouse_be_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ on:
- '.github/workflows/clickhouse_be_trigger.yml'
- 'pom.xml'
- 'backends-clickhouse/**'
- 'gluten-celeborn/common'
- 'gluten-celeborn/package'
- 'gluten-celeborn/clickhouse'
- 'gluten-celeborn/common/**'
- 'gluten-celeborn/package/**'
- 'gluten-celeborn/clickhouse/**'
- 'gluten-core/**'
- 'gluten-ut/**'
- 'shims/**'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class CHCelebornColumnarShuffleWriter[K, V](
if (cb.numRows == 0 || cb.numCols == 0) {
logInfo(s"Skip ColumnarBatch of ${cb.numRows} rows, ${cb.numCols} cols")
} else {
initShuffleWriter()
initShuffleWriter(cb)
val col = cb.column(0).asInstanceOf[CHColumnVector]
jniWrapper.split(nativeShuffleWriter, col.getBlockAddress)
dep.metrics("numInputRows").add(cb.numRows)
Expand Down Expand Up @@ -118,7 +118,8 @@ class CHCelebornColumnarShuffleWriter[K, V](
if (nativeShuffleWriter == -1L) {
throw new IllegalStateException(
"Fatal: spill() called before a celeborn shuffle writer is created. " +
"This behavior should be optimized by moving memory allocations from make() to split()")
"This behavior should be optimized by moving memory allocations " +
"from make() to split()")
}
logInfo(s"Gluten shuffle writer: Trying to push $size bytes of data")
val spilled = jniWrapper.evict(nativeShuffleWriter)
Expand Down

0 comments on commit de26785

Please sign in to comment.