From ade98a3ba3ba59defdba493de49e8eb0b2284dc1 Mon Sep 17 00:00:00 2001
From: Rahul Prabhu <raprabhu@nvidia.com>
Date: Tue, 23 Jun 2026 15:12:44 -0700
Subject: [PATCH 1/2] Initial Commit

Signed-off-by: Rahul Prabhu <raprabhu@nvidia.com>
---
 aggregator/pom.xml                             | 18 ++++++++++++++++--
 scala2.13/aggregator/pom.xml                   | 18 ++++++++++++++++--
 .../spark/rapids/fileio/RapidsInputFiles.java  |  9 +++++----
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/aggregator/pom.xml b/aggregator/pom.xml
index 5e3e8be4abc..6ca77391e33 100644
--- a/aggregator/pom.xml
+++ b/aggregator/pom.xml
@@ -141,9 +141,23 @@
                             <shadedPattern>META-INF/versions/$1/${rapids.shade.package.path}/org/roaringbitmap</shadedPattern>
                             <rawString>true</rawString>
                         </relocation>
+                        <!--
+                            Relocate bundled Google libraries. Dataproc ships its own GCS
+                            connector and Google client libraries, so the plugin-owned GCS SDK
+                            stack must stay isolated from the cluster classpath. This also covers
+                            com.google.flatbuffers with the same shaded path used historically.
+                        -->
                         <relocation>
-                            <pattern>com.google.flatbuffers</pattern>
-                            <shadedPattern>${rapids.shade.package}.com.google.flatbuffers</shadedPattern>
+                            <pattern>com.google</pattern>
+                            <shadedPattern>${rapids.shade.package}.com.google</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>io.grpc</pattern>
+                            <shadedPattern>${rapids.shade.package}.io.grpc</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>io.opencensus</pattern>
+                            <shadedPattern>${rapids.shade.package}.io.opencensus</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>org.roaringbitmap</pattern>
diff --git a/scala2.13/aggregator/pom.xml b/scala2.13/aggregator/pom.xml
index a6fb5f60651..43ef2df387e 100644
--- a/scala2.13/aggregator/pom.xml
+++ b/scala2.13/aggregator/pom.xml
@@ -141,9 +141,23 @@
                             <shadedPattern>META-INF/versions/$1/${rapids.shade.package.path}/org/roaringbitmap</shadedPattern>
                             <rawString>true</rawString>
                         </relocation>
+                        <!--
+                            Relocate bundled Google libraries. Dataproc ships its own GCS
+                            connector and Google client libraries, so the plugin-owned GCS SDK
+                            stack must stay isolated from the cluster classpath. This also covers
+                            com.google.flatbuffers with the same shaded path used historically.
+                        -->
                         <relocation>
-                            <pattern>com.google.flatbuffers</pattern>
-                            <shadedPattern>${rapids.shade.package}.com.google.flatbuffers</shadedPattern>
+                            <pattern>com.google</pattern>
+                            <shadedPattern>${rapids.shade.package}.com.google</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>io.grpc</pattern>
+                            <shadedPattern>${rapids.shade.package}.io.grpc</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>io.opencensus</pattern>
+                            <shadedPattern>${rapids.shade.package}.io.opencensus</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>org.roaringbitmap</pattern>
diff --git a/sql-plugin/src/main/java/com/nvidia/spark/rapids/fileio/RapidsInputFiles.java b/sql-plugin/src/main/java/com/nvidia/spark/rapids/fileio/RapidsInputFiles.java
index e486ad4d52c..30d76db368b 100644
--- a/sql-plugin/src/main/java/com/nvidia/spark/rapids/fileio/RapidsInputFiles.java
+++ b/sql-plugin/src/main/java/com/nvidia/spark/rapids/fileio/RapidsInputFiles.java
@@ -16,6 +16,7 @@
 
 package com.nvidia.spark.rapids.fileio;
 
+import com.nvidia.spark.rapids.PerfIO;
 import com.nvidia.spark.rapids.PerfIOConf;
 import org.apache.spark.SparkEnv;
 
@@ -39,16 +40,16 @@ public static boolean isS3PerfEnabled() {
         return env.conf().getBoolean(PerfIOConf.S3PERF_ENABLED().key(), false);
     }
     /**
-     * True iff {@code spark.rapids.perfio.gcs.enabled} is set to {@code true} on
-     * the active SparkConf. Returns false when no {@link SparkEnv} is initialized
-     * (e.g. before driver bring-up) so callers default to the non-PerfIO path.
+     * True iff PerfIO initialized GCS support on this executor. Returns false when
+     * no {@link SparkEnv} is initialized (e.g. before driver bring-up) so callers
+     * default to the non-PerfIO path.
      */
     public static boolean isGCSPerfEnabled() {
         SparkEnv env = SparkEnv.get();
         if (env == null) {
             return false;
         }
-        return env.conf().getBoolean(PerfIOConf.GCSPERF_ENABLED().key(), false);
+        return PerfIO.isGCSPerfEnabled();
     }
 
 }

From 511302a73dc35b0f4ff1c34f58db50b2da9541c4 Mon Sep 17 00:00:00 2001
From: Rahul Prabhu <raprabhu@nvidia.com>
Date: Fri, 26 Jun 2026 15:57:37 -0700
Subject: [PATCH 2/2] Exclude protobuf from relocation

---
 aggregator/pom.xml           | 8 ++++++++
 scala2.13/aggregator/pom.xml | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/aggregator/pom.xml b/aggregator/pom.xml
index 6ca77391e33..5e86dc34d0e 100644
--- a/aggregator/pom.xml
+++ b/aggregator/pom.xml
@@ -150,6 +150,14 @@
                         <relocation>
                             <pattern>com.google</pattern>
                             <shadedPattern>${rapids.shade.package}.com.google</shadedPattern>
+                            <excludes>
+                                <!--
+                                    ORC and Spark expose unshaded protobuf message instances to
+                                    RAPIDS shim code, so protobuf references in RAPIDS classes must
+                                    stay in the original com.google.protobuf namespace.
+                                -->
+                                <exclude>com.google.protobuf.**</exclude>
+                            </excludes>
                         </relocation>
                         <relocation>
                             <pattern>io.grpc</pattern>
diff --git a/scala2.13/aggregator/pom.xml b/scala2.13/aggregator/pom.xml
index 43ef2df387e..87b3f00f59f 100644
--- a/scala2.13/aggregator/pom.xml
+++ b/scala2.13/aggregator/pom.xml
@@ -150,6 +150,14 @@
                         <relocation>
                             <pattern>com.google</pattern>
                             <shadedPattern>${rapids.shade.package}.com.google</shadedPattern>
+                            <excludes>
+                                <!--
+                                    ORC and Spark expose unshaded protobuf message instances to
+                                    RAPIDS shim code, so protobuf references in RAPIDS classes must
+                                    stay in the original com.google.protobuf namespace.
+                                -->
+                                <exclude>com.google.protobuf.**</exclude>
+                            </excludes>
                         </relocation>
                         <relocation>
                             <pattern>io.grpc</pattern>