Skip to content
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

feat: refactor to make sure c row is released for UnsafeRowOpt #1943

Merged
merged 4 commits into from
Jun 14, 2022
Merged

feat: refactor to make sure c row is released for UnsafeRowOpt #1943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46df232
Refactor to make sure c row is released
tobegit3hub Jun 9, 2022
28a2e97
Create zipped dataframe only when using
tobegit3hub Jun 9, 2022
e7ff745
Set null for scala array object
tobegit3hub Jun 10, 2022
0754707
Revert setting array as var and null
tobegit3hub Jun 11, 2022
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
1 change: 0 additions & 1 deletion java/openmldb-batch/src/main/scala/com/_4paradigm/openmldb/batch/nodes/RowProjectPlan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ object RowProjectPlan {
}

// TODO: Add index column if needed
outputHybridseRow.delete()
outputInternalRow
})

Expand Down
3 changes: 2 additions & 1 deletion java/openmldb-batch/src/main/scala/com/_4paradigm/openmldb/batch/nodes/WindowAggPlan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ object WindowAggPlan {
// Combine row and internal row in the tuple for repartition
val rowRdd = repartitionDf.rdd
val internalRowRdd = repartitionDf.queryExecution.toRdd
val zippedRdd = rowRdd.zip(internalRowRdd)

val inputSchema = repartitionDf.schema

Expand Down Expand Up @@ -138,6 +137,7 @@ object WindowAggPlan {
}

val outputInternalRowRdd = if (isWindowWithUnion) {
val zippedRdd = rowRdd.zip(internalRowRdd)
zippedRdd.mapPartitionsWithIndex {
case (partitionIndex, iter) =>
val computer = WindowAggPlanUtil.createComputer(partitionIndex, hadoopConf, sparkFeConfig, windowAggConfig)
Expand All @@ -146,6 +146,7 @@ object WindowAggPlan {
}
} else {
if (isWindowSkewOptimization) {
val zippedRdd = rowRdd.zip(internalRowRdd)
zippedRdd.mapPartitionsWithIndex {
case (partitionIndex, iter) =>
val computer = WindowAggPlanUtil.createComputer(partitionIndex, hadoopConf, sparkFeConfig,
Expand Down
3 changes: 3 additions & 0 deletions java/openmldb-batch/src/main/scala/com/_4paradigm/openmldb/batch/utils/UnsafeRowUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ object UnsafeRowUtil {
// Copy and remove header for output row
CoreAPI.CopyRowToUnsafeRowBytes(hybridseRow, unsafeRowWriter.getBuffer, hybridseRowWithoutHeaderSize)

// Release memory of C row
hybridseRow.delete()

// Convert to InternalRow
val unsafeRow = unsafeRowWriter.getRow
unsafeRow.asInstanceOf[InternalRow]
Expand Down
2 changes: 0 additions & 2 deletions java/openmldb-batch/src/main/scala/com/_4paradigm/openmldb/batch/window/WindowComputer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,6 @@ class WindowComputer(config: WindowAggConfig, jit: HybridSeJitWrapper, keepIndex
}

// TODO: Add index column if needed
outputHybridseRow.delete()

outputInternalRowWithAppend
}

Expand Down