From 5c31220b94b31984bcf3aaeaee20c9e5ba0fb1f9 Mon Sep 17 00:00:00 2001 From: viktorluc-db Date: Fri, 24 Jan 2025 22:51:59 +0100 Subject: [PATCH] Resolved merge conflicts --- .../org/apache/spark/sql/connect/ClientE2ETestSuite.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/ClientE2ETestSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/ClientE2ETestSuite.scala index 99374efeff1d1..88f7dc6bbe81e 100644 --- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/ClientE2ETestSuite.scala +++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/ClientE2ETestSuite.scala @@ -42,12 +42,10 @@ import org.apache.spark.sql.catalyst.parser.ParseException import org.apache.spark.sql.connect.ConnectConversions._ import org.apache.spark.sql.connect.client.{RetryPolicy, SparkConnectClient, SparkResult} import org.apache.spark.sql.connect.test.{ConnectFunSuite, IntegrationTestUtils, RemoteSparkSession, SQLHelper} +import org.apache.spark.sql.connect.test.QueryTest import org.apache.spark.sql.connect.test.SparkConnectServerUtils.port import org.apache.spark.sql.functions._ import org.apache.spark.sql.internal.SqlApiConf -import org.apache.spark.sql.test.{ConnectFunSuite, IntegrationTestUtils, RemoteSparkSession, SQLHelper} -import org.apache.spark.sql.test.QueryTest -import org.apache.spark.sql.test.SparkConnectServerUtils.port import org.apache.spark.sql.types._ import org.apache.spark.util.SparkThreadUtils