diff --git a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala index c960d26c7d31..0e8718db70e0 100644 --- a/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala +++ b/backends-clickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHRuleApi.scala @@ -150,6 +150,7 @@ object CHRuleApi { .getExtendedColumnarPostRules() .foreach(each => injector.injectPost(c => intercept(each(c.session)))) injector.injectPost(c => ColumnarCollapseTransformStages(new GlutenConfig(c.sqlConf))) + injector.injectPost(_ => GenerateTransformStageId()) injector.injectPost( c => intercept( diff --git a/cpp-ch/CMakeLists.txt b/cpp-ch/CMakeLists.txt index a119e7ddc34c..3a0c74a2c3ec 100644 --- a/cpp-ch/CMakeLists.txt +++ b/cpp-ch/CMakeLists.txt @@ -113,7 +113,7 @@ else() -DENABLE_SQLITE=OFF -DENABLE_S2_GEOMETRY=OFF -DENABLE_ULID=OFF -DENABLE_MYSQL=OFF -DENABLE_BCRYPT=OFF -DENABLE_LDAP=OFF -DENABLE_MSGPACK=OFF -DUSE_REPLXX=OFF -DENABLE_CLICKHOUSE_ALL=OFF - -DENABLE_NUMACTL=OFF -DENABLE_GOOGLE_CLOUD_CPP=OFF + -DENABLE_GWP_ASAN=OFF -DENABLE_NUMACTL=OFF -DENABLE_GOOGLE_CLOUD_CPP=OFF -DENABLE_ARROW_FLIGHT=OFF -DCOMPILER_FLAGS='-fvisibility=hidden -fvisibility-inlines-hidden' -S ${CH_SOURCE_DIR} -G Ninja -B ${CH_BINARY_DIR} && cmake --build ${CH_BINARY_DIR} --target libch\" diff --git a/cpp-ch/local-engine/Common/CHUtil.cpp b/cpp-ch/local-engine/Common/CHUtil.cpp index a7c0df4777f4..d0733f560fac 100644 --- a/cpp-ch/local-engine/Common/CHUtil.cpp +++ b/cpp-ch/local-engine/Common/CHUtil.cpp @@ -790,6 +790,8 @@ void BackendInitializerUtil::initContexts(DB::Context::ConfigurationPtr config) tmp_path = std::string(buffer) + tmp_path; }; + if (!fs::exists(tmp_path)) + fs::create_directories(tmp_path); global_context->setTemporaryStoragePath(tmp_path, 0); global_context->setPath(config->getString("path", "/")); diff --git a/ep/build-clickhouse/src/package.sh b/ep/build-clickhouse/src/package.sh index 7af573f0b3c1..91d03e3920d5 100755 --- a/ep/build-clickhouse/src/package.sh +++ b/ep/build-clickhouse/src/package.sh @@ -48,7 +48,9 @@ OS_ARCH=$(uname -m) PACKAGE_NAME=gluten-${BUILD_VERSION}-${OS_VERSION}-${OS_ARCH} PACKAGE_DIR_PATH="${GLUTEN_SOURCE}"/dist/"${PACKAGE_NAME}" -spark_scala_versions=("3.2_2.12" "3.3_2.12" "3.5_2.13") +# spark_scala_versions=("3.3_2.12" "3.5_2.13") +# TODO: support spark 3.5 later +spark_scala_versions=("3.3_2.12") # cleanup working directory [[ -d "${GLUTEN_SOURCE}"/dist/"${PACKAGE_NAME}" ]] && rm -rf "${GLUTEN_SOURCE}"/dist/"${PACKAGE_NAME}"