Rever changes on Jenkinsfile + Fix druid-handler shade ASM error by removing Calcite relocation

Author: rubenada

Jenkinsfile

@@ -96,41 +96,14 @@ export -n HIVE_CONF_DIR
 sw java 21 && . /etc/profile.d/java.sh
 mkdir -p .m2/repository
 cp $SETTINGS .m2/settings.xml
-# TEMP: wipe workspace cache for asm/calcite-core to force re-resolve (Track 1)
-echo "@@@ Wiping asm and calcite-core from workspace .m2 to force re-resolve"
-rm -rf $PWD/.m2/repository/org/ow2/asm
-rm -rf $PWD/.m2/repository/org/apache/calcite/calcite-core
-# TEMP: diagnostic - record what ASM and calcite-core end up looking like in the workspace cache
-record_artifact_fingerprints() {
-  echo "@@@ ASM in workspace .m2:"
-  find $PWD/.m2/repository/org/ow2/asm -type f \\( -name '*.jar' -o -name '*.pom' \\) -exec ls -l {} \\; -exec md5sum {} \\; 2>/dev/null || true
-  echo "@@@ calcite-core jar fingerprint:"
-  CALCITE_CORE_JAR=$PWD/.m2/repository/org/apache/calcite/calcite-core/1.42.0/calcite-core-1.42.0.jar
-  if [ -f "$CALCITE_CORE_JAR" ]; then
-    ls -l "$CALCITE_CORE_JAR"
-    md5sum "$CALCITE_CORE_JAR"
-    echo "@@@ SqlFunctions.class size and md5 (inside calcite-core-1.42.0.jar):"
-    unzip -p "$CALCITE_CORE_JAR" org/apache/calcite/runtime/SqlFunctions.class | wc -c
-    unzip -p "$CALCITE_CORE_JAR" org/apache/calcite/runtime/SqlFunctions.class | md5sum
-  else
-    echo "@@@ calcite-core-1.42.0.jar not yet present in workspace .m2"
-  fi
-}
-record_artifact_fingerprints
 OPTS=" -s $PWD/.m2/settings.xml -B -Dtest.groups= "
 OPTS+=" -Pitests,qsplits,dist,errorProne"
 OPTS+=" -Dmaven.repo.local=$PWD/.m2/repository"
 git config extra.mavenOpts "$OPTS"
 OPTS=" $M_OPTS -Dmaven.test.failure.ignore "
 if [ -s inclusions.txt ]; then OPTS+=" -Dsurefire.includesFile=$PWD/inclusions.txt";fi
 if [ -s exclusions.txt ]; then OPTS+=" -Dsurefire.excludesFile=$PWD/exclusions.txt";fi
-set +e
 mvn $OPTS '''+args+'''
-MVN_RC=$?
-set -e
-# TEMP: diagnostic - record fingerprints after mvn ran (runs even if mvn failed)
-record_artifact_fingerprints
-exit $MVN_RC
 du -h --max-depth=1
 df -h
 '''

druid-handler/pom.xml

@@ -353,10 +353,15 @@
                       <pattern>io.netty</pattern>
                       <shadedPattern>org.apache.hive.druid.io.netty</shadedPattern>
                     </relocation>
+                    <!-- Calcite is intentionally NOT included or relocated here. Druid 0.17.1 uses Calcite APIs
+                    that are compatible with Hive's Calcite 1.42+. Including calcite-core in the shade caused
+                    SqlFunctions.class to exceed the JVM 64KB method limit after relocation. If Druid is upgraded
+                    to a version with an incompatible Calcite, this relocation must be restored (excluding SqlFunctions,
+                    or splitting the class via a source-level patch to Calcite).
                     <relocation>
                       <pattern>org.apache.calcite</pattern>
                       <shadedPattern>org.apache.hive.druid.org.apache.calcite</shadedPattern>
-                    </relocation>
+                    </relocation> -->
                     <relocation>
                       <pattern>org.jboss.netty</pattern>
                       <shadedPattern>org.apache.hive.druid.org.jboss.netty</shadedPattern>
@@ -379,7 +384,8 @@
                       <include>org.apache.druid:*</include>
                       <include>org.apache.druid.extensions:*</include>
                       <include>io.netty:*</include>
-                      <include>org.apache.calcite:*</include>
+                      <!-- See comment above about Calcite not being relocated & included -->
+                      <!-- <include>org.apache.calcite:*</include> -->
                       <include>com.fasterxml.jackson.core:*</include>
                       <include>com.fasterxml.jackson.datatype:*</include>
                       <include>com.fasterxml.jackson.dataformat:*</include>
@@ -409,23 +415,6 @@
                 </configuration>
               </execution>
             </executions>
-            <dependencies>
-              <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>9.9.1</version>
-              </dependency>
-              <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm-commons</artifactId>
-                <version>9.9.1</version>
-              </dependency>
-              <dependency>
-                <groupId>org.ow2.asm</groupId>
-                <artifactId>asm-tree</artifactId>
-                <version>9.9.1</version>
-              </dependency>
-            </dependencies>
           </plugin>
         </plugins>
       </build>