Fix the compile issue when rebasing upstream velox to 11/7 (#3624)

apache · Nov 7, 2023 · e3eff1d · e3eff1d
1 parent a14baf3
commit e3eff1d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/ListenerApiImpl.scala b/backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/ListenerApiImpl.scala
@@ -35,7 +35,7 @@ import org.apache.commons.lang3.StringUtils
 import scala.sys.process._
 
 class ListenerApiImpl extends ListenerApi {
-  private val ARROW_VERSION = "1300"
+  private val ARROW_VERSION = "1400"
 
   override def onDriverStart(conf: SparkConf): Unit = {
     // sql table cache serializer

diff --git a/cpp/CMake/ConfigArrow.cmake b/cpp/CMake/ConfigArrow.cmake
@@ -16,11 +16,11 @@
 # under the License.
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-  set(ARROW_SHARED_LIBRARY_SUFFIX ".1300.dylib")
-  set(ARROW_SHARED_LIBRARY_PARENT_SUFFIX ".1300.0.0.dylib")
+  set(ARROW_SHARED_LIBRARY_SUFFIX ".1400.dylib")
+  set(ARROW_SHARED_LIBRARY_PARENT_SUFFIX ".1400.0.0.dylib")
 else()
-  set(ARROW_SHARED_LIBRARY_SUFFIX ".so.1300")
-  set(ARROW_SHARED_LIBRARY_PARENT_SUFFIX ".so.1300.0.0")
+  set(ARROW_SHARED_LIBRARY_SUFFIX ".so.1400")
+  set(ARROW_SHARED_LIBRARY_PARENT_SUFFIX ".so.1400.0.0")
 endif()
 
 set(ARROW_LIB_NAME "arrow")

diff --git a/cpp/velox/compute/WholeStageResultIterator.cc b/cpp/velox/compute/WholeStageResultIterator.cc
@@ -357,8 +357,6 @@ std::unordered_map<std::string, std::string> WholeStageResultIterator::getQueryC
         getConfigValue(confMap_, kMinSpillRunSize, std::to_string(256 << 20));
     configs[velox::core::QueryConfig::kSpillStartPartitionBit] =
         getConfigValue(confMap_, kSpillStartPartitionBit, "29");
-    configs[velox::core::QueryConfig::kAggregationSpillPartitionBits] =
-        getConfigValue(confMap_, kSpillPartitionBits, "2");
     configs[velox::core::QueryConfig::kJoinSpillPartitionBits] = getConfigValue(confMap_, kSpillPartitionBits, "2");
     configs[velox::core::QueryConfig::kSpillableReservationGrowthPct] =
         getConfigValue(confMap_, kSpillableReservationGrowthPct, "25");