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

[GLUTEN-8616] [VL] Make filescan limit for encrypted fallback as configurable #8621

Merged
merged 1 commit into from
Feb 7, 2025
Merged

[GLUTEN-8616] [VL] Make filescan limit for encrypted fallback as configurable #8621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxBackend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,13 @@ object VeloxBackendSettings extends BackendSettingsApi {
return None
}

val fileLimit = GlutenConfig.get.parquetEncryptionValidationFileLimit
val encryptionResult =
ParquetMetadataUtils.validateEncryption(format, rootPaths, serializableHadoopConf)
ParquetMetadataUtils.validateEncryption(
format,
rootPaths,
serializableHadoopConf,
fileLimit)
if (encryptionResult.ok()) {
None
} else {
Expand Down
5 changes: 3 additions & 2 deletions backends-velox/src/main/scala/org/apache/gluten/utils/ParquetMetadataUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ object ParquetMetadataUtils {
def validateEncryption(
format: ReadFileFormat,
rootPaths: Seq[String],
serializableHadoopConf: Option[SerializableConfiguration]
serializableHadoopConf: Option[SerializableConfiguration],
fileLimit: Int
): ValidationResult = {
if (format != ParquetReadFormat || rootPaths.isEmpty) {
return ValidationResult.succeeded
Expand All @@ -59,7 +60,7 @@ object ParquetMetadataUtils {
val fs = new Path(rootPath).getFileSystem(conf)
try {
val encryptionDetected =
checkForEncryptionWithLimit(fs, new Path(rootPath), conf, fileLimit = 10)
checkForEncryptionWithLimit(fs, new Path(rootPath), conf, fileLimit = fileLimit)
if (encryptionDetected) {
return ValidationResult.failed("Encrypted Parquet file detected.")
}
Expand Down
12 changes: 12 additions & 0 deletions shims/common/src/main/scala/org/apache/gluten/config/GlutenConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,8 @@ class GlutenConfig(conf: SQLConf) extends Logging {

def autoAdjustStageFallenNodeThreshold: Double =
getConf(AUTO_ADJUST_STAGE_RESOURCES_FALLEN_NODE_RATIO_THRESHOLD)

def parquetEncryptionValidationFileLimit: Int = getConf(ENCRYPTED_PARQUET_FALLBACK_FILE_LIMIT)
}

object GlutenConfig {
Expand Down Expand Up @@ -2310,4 +2312,14 @@ object GlutenConfig {
"count exceeds the total node count ratio.")
.doubleConf
.createWithDefault(0.5d)

val ENCRYPTED_PARQUET_FALLBACK_FILE_LIMIT =
buildConf("spark.gluten.sql.fallbackEncryptedParquet.limit")
.internal()
.doc("If supplied, `limit` number of files will be checked to determine encryption " +
"and falling back java scan")
.intConf
.checkValue(_ > 0, s"must be positive.")
.createWithDefault(10)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: checkValue is required here to ensure the data is non-negative.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


}