From 0d867ac5e7b0da25407e5779d992679a1de9bb14 Mon Sep 17 00:00:00 2001
From: Hongze Zhang <hongze.zhang@intel.com>
Date: Tue, 5 Dec 2023 15:20:57 +0800
Subject: [PATCH 1/3] fixup

---
 ep/build-velox/src/build_velox.sh | 35 ++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/ep/build-velox/src/build_velox.sh b/ep/build-velox/src/build_velox.sh
index 7338964d0465..1e8aa57e0c81 100755
--- a/ep/build-velox/src/build_velox.sh
+++ b/ep/build-velox/src/build_velox.sh
@@ -27,6 +27,7 @@ ENABLE_EP_CACHE=OFF
 ENABLE_BENCHMARK=OFF
 ENABLE_TESTS=OFF
 RUN_SETUP_SCRIPT=ON
+OTHER_ARGUMENTS=""
 
 OS=`uname -s`
 ARCH=`uname -m`
@@ -77,8 +78,6 @@ for arg in "$@"; do
 done
 
 function compile {
-  TARGET_BUILD_COMMIT=$(git rev-parse --verify HEAD)
-
   if [ -z "${GLUTEN_VCPKG_ENABLED:-}" ] && [ $RUN_SETUP_SCRIPT == "ON" ]; then
     if [ $OS == 'Linux' ]; then
       setup_linux
@@ -144,16 +143,22 @@ function compile {
   fi
 }
 
+function generate_build_summary {
+  COMMIT_HASH=$1
+  # Ideally all script arguments should be put into build summary.
+  echo "ENABLE_S3=$ENABLE_S3,ENABLE_GCS=$ENABLE_GCS,ENABLE_HDFS=$ENABLE_HDFS,BUILD_TYPE=$BUILD_TYPE,VELOX_HOME=$VELOX_HOME,ENABLE_EP_CACHE=$ENABLE_EP_CACHE,ENABLE_BENCHMARK=$ENABLE_BENCHMARK,ENABLE_TESTS=$ENABLE_TESTS,RUN_SETUP_SCRIPT=$RUN_SETUP_SCRIPT,OTHER_ARGUMENTS=$OTHER_ARGUMENTS,COMMIT_HASH=$COMMIT_HASH"
+}
+
 function check_commit {
   if [ $ENABLE_EP_CACHE == "ON" ]; then
-    if [ -f ${VELOX_HOME}/velox-commit.cache ]; then
-      CACHED_BUILT_COMMIT="$(cat ${VELOX_HOME}/velox-commit.cache)"
-      if [ -n "$CACHED_BUILT_COMMIT" ]; then
-        if [ "$TARGET_BUILD_COMMIT" = "$CACHED_BUILT_COMMIT" ]; then
-          echo "Velox build of commit $TARGET_BUILD_COMMIT was cached."
+    if [ -f ${VELOX_HOME}/velox-build.cache ]; then
+      CACHED_BUILD_SUMMARY="$(cat ${VELOX_HOME}/velox-build.cache)"
+      if [ -n "$CACHED_BUILD_SUMMARY" ]; then
+        if [ "$TARGET_BUILD_SUMMARY" = "$CACHED_BUILD_SUMMARY" ]; then
+          echo "Velox build $TARGET_BUILD_SUMMARY was cached."
           exit 0
         else
-          echo "Found cached commit $CACHED_BUILT_COMMIT for Velox which is different with target commit $TARGET_BUILD_COMMIT."
+          echo "Found cached build $CACHED_BUILD_SUMMARY for Velox which is different with target build $TARGET_BUILD_SUMMARY."
         fi
       fi
     fi
@@ -162,8 +167,8 @@ function check_commit {
     git clean -dffx :/
   fi
 
-  if [ -f ${VELOX_HOME}/velox-commit.cache ]; then
-    rm -f ${VELOX_HOME}/velox-commit.cache
+  if [ -f ${VELOX_HOME}/velox-build.cache ]; then
+    rm -f ${VELOX_HOME}/velox-build.cache
   fi
 }
 
@@ -245,15 +250,15 @@ echo "ENABLE_HDFS=${ENABLE_HDFS}"
 echo "BUILD_TYPE=${BUILD_TYPE}"
 
 cd ${VELOX_HOME}
-TARGET_BUILD_COMMIT="$(git rev-parse --verify HEAD)"
-if [ -z "$TARGET_BUILD_COMMIT" ]; then
-  echo "Unable to parse Velox commit: $TARGET_BUILD_COMMIT."
+TARGET_BUILD_SUMMARY=$(generate_build_summary "$(git rev-parse --verify HEAD)")
+if [ -z "$TARGET_BUILD_SUMMARY" ]; then
+  echo "Unable to parse Velox build: $TARGET_BUILD_SUMMARY."
   exit 0
 fi
-echo "Target Velox commit: $TARGET_BUILD_COMMIT"
+echo "Target Velox build: $TARGET_BUILD_SUMMARY"
 
 check_commit
 compile
 
 echo "Successfully built Velox from Source."
-echo $TARGET_BUILD_COMMIT >"${VELOX_HOME}/velox-commit.cache"
+echo $TARGET_BUILD_SUMMARY >"${VELOX_HOME}/velox-build.cache"

From 24549ae565062a9600ddf2b081766278c000e712 Mon Sep 17 00:00:00 2001
From: Hongze Zhang <hongze.zhang@intel.com>
Date: Tue, 5 Dec 2023 15:29:37 +0800
Subject: [PATCH 2/3] fixup

---
 ep/build-velox/src/build_velox.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ep/build-velox/src/build_velox.sh b/ep/build-velox/src/build_velox.sh
index 1e8aa57e0c81..ca27ba1e7f3e 100755
--- a/ep/build-velox/src/build_velox.sh
+++ b/ep/build-velox/src/build_velox.sh
@@ -253,7 +253,7 @@ cd ${VELOX_HOME}
 TARGET_BUILD_SUMMARY=$(generate_build_summary "$(git rev-parse --verify HEAD)")
 if [ -z "$TARGET_BUILD_SUMMARY" ]; then
   echo "Unable to parse Velox build: $TARGET_BUILD_SUMMARY."
-  exit 0
+  exit 1
 fi
 echo "Target Velox build: $TARGET_BUILD_SUMMARY"
 

From 4c14b34dc8e5ee4ddbe255460f19616c1a23cc8f Mon Sep 17 00:00:00 2001
From: Hongze Zhang <hongze.zhang@intel.com>
Date: Tue, 5 Dec 2023 15:30:17 +0800
Subject: [PATCH 3/3] fixup

---
 ep/build-velox/src/build_velox.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ep/build-velox/src/build_velox.sh b/ep/build-velox/src/build_velox.sh
index ca27ba1e7f3e..a356ec513ded 100755
--- a/ep/build-velox/src/build_velox.sh
+++ b/ep/build-velox/src/build_velox.sh
@@ -143,7 +143,7 @@ function compile {
   fi
 }
 
-function generate_build_summary {
+function get_build_summary {
   COMMIT_HASH=$1
   # Ideally all script arguments should be put into build summary.
   echo "ENABLE_S3=$ENABLE_S3,ENABLE_GCS=$ENABLE_GCS,ENABLE_HDFS=$ENABLE_HDFS,BUILD_TYPE=$BUILD_TYPE,VELOX_HOME=$VELOX_HOME,ENABLE_EP_CACHE=$ENABLE_EP_CACHE,ENABLE_BENCHMARK=$ENABLE_BENCHMARK,ENABLE_TESTS=$ENABLE_TESTS,RUN_SETUP_SCRIPT=$RUN_SETUP_SCRIPT,OTHER_ARGUMENTS=$OTHER_ARGUMENTS,COMMIT_HASH=$COMMIT_HASH"
@@ -250,7 +250,7 @@ echo "ENABLE_HDFS=${ENABLE_HDFS}"
 echo "BUILD_TYPE=${BUILD_TYPE}"
 
 cd ${VELOX_HOME}
-TARGET_BUILD_SUMMARY=$(generate_build_summary "$(git rev-parse --verify HEAD)")
+TARGET_BUILD_SUMMARY=$(get_build_summary "$(git rev-parse --verify HEAD)")
 if [ -z "$TARGET_BUILD_SUMMARY" ]; then
   echo "Unable to parse Velox build: $TARGET_BUILD_SUMMARY."
   exit 1