fix merge conflicts (#1320)

apache · Jan 22, 2025 · f09f8af · f09f8af
1 parent 2e34b5f
commit f09f8af
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 2,528 deletions.
diff --git a/docs/source/contributor-guide/benchmarking.md b/docs/source/contributor-guide/benchmarking.md
@@ -24,10 +24,6 @@ benchmarking documentation and scripts are available in the [DataFusion Benchmar
 
 We also have many micro benchmarks that can be run from an IDE located [here](https://github.com/apache/datafusion-comet/tree/main/spark/src/test/scala/org/apache/spark/sql/benchmark). 
 
-### TPC-DS
-
-For TPC-DS, use `spark.comet.exec.replaceSortMergeJoin=false`.
-
 ## Current Benchmark Results
 
 - [Benchmarks derived from TPC-H](benchmark-results/tpc-h)

diff --git a/native/spark-expr/src/avg.rs b/native/spark-expr/src/avg.rs