Skip to content

Commit 3cf701b

Browse files
committed
[VL] Should convert kSpillReadBufferSize and kShuffleSpillDiskWriteBufferSize to number
1 parent 9d23b46 commit 3cf701b

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

shims/common/src/main/scala/org/apache/gluten/config/GlutenConfig.scala

+16-8
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,7 @@ object GlutenConfig {
576576
val SPARK_REDACTION_REGEX = "spark.redaction.regex"
577577
val SPARK_SHUFFLE_FILE_BUFFER = "spark.shuffle.file.buffer"
578578
val SPARK_UNSAFE_SORTER_SPILL_READER_BUFFER_SIZE = "spark.unsafe.sorter.spill.reader.buffer.size"
579-
val SPARK_UNSAFE_SORTER_SPILL_READER_BUFFER_SIZE_DEFAULT: Int = 1024 * 1024
580579
val SPARK_SHUFFLE_SPILL_DISK_WRITE_BUFFER_SIZE = "spark.shuffle.spill.diskWriteBufferSize"
581-
val SPARK_SHUFFLE_SPILL_DISK_WRITE_BUFFER_SIZE_DEFAULT: Int = 1024 * 1024
582580
val SPARK_SHUFFLE_SPILL_COMPRESS = "spark.shuffle.spill.compress"
583581
val SPARK_SHUFFLE_SPILL_COMPRESS_DEFAULT: Boolean = true
584582

@@ -650,16 +648,26 @@ object GlutenConfig {
650648
(
651649
GLUTEN_COLUMNAR_TO_ROW_MEM_THRESHOLD.key,
652650
GLUTEN_COLUMNAR_TO_ROW_MEM_THRESHOLD.defaultValue.get.toString),
653-
(
654-
SPARK_UNSAFE_SORTER_SPILL_READER_BUFFER_SIZE,
655-
SPARK_UNSAFE_SORTER_SPILL_READER_BUFFER_SIZE_DEFAULT.toString),
656-
(
657-
SPARK_SHUFFLE_SPILL_DISK_WRITE_BUFFER_SIZE,
658-
SPARK_SHUFFLE_SPILL_DISK_WRITE_BUFFER_SIZE_DEFAULT.toString),
659651
(SPARK_SHUFFLE_SPILL_COMPRESS, SPARK_SHUFFLE_SPILL_COMPRESS_DEFAULT.toString)
660652
)
661653
keyWithDefault.forEach(e => nativeConfMap.put(e._1, conf.getOrElse(e._1, e._2)))
662654

655+
conf
656+
.get(SPARK_UNSAFE_SORTER_SPILL_READER_BUFFER_SIZE)
657+
.foreach(
658+
v =>
659+
nativeConfMap
660+
.put(
661+
SPARK_UNSAFE_SORTER_SPILL_READER_BUFFER_SIZE,
662+
JavaUtils.byteStringAs(v, ByteUnit.BYTE).toString))
663+
conf
664+
.get(SPARK_SHUFFLE_SPILL_DISK_WRITE_BUFFER_SIZE)
665+
.foreach(
666+
v =>
667+
nativeConfMap
668+
.put(
669+
SPARK_SHUFFLE_SPILL_DISK_WRITE_BUFFER_SIZE,
670+
JavaUtils.byteStringAs(v, ByteUnit.BYTE).toString))
663671
conf
664672
.get(SPARK_SHUFFLE_FILE_BUFFER)
665673
.foreach(

0 commit comments

Comments
 (0)