From dac5f5e05a420e64c60f5b4db68241e4a3bb5b52 Mon Sep 17 00:00:00 2001
From: rui-mo <rui.mo@intel.com>
Date: Mon, 1 Jul 2024 11:11:28 +0800
Subject: [PATCH] Fix

---
 scripts/spark/start-spark.sh                   | 3 +--
 velox/functions/sparksql/fuzzer/CMakeLists.txt | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/spark/start-spark.sh b/scripts/spark/start-spark.sh
index 3222e9f9bfd24..9c552481147a0 100755
--- a/scripts/spark/start-spark.sh
+++ b/scripts/spark/start-spark.sh
@@ -15,5 +15,4 @@
 
 set -e
 
-cd $SPARK_HOME
-./sbin/start-connect-server.sh --jars /opt/spark-connect_2.12-3.5.1.jar
+$SPARK_HOME/sbin/start-connect-server.sh --jars /opt/spark-connect_2.12-3.5.1.jar
diff --git a/velox/functions/sparksql/fuzzer/CMakeLists.txt b/velox/functions/sparksql/fuzzer/CMakeLists.txt
index 4a4f6ce937629..8dc4765d4c546 100644
--- a/velox/functions/sparksql/fuzzer/CMakeLists.txt
+++ b/velox/functions/sparksql/fuzzer/CMakeLists.txt
@@ -39,9 +39,9 @@ set_source_files_properties(${GRPC_OUTPUT_FILES} PROPERTIES GENERATED TRUE)
 add_custom_command(
   OUTPUT ${PROTO_OUTPUT_FILES}
   COMMAND
-    ${Protobuf_PROTOC_EXECUTABLE} --proto_path ${CMAKE_SOURCE_DIR}/ --proto_path
+    protobuf::protoc --proto_path ${CMAKE_SOURCE_DIR}/ --proto_path
     ${Protobuf_INCLUDE_DIRS} --cpp_out ${CMAKE_BINARY_DIR} ${PROTO_FILES_FULL}
-  DEPENDS ${Protobuf_PROTOC_EXECUTABLE}
+  DEPENDS protobuf::protoc
   COMMENT "Running PROTO compiler"
   VERBATIM)
 add_custom_target(spark_connect_proto ALL DEPENDS ${PROTO_OUTPUT_FILES})
@@ -50,11 +50,11 @@ add_custom_target(spark_connect_proto ALL DEPENDS ${PROTO_OUTPUT_FILES})
 add_custom_command(
   OUTPUT ${GRPC_OUTPUT_FILES}
   COMMAND
-    ${Protobuf_PROTOC_EXECUTABLE} --proto_path ${CMAKE_SOURCE_DIR}/ --proto_path
+    protobuf::protoc --proto_path ${CMAKE_SOURCE_DIR}/ --proto_path
     ${Protobuf_INCLUDE_DIRS} --grpc_out=${CMAKE_BINARY_DIR}
     --plugin=protoc-gen-grpc=$<TARGET_FILE:gRPC::grpc_cpp_plugin>
     ${PROTO_FILES_FULL}
-  DEPENDS ${Protobuf_PROTOC_EXECUTABLE}
+  DEPENDS protobuf::protoc
   COMMENT "Running gRPC C++ protocol buffer compiler"
   VERBATIM)
 add_custom_target(spark_connect_grpc_proto ALL DEPENDS ${GRPC_OUTPUT_FILES})