follwo comment

core/src/test/scala/org/apache/spark/SparkContextSuite.scala

@@ -445,29 +445,6 @@ class SparkContextSuite extends SparkFunSuite with LocalSparkContext with Eventu
     }
   }
 
-  test("SPARK-33084: add jar when path contains comma") {
-    withTempDir { tmpDir =>
-      val tmpJar = File.createTempFile("Test,UDTF", ".jar", tmpDir)
-      sc = new SparkContext(new SparkConf().setAppName("test").setMaster("local"))
-      sc.addJar(tmpJar.getAbsolutePath)
-      assert(sc.listJars().exists(_.contains("Test,UDTF")))
-
-      val jarPath = "hdfs:///no/path/to/Test,UDTF1.jar"
-      sc.addJar(jarPath)
-      // Add jar failed since file not exists
-      assert(!sc.listJars().exists(_.contains("/no/path/to/Test,UDTF.jar")))
-
-      Seq("http", "https", "ftp").foreach { scheme =>
-        val badURL = s"$scheme://user:pwd/path/Test,UDTF_${scheme}.jar"
-        val e = intercept[MalformedURLException] {
-          sc.addJar(badURL)
-        }
-        assert(e.getMessage.contains(badURL))
-        assert(!sc.listJars().exists(_.contains(s"Test,UDTF_${scheme}.jar")))
-      }
-    }
-  }
-
   test("SPARK-22585 addJar argument without scheme is interpreted literally without url decoding") {
     withTempDir { dir =>
       val tmpDir = new File(dir, "host%3A443")
@@ -1152,7 +1129,7 @@ class SparkContextSuite extends SparkFunSuite with LocalSparkContext with Eventu
     assert(sc.listJars().exists(_.contains("commons-lang_commons-lang-2.6.jar")))
   }
 
-  test("SPARK-33084: Add jar support Ivy URI -- test param case sensitive") {
+  test("SPARK-33084: Add jar support Ivy URI -- test transitive value case sensitive") {
     sc = new SparkContext(new SparkConf().setAppName("test").setMaster("local-cluster[3, 1, 1024]"))
     sc.addJar("ivy://org.apache.hive:hive-storage-api:2.7.0?TRANSITIVE=true")
     assert(sc.listJars().exists(_.contains("org.apache.hive_hive-storage-api-2.7.0.jar")))
@@ -1173,39 +1150,6 @@ class SparkContextSuite extends SparkFunSuite with LocalSparkContext with Eventu
     assert(sc.listJars().exists(_.contains("org.apache.hive_hive-storage-api-2.7.0.jar")))
     assert(sc.listJars().exists(_.contains("commons-lang_commons-lang-2.6.jar")))
   }
-
-  test("SPARK-33084: Add jar support Ivy URI -- test invalid ivy uri") {
-    sc = new SparkContext(new SparkConf().setAppName("test").setMaster("local-cluster[3, 1, 1024]"))
-    val e1 = intercept[IllegalArgumentException] {
-      sc.addJar("ivy://")
-    }.getMessage
-    assert(e1.contains("Expected authority at index 6: ivy://"))
-
-    val e2 = intercept[IllegalArgumentException] {
-      sc.addJar("ivy://org.apache.hive:hive-contrib")
-    }.getMessage
-    assert(e2.contains("Invalid Ivy URI authority in uri ivy://org.apache.hive:hive-contrib:" +
-      " Expected 'org:module:version', found org.apache.hive:hive-contrib."))
-
-    val e3 = intercept[IllegalArgumentException] {
-      sc.addJar("ivy://org.apache.hive:hive-contrib:2.3.7?foo=")
-    }.getMessage
-    assert(e3.contains("Invalid query string in Ivy URI" +
-      " ivy://org.apache.hive:hive-contrib:2.3.7?foo=:"))
-
-    val e4 = intercept[IllegalArgumentException] {
-      sc.addJar("ivy://org.apache.hive:hive-contrib:2.3.7?bar=&baz=foo")
-    }.getMessage
-    assert(e4.contains("Invalid query string in Ivy URI" +
-      " ivy://org.apache.hive:hive-contrib:2.3.7?bar=&baz=foo: bar=&baz=foo"))
-
-    val e5 = intercept[IllegalArgumentException] {
-      sc.addJar("ivy://org.apache.hive:hive-contrib:2.3.7?exclude=org.pentaho")
-    }.getMessage
-    assert(e5.contains("Invalid exclude string in Ivy URI" +
-      " ivy://org.apache.hive:hive-contrib:2.3.7?exclude=org.pentaho:" +
-      " expected 'org:module,org:module,..', found org.pentaho"))
-  }
 }
 
 object SparkContextSuite {

core/src/test/scala/org/apache/spark/util/DependencyUtils.scala

@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.util
+
+import java.net.URI
+
+import org.apache.spark.SparkFunSuite
+
+object DependencyUtils extends SparkFunSuite {
+
+  test("SPARK-33084: Add jar support Ivy URI -- test invalid ivy uri") {
+    val e1 = intercept[IllegalArgumentException] {
+      DependencyUtils.resolveMavenDependencies(URI.create("ivy://"))
+    }.getMessage
+    assert(e1.contains("Expected authority at index 6: ivy://"))
+
+    val e2 = intercept[IllegalArgumentException] {
+      DependencyUtils.resolveMavenDependencies(URI.create("ivy://org.apache.hive:hive-contrib"))
+    }.getMessage
+    assert(e2.contains("Invalid Ivy URI authority in uri ivy://org.apache.hive:hive-contrib:" +
+      " Expected 'org:module:version', found org.apache.hive:hive-contrib."))
+
+    val e3 = intercept[IllegalArgumentException] {
+      DependencyUtils.resolveMavenDependencies(
+        URI.create("ivy://org.apache.hive:hive-contrib:2.3.7?foo="))
+    }.getMessage
+    assert(e3.contains("Invalid query string in Ivy URI" +
+      " ivy://org.apache.hive:hive-contrib:2.3.7?foo=:"))
+
+    val e4 = intercept[IllegalArgumentException] {
+      DependencyUtils.resolveMavenDependencies(
+        URI.create("ivy://org.apache.hive:hive-contrib:2.3.7?bar=&baz=foo"))
+    }.getMessage
+    assert(e4.contains("Invalid query string in Ivy URI" +
+      " ivy://org.apache.hive:hive-contrib:2.3.7?bar=&baz=foo: bar=&baz=foo"))
+
+    val e5 = intercept[IllegalArgumentException] {
+      DependencyUtils.resolveMavenDependencies(
+        URI.create("ivy://org.apache.hive:hive-contrib:2.3.7?exclude=org.pentaho"))
+    }.getMessage
+    assert(e5.contains("Invalid exclude string in Ivy URI" +
+      " ivy://org.apache.hive:hive-contrib:2.3.7?exclude=org.pentaho:" +
+      " expected 'org:module,org:module,..', found org.pentaho"))
+  }
+}

docs/sql-ref-syntax-aux-resource-mgmt-add-jar.md

@@ -33,18 +33,17 @@ ADD JAR file_name
 
 * **file_name**
 
-    The name of the JAR file to be added. It could be either on a local file system or a distributed file system or an ivy URL.
-    Apache Ivy is a popular dependency manager focusing on flexibility and simplicity. Now we support two parameter in URL query string:
+    The name of the JAR file to be added. It could be either on a local file system or a distributed file system or an Ivy URI.
+    Apache Ivy is a popular dependency manager focusing on flexibility and simplicity. Now we support two parameter in URI query string:
 
      * transitive: whether to download dependent jars related to your ivy URL. It is case-sensitive and only take last one if multiple transitive parameters are specified.
-     * exclude: exclusion list when download ivy URL jar and dependent jars.
+     * exclude: exclusion list during downloading Ivy URI jar and dependent jars.
 
-    User can write ivy URL such as:
+    User can write Ivy URI such as:
 
       ivy://group:module:version
       ivy://group:module:version?transitive=[true|false]
-      ivy://group:module:version?exclude=group:module,group:module
-      ivy://group:module:version?exclude=group:module,group:module&transitive=[true|false]
+      ivy://group:module:version?transitive=[true|false]&exclude=group:module,group:module
 
 ### Examples
 
@@ -53,10 +52,10 @@ ADD JAR /tmp/test.jar;
 ADD JAR "/path/to/some.jar";
 ADD JAR '/some/other.jar';
 ADD JAR "/path with space/abc.jar";
-ADD JAR "ivy://org.apache.hive:hive-contrib:2.3.7";
-ADD JAR "ivy://org.apache.hive:hive-contrib:2.3.7?transitive=false"
-ADD JAR "ivy://org.apache.hive:hive-contrib:2.3.7?transitive=true"
-ADD JAR "ivy://org.apache.hive:hive-contrib:2.3.7?exclude=org.pentaho:pentaho-aggdesigner-algorithm&transitive=true"
+ADD JAR "ivy://group:module:version";
+ADD JAR "ivy://group:module:version?transitive=false"
+ADD JAR "ivy://group:module:version?transitive=true"
+ADD JAR "ivy://group:module:version?exclude=group:module&transitive=true"
 ```
 
 ### Related Statements

sql/core/src/main/scala/org/apache/spark/sql/internal/SessionState.scala

@@ -161,7 +161,7 @@ class SessionResourceLoader(session: SparkSession) extends FunctionResourceLoade
     }
   }
 
-  protected def resolveJars(path: URI): Seq[String] = {
+  def resolveJars(path: URI): Seq[String] = {
     path.getScheme match {
       case "ivy" => DependencyUtils.resolveMavenDependencies(path)
       case _ => path.toString :: Nil

sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala

@@ -3796,7 +3796,7 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
   test("SPARK-33084: Add jar support Ivy URI in SQL -- jar contains udf class") {
     val sumFuncClass = "org.apache.spark.examples.sql.Spark33084"
     val functionName = "test_udf"
-    withTempDir { dir => {
+    withTempDir { dir =>
       System.setProperty("ivy.home", dir.getAbsolutePath)
       val sourceJar = new File(Thread.currentThread().getContextClassLoader
         .getResource("SPARK-33084.jar").getFile)
@@ -3824,7 +3824,6 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
       }
       System.clearProperty("ivy.home")
     }
-    }
   }
 }