Revert changes to SharedSparkSession and TestHiveSingleton

Co-authored-by: Isaac

Author: zhengruifeng

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

@@ -27,7 +27,6 @@ import org.apache.spark.internal.config.UNSAFE_EXCEPTION_ON_MEMORY_LEAK
 import org.apache.spark.sql.{classic, SparkSession, SparkSessionProvider, SQLContext}
 import org.apache.spark.sql.catalyst.expressions.CodegenObjectFactoryMode
 import org.apache.spark.sql.catalyst.optimizer.ConvertToLocalRelation
-import org.apache.spark.sql.classic.{ClassicConversions, ColumnConversions, ColumnNodeToExpressionConverter, SQLImplicits}
 import org.apache.spark.sql.internal.{SQLConf, StaticSQLConf}
 
 trait SharedSparkSession extends SQLTestUtils with SharedSparkSessionBase {
@@ -88,23 +87,6 @@ trait SharedSparkSessionBase
   with BeforeAndAfterEach
   with Eventually { self: Suite =>
 
-  /**
-   * A helper object for importing SQL implicits.
-   *
-   * Note that the alternative of importing `spark.implicits._` is not possible here.
-   * This is because we create the `SparkSession` immediately before the first test is run,
-   * but the implicits import is needed in the constructor.
-   */
-  protected object testImplicits
-    extends SQLImplicits
-      with ClassicConversions
-      with ColumnConversions {
-    private def classicSession: classic.SparkSession =
-      self.spark.asInstanceOf[classic.SparkSession]
-    override protected def session: classic.SparkSession = classicSession
-    override protected def converter: ColumnNodeToExpressionConverter = classicSession.converter
-  }
-
   protected def sparkConf = {
     val conf = new SparkConf()
       .set("spark.hadoop.fs.file.impl", classOf[DebugFilesystem].getName)

sql/hive/src/test/scala/org/apache/spark/sql/hive/test/TestHiveSingleton.scala

@@ -19,23 +19,14 @@ package org.apache.spark.sql.hive.test
 
 import org.apache.spark.SparkFunSuite
 import org.apache.spark.sql.SparkSessionProvider
-import org.apache.spark.sql.classic
-import org.apache.spark.sql.classic.{ClassicConversions, ColumnConversions, ColumnNodeToExpressionConverter, SQLImplicits, SparkSession}
+import org.apache.spark.sql.classic.SparkSession
 import org.apache.spark.sql.hive.HiveExternalCatalog
 import org.apache.spark.sql.hive.client.HiveClient
 
 
 trait TestHiveSingleton extends SparkFunSuite with SparkSessionProvider {
   override protected val enableAutoThreadAudit = false
   override protected val spark: SparkSession = TestHive.sparkSession
-
-  protected object testImplicits
-    extends SQLImplicits
-      with ClassicConversions
-      with ColumnConversions {
-    override protected def session: SparkSession = TestHiveSingleton.this.spark
-    override protected def converter: ColumnNodeToExpressionConverter = session.converter
-  }
   protected val hiveContext: TestHiveContext = TestHive
   protected val hiveClient: HiveClient =
     spark.sharedState.externalCatalog.unwrapped.asInstanceOf[HiveExternalCatalog].client