Skip to content

Commit f14dd90

Browse files
committed
fix
1 parent 824e190 commit f14dd90

File tree

36 files changed

+18
-38
lines changed

36 files changed

+18
-38
lines changed

native/spark-expr/src/variance.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,8 @@ impl Accumulator for VarianceAccumulator {
245245

246246
Ok(ScalarValue::Float64(match self.count {
247247
count if count == 0.0 => None,
248-
count if count == 1.0 => {
249-
if let StatsType::Population = self.stats_type {
250-
Some(0.0)
251-
} else if self.null_on_divide_by_zero {
248+
count if count == 1.0 && StatsType::Sample == self.stats_type => {
249+
if self.null_on_divide_by_zero {
252250
None
253251
} else {
254252
Some(f64::NAN)

spark/src/main/scala/org/apache/comet/CometSparkSessionExtensions.scala

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -958,9 +958,6 @@ class CometSparkSessionExtensions
958958
normalizePlan(plan)
959959
}
960960

961-
// scalastyle:off println
962-
// println("isCometShuffleEnabled: " + isCometShuffleEnabled(conf))
963-
964961
var newPlan = transform(normalizedPlan)
965962

966963
// if the plan cannot be run fully natively then explain why (when appropriate
@@ -1189,15 +1186,9 @@ object CometSparkSessionExtensions extends Logging {
11891186
// 1. `COMET_EXEC_SHUFFLE_ENABLED` is true
11901187
// 2. `spark.shuffle.manager` is set to `CometShuffleManager`
11911188
// 3. Off-heap memory is enabled || Spark/Comet unit testing
1192-
private[comet] def isCometShuffleEnabled(conf: SQLConf): Boolean = {
1193-
// scalastyle:off println
1194-
// println("COMET_EXEC_SHUFFLE_ENABLED: " + COMET_EXEC_SHUFFLE_ENABLED.get(conf))
1195-
// println("isCometShuffleManagerEnabled: " + isCometShuffleManagerEnabled(conf))
1196-
// println("isOffHeapEnabled: " + isOffHeapEnabled(conf))
1197-
// println("isTesting: " + isTesting)
1189+
private[comet] def isCometShuffleEnabled(conf: SQLConf): Boolean =
11981190
COMET_EXEC_SHUFFLE_ENABLED.get(conf) && isCometShuffleManagerEnabled(conf) &&
1199-
(isOffHeapEnabled(conf) || isTesting)
1200-
}
1191+
(isOffHeapEnabled(conf) || isTesting)
12011192

12021193
private[comet] def getCometShuffleNotEnabledReason(conf: SQLConf): Option[String] = {
12031194
if (!COMET_EXEC_SHUFFLE_ENABLED.get(conf)) {

spark/src/test/resources/test-data/test1/_SUCCESS

Whitespace-only changes.

0 commit comments

Comments
 (0)