Skip to content

Modify the SparkMeasure feature to be disabled by default. #5274

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
merged 2 commits into from
Oct 28, 2025
Merged

Modify the SparkMeasure feature to be disabled by default. #5274

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceba1e5
Modify the SparkMeasure feature to be disabled by default.
sjgllgh Oct 20, 2025
f356203
format code
sjgllgh Oct 20, 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
36 changes: 19 additions & 17 deletions ...spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkSqlExecutor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,23 +160,25 @@ class SparkSqlExecutor(
sparkEngineSession: SparkEngineSession,
code: String
): Option[SparkSqlMeasure] = {
val sparkMeasureType = engineExecutionContext.getProperties
.getOrDefault(SparkConfiguration.SPARKMEASURE_AGGREGATE_TYPE, "")
.toString

if (sparkMeasureType.nonEmpty) {
val outputPrefix = SparkConfiguration.SPARKMEASURE_OUTPUT_PREFIX.getValue(options)
val outputPath = FsPath.getFsPath(
outputPrefix,
LabelUtil.getUserCreator(engineExecutionContext.getLabels.toList.asJava)._1,
sparkMeasureType,
JobUtils.getJobIdFromMap(engineExecutionContext.getProperties),
new Date().getTime.toString
)
Some(new SparkSqlMeasure(sparkEngineSession.sparkSession, code, sparkMeasureType, outputPath))
} else {
None
}
Option(engineExecutionContext.getProperties.get(SparkConfiguration.SPARKMEASURE_AGGREGATE_TYPE))
.map(_.toString)
.flatMap { sparkMeasureType =>
val userName = LabelUtil.getUserCreator(engineExecutionContext.getLabels.toList.asJava)._1
val outputPrefix = SparkConfiguration.SPARKMEASURE_OUTPUT_PREFIX.getValue(options)
val timestamp = System.currentTimeMillis().toString

val outputPath = FsPath.getFsPath(
outputPrefix,
userName,
sparkMeasureType,
JobUtils.getJobIdFromMap(engineExecutionContext.getProperties),
timestamp
)

Some(
new SparkSqlMeasure(sparkEngineSession.sparkSession, code, sparkMeasureType, outputPath)
)
}
}

override protected def getExecutorIdPreFix: String = "SparkSqlExecutor_"
Expand Down
Loading