Skip to content

[SPARK-51787] Remove sessionID parameter from getExecutePlanRequest #55

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
wants to merge 1 commit into from
Closed

[SPARK-51787] Remove sessionID parameter from getExecutePlanRequest #55

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions Sources/SparkConnect/DataFrame.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public actor DataFrame: Sendable {
)
) { client in
let service = Spark_Connect_SparkConnectService.Client(wrapping: client)
try await service.executePlan(spark.client.getExecutePlanRequest(spark.sessionID, plan)) {
try await service.executePlan(spark.client.getExecutePlanRequest(plan)) {
response in
for try await m in response.messages {
counter.add(m.arrowBatch.rowCount, ordering: .relaxed)
Expand All @@ -158,7 +158,7 @@ public actor DataFrame: Sendable {
)
) { client in
let service = Spark_Connect_SparkConnectService.Client(wrapping: client)
try await service.executePlan(spark.client.getExecutePlanRequest(spark.sessionID, plan)) {
try await service.executePlan(spark.client.getExecutePlanRequest(plan)) {
response in
for try await m in response.messages {
if m.hasSchema {
Expand Down
4 changes: 2 additions & 2 deletions Sources/SparkConnect/SparkConnectClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ public actor SparkConnectClient {
/// - Parameters:
/// - plan: A plan to execute.
/// - Returns: An ``ExecutePlanRequest`` instance.
func getExecutePlanRequest(_ sessionID: String, _ plan: Plan) async
func getExecutePlanRequest(_ plan: Plan) async
-> ExecutePlanRequest
{
var request = ExecutePlanRequest()
Expand Down Expand Up @@ -402,7 +402,7 @@ public actor SparkConnectClient {
let service = SparkConnectService.Client(wrapping: client)
var plan = Plan()
plan.opType = .command(command)
try await service.executePlan(getExecutePlanRequest(sessionID, plan)) {
try await service.executePlan(getExecutePlanRequest(plan)) {
response in
for try await m in response.messages {
await self.addResponse(m)
Expand Down
9 changes: 4 additions & 5 deletions Tests/SparkConnectTests/SparkConnectClientTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,16 @@ struct SparkConnectClientTests {
@Test
func tags() async throws {
let client = SparkConnectClient(remote: "sc://localhost", user: "test")
let sessionID = UUID().uuidString
let _ = try await client.connect(sessionID)
let _ = try await client.connect(UUID().uuidString)
let plan = await client.getPlanRange(0, 1, 1)

#expect(await client.getExecutePlanRequest(sessionID, plan).tags.isEmpty)
#expect(await client.getExecutePlanRequest(plan).tags.isEmpty)
try await client.addTag(tag: "tag1")

#expect(await client.getExecutePlanRequest(sessionID, plan).tags == ["tag1"])
#expect(await client.getExecutePlanRequest(plan).tags == ["tag1"])
await client.clearTags()

#expect(await client.getExecutePlanRequest(sessionID, plan).tags.isEmpty)
#expect(await client.getExecutePlanRequest(plan).tags.isEmpty)
await client.stop()
}
}
Loading