From cf82dbfb8a8cd32771818914411ebc04d4c7e86f Mon Sep 17 00:00:00 2001 From: liuneng1994 Date: Tue, 28 May 2024 17:18:04 +0800 Subject: [PATCH] fix check style --- .../gluten/vectorized/CHShuffleSplitterJniWrapper.java | 3 +-- .../src/main/scala/org/apache/gluten/GlutenConfig.scala | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHShuffleSplitterJniWrapper.java b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHShuffleSplitterJniWrapper.java index 55514e174475f..815bf472c027a 100644 --- a/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHShuffleSplitterJniWrapper.java +++ b/backends-clickhouse/src/main/java/org/apache/gluten/vectorized/CHShuffleSplitterJniWrapper.java @@ -74,8 +74,7 @@ public long makeForRSS( boolean throwIfMemoryExceed, boolean flushBlockBufferBeforeEvict, boolean forceExternalSort, - boolean forceMemorySort - ) { + boolean forceMemorySort) { return nativeMakeForRSS( part.getShortName(), part.getNumPartitions(), diff --git a/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala b/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala index 3d35f25724282..6659a42c71f96 100644 --- a/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala +++ b/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala @@ -299,10 +299,11 @@ class GlutenConfig(conf: SQLConf) extends Logging { def chColumnarShuffleSpillThreshold: Long = { val threshold = conf.getConf(COLUMNAR_CH_SHUFFLE_SPILL_THRESHOLD) - if (threshold == 0) + if (threshold == 0) { (conf.getConf(COLUMNAR_TASK_OFFHEAP_SIZE_IN_BYTES) * 0.9).toLong - else + } else { threshold + } } def chColumnarThrowIfMemoryExceed: Boolean = conf.getConf(COLUMNAR_CH_THROW_IF_MEMORY_EXCEED)