Merge branch 'master' into add_tpch_suite

Author: yew1eb

.asf.yaml

@@ -24,5 +24,6 @@ github:
     - arrow
   enabled_merge_buttons:
     squash: true
+    squash_commit_message: PR_TITLE_AND_DESC
     merge: false
     rebase: false

.github/pull_request_template.md

@@ -1,42 +1,14 @@
 <!--
-Thanks for sending a pull request!  Please keep the following tips in mind:
   - Start the PR title with the related issue ID, e.g. '[AURON #XXXX] Short summary...'.
-  - Make your PR title clear and descriptive, summarizing what this PR changes.
-  - Provide a concise example to reproduce the issue, if possible.
-  - Keep the PR description up to date with all changes.
 -->
-
 # Which issue does this PR close?
 
-<!--
-We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
--->
-
-Closes #.
+Closes #<issue_number>
 
- # Rationale for this change
-<!--
- Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
- Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.  
--->
+# Rationale for this change
 
 # What changes are included in this PR?
-<!--
-There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
--->
 
 # Are there any user-facing changes?
-<!--
-If there are user-facing changes then we may require documentation to be updated before approving the PR.
--->
-
-<!--
-If there are any breaking changes to public APIs, please add the `api change` label.
--->
 
 # How was this patch tested?
-<!--
-If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
-If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
-If tests were not added, please describe why they were not added and/or why it was difficult to add.
--->

.github/workflows/tpcds-reusable.yml

@@ -190,9 +190,14 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: unit-tests-${{ inputs.sparkver }}_${{ inputs.scalaver }}-jdk-${{ inputs.javaver }}${{ inputs.celebornver && format('-{0}', inputs.celebornver) || '' }}${{ inputs.unifflever && format('-{0}', inputs.unifflever) || '' }}
+          name: unit-tests-reports-${{ inputs.sparkver }}_${{ inputs.scalaver }}-jdk-${{ inputs.javaver }}${{ inputs.celebornver && format('-{0}', inputs.celebornver) || '' }}${{ inputs.unifflever && format('-{0}', inputs.unifflever) || '' }}
           path: "**/target/surefire-reports/*.xml"
-
+      - name: Upload unit tests log
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: unit-tests-logs-${{ inputs.sparkver }}_${{ inputs.scalaver }}-jdk-${{ inputs.javaver }}${{ inputs.celebornver && format('-{0}', inputs.celebornver) || '' }}${{ inputs.unifflever && format('-{0}', inputs.unifflever) || '' }}
+          path: "**/target/unit-tests.log"
       - name: Upload auron (Spark ${{ inputs.sparkver }}, Scala ${{ inputs.scalaver }}, JDK ${{ inputs.javaver }})
         uses: actions/upload-artifact@v4
         with:

.rat-excludes

@@ -37,3 +37,4 @@ build/apache-maven-*/**
 **/tpch-queries/**
 **/tpch-query-results/**
 
+src/main/resources/auron-build-info.properties

Cargo.lock

@@ -90,7 +90,7 @@ futures-util = "0.3.31"
 hashbrown = "0.14.5"
 itertools = "0.14.0"
 jni = "0.20.0"
-log = "0.4.28"
+log = "0.4.29"
 lz4_flex = "0.12.0"
 num = "0.4.2"
 object_store = "0.12.4"

Cargo.toml

@@ -0,0 +1,36 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+rootLogger.level = info
+rootLogger.appenderRef.file.ref = File
+
+#File Appender
+appender.file.type = File
+appender.file.name = File
+appender.file.fileName = target/unit-tests.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d{HH:mm:ss.SSS} %t %p %c{1}: %m%n%ex
+
+#Console Appender
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.target = SYSTEM_OUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %maxLen{%m}{512}%n%ex{8}%n
+appender.console.filter.threshold.type = ThresholdFilter
+appender.console.filter.threshold.level = warn
+

auron-core/src/test/resources/log4j2.properties

@@ -0,0 +1,36 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+rootLogger.level = info
+rootLogger.appenderRef.file.ref = File
+
+#File Appender
+appender.file.type = File
+appender.file.name = File
+appender.file.fileName = target/unit-tests.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d{HH:mm:ss.SSS} %t %p %c{1}: %m%n%ex
+
+#Console Appender
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.target = SYSTEM_OUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{HH:mm:ss.SSS} %p %c: %maxLen{%m}{512}%n%ex{8}%n
+appender.console.filter.threshold.type = ThresholdFilter
+appender.console.filter.threshold.level = warn
+

common/src/test/resources/log4j2.properties

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-set -ex
+set -o pipefail
 
 # Preserve the calling directory
 _CALLING_DIR="$(pwd)"
@@ -60,16 +60,25 @@ checksum() {
         exit 1
     fi
 
-    echo "$features_arg" | $hash_cmd | awk '{print $1}'
+    feat_sum="$(echo "$features_arg" | $hash_cmd | awk '{print $1}' )"
 
-    find Cargo.toml Cargo.lock native-engine "$cache_libpath" | \
+    files_sum="$(
+        find Cargo.toml Cargo.lock native-engine "$cache_libpath" | \
         xargs $hash_cmd 2>&1 | \
         sort -k1 | \
         $hash_cmd | awk '{print $1}'
+    )"
+
+    printf "%s%s" "$feat_sum" "$files_sum" | $hash_cmd | awk '{print $1}'
 }
 
 if [ -f "$cache_libpath" ]; then
-  old_checksum="$(cat "$cache_checksum_file" 2>&1 || true)"
+  if [ -f "$cache_checksum_file" ]; then
+    old_checksum="$(cat "$cache_checksum_file")"
+  else
+    old_checksum="No checksum file found."
+  fi
+
   new_checksum="$(checksum)"
 
   echo -e "old build-checksum: \n$old_checksum\n========"

dev/mvn-build-helper/build-native.sh

@@ -40,6 +40,14 @@ function run_maven() {
   fi
 }
 
+# check or format the rust code
+if [[ "$CHECK" == "true" ]]; then
+  cargo fmt --check
+else
+  cargo fix --all --allow-dirty --allow-staged --allow-no-vcs
+  cargo fmt --all -q --
+fi
+
 # Check or format all code, including third-party code, with spark-3.5
 sparkver=spark-3.5
 for celebornver in celeborn-0.5 celeborn-0.6
@@ -53,11 +61,3 @@ for sparkver in "${sparkvers[@]}"
 do
   run_maven -P"${sparkver}"
 done
-
-# check or format the rust code
-if [[ "$CHECK" == "true" ]]; then
-  cargo fmt --check
-else
-  cargo fix --all --allow-dirty --allow-staged --allow-no-vcs
-  cargo fmt --all -q --
-fi