Skip to content

[SPARK-47341][Connect] Replace commands with relations in a few tests in SparkConnectClientSuite #45460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xi-db wants to merge 1 commit into from
Closed

[SPARK-47341][Connect] Replace commands with relations in a few tests in SparkConnectClientSuite #45460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions ...ient/jvm/src/test/scala/org/apache/spark/sql/connect/client/SparkConnectClientSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import org.scalatest.time.SpanSugar._

import org.apache.spark.{SparkException, SparkThrowable}
import org.apache.spark.connect.proto
import org.apache.spark.connect.proto.{AddArtifactsRequest, AddArtifactsResponse, AnalyzePlanRequest, AnalyzePlanResponse, ArtifactStatusesRequest, ArtifactStatusesResponse, ExecutePlanRequest, ExecutePlanResponse, SparkConnectServiceGrpc}
import org.apache.spark.connect.proto.{AddArtifactsRequest, AddArtifactsResponse, AnalyzePlanRequest, AnalyzePlanResponse, ArtifactStatusesRequest, ArtifactStatusesResponse, ExecutePlanRequest, ExecutePlanResponse, Relation, SparkConnectServiceGrpc, SQL}
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.connect.common.config.ConnectCommon
import org.apache.spark.sql.test.ConnectFunSuite
Expand Down Expand Up @@ -478,21 +478,23 @@ class SparkConnectClientSuite extends ConnectFunSuite with BeforeAndAfterEach {
session.addArtifact(artifactFilePath.resolve("smallClassFile.class").toString)
}

private def buildPlan(query: String): proto.Plan = {
proto.Plan
.newBuilder()
.setRoot(Relation.newBuilder().setSql(SQL.newBuilder().setQuery(query)).build())
.build()
}

test("SPARK-45871: Client execute iterator.toSeq consumes the reattachable iterator") {
startDummyServer(0)
client = SparkConnectClient
.builder()
.connectionString(s"sc://localhost:${server.getPort}")
.enableReattachableExecute()
.build()
val session = SparkSession.builder().client(client).create()
val cmd = session.newCommand(b =>
b.setSqlCommand(
proto.SqlCommand
.newBuilder()
.setSql("select * from range(10000000)")))
val plan = proto.Plan.newBuilder().setCommand(cmd)
val iter = client.execute(plan.build())

val plan = buildPlan("select * from range(10000000)")
val iter = client.execute(plan)
val reattachableIter =
ExecutePlanResponseReattachableIterator.fromIterator(iter)
iter.toSeq
Expand All @@ -512,14 +514,9 @@ class SparkConnectClientSuite extends ConnectFunSuite with BeforeAndAfterEach {
.connectionString(s"sc://localhost:${server.getPort}")
.enableReattachableExecute()
.build()
val session = SparkSession.builder().client(client).create()
val cmd = session.newCommand(b =>
b.setSqlCommand(
proto.SqlCommand
.newBuilder()
.setSql("select * from range(10000000)")))
val plan = proto.Plan.newBuilder().setCommand(cmd)
val iter = client.execute(plan.build())

val plan = buildPlan("select * from range(10000000)")
val iter = client.execute(plan)
val reattachableIter =
ExecutePlanResponseReattachableIterator.fromIterator(iter)
iter.foreach(_ => ())
Expand Down