From 413b922b73d2099c03e17c548eb5356027b5303c Mon Sep 17 00:00:00 2001
From: yangjie01 <yangjie01@baidu.com>
Date: Tue, 6 Dec 2022 11:29:54 +0800
Subject: [PATCH 1/2] update pb version in SparkBuild

---
 project/SparkBuild.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 28aef586c50dd..ca6704d53598f 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -86,7 +86,7 @@ object BuildCommons {
   val javaVersion = settingKey[String]("source and target JVM version for javac and scalac")
 
   // Google Protobuf version used for generating the protobuf.
-  val protoVersion = "3.21.1"
+  val protoVersion = "3.21.9"
   // GRPC version used for Spark Connect.
   val gprcVersion = "1.47.0"
 }

From 4fa9abb8d0aab8364f7242769bca062edeb4949d Mon Sep 17 00:00:00 2001
From: yangjie01 <yangjie01@baidu.com>
Date: Tue, 6 Dec 2022 11:40:55 +0800
Subject: [PATCH 2/2] add comments

---
 pom.xml                  | 1 +
 project/SparkBuild.scala | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0639370981cb1..2a90007b639e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,7 @@
     <!-- Protobuf version for building with Hadoop/Yarn dependencies -->
     <protobuf.hadoopDependency.version>2.5.0</protobuf.hadoopDependency.version>
     <!-- Actual Protobuf version in Spark modules like Spark Connect, protobuf connector, etc. -->
+    <!-- SPARK-41247: When updating `protobuf.version`, also need to update `protoVersion` in `SparkBuild.scala` -->
     <protobuf.version>3.21.9</protobuf.version>
     <yarn.version>${hadoop.version}</yarn.version>
     <zookeeper.version>3.6.3</zookeeper.version>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index ca6704d53598f..6cc983666ce0b 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -86,6 +86,7 @@ object BuildCommons {
   val javaVersion = settingKey[String]("source and target JVM version for javac and scalac")
 
   // Google Protobuf version used for generating the protobuf.
+  // SPARK-41247: needs to be consistent with `protobuf.version` in `pom.xml`.
   val protoVersion = "3.21.9"
   // GRPC version used for Spark Connect.
   val gprcVersion = "1.47.0"