Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
250 changes: 125 additions & 125 deletions python/pyspark/sql/connect/proto/base_pb2.py

Large diffs are not rendered by default.

18 changes: 17 additions & 1 deletion python/pyspark/sql/connect/proto/base_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -813,14 +813,30 @@ class AnalyzePlanResponse(google.protobuf.message.Message):
DESCRIPTOR: google.protobuf.descriptor.Descriptor

VERSION_FIELD_NUMBER: builtins.int
JAVA_VERSION_FIELD_NUMBER: builtins.int
SCALA_VERSION_FIELD_NUMBER: builtins.int
version: builtins.str
java_version: builtins.str
"""Java runtime version of the Spark Connect Service"""
scala_version: builtins.str
"""Scala runtime version of the Spark Connect Service"""
def __init__(
self,
*,
version: builtins.str = ...,
java_version: builtins.str = ...,
scala_version: builtins.str = ...,
) -> None: ...
def ClearField(
self, field_name: typing_extensions.Literal["version", b"version"]
self,
field_name: typing_extensions.Literal[
"java_version",
b"java_version",
"scala_version",
b"scala_version",
"version",
b"version",
],
) -> None: ...

class DDLParse(google.protobuf.message.Message):
Expand Down
4 changes: 4 additions & 0 deletions sql/connect/common/src/main/protobuf/spark/connect/base.proto
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,10 @@ message AnalyzePlanResponse {

message SparkVersion {
string version = 1;
// Java runtime version of the Spark Connect Service
string java_version = 2;
// Scala runtime version of the Spark Connect Service
string scala_version = 3;
}

message DDLParse {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ private[connect] class SparkConnectAnalyzeHandler(
proto.AnalyzePlanResponse.SparkVersion
.newBuilder()
.setVersion(session.version)
.setJavaVersion(System.getProperty("java.version"))
.setScalaVersion(scala.util.Properties.versionNumberString)
.build())

case proto.AnalyzePlanRequest.AnalyzeCase.DDL_PARSE =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import org.scalatest.concurrent.Eventually
import org.scalatest.time.SpanSugar._

import org.apache.spark.SparkException
import org.apache.spark.connect.proto
import org.apache.spark.sql.connect.SparkConnectServerTest
import org.apache.spark.sql.connect.config.Connect

Expand All @@ -46,6 +47,22 @@ class SparkConnectServiceE2ESuite extends SparkConnectServerTest {
}
}

test("AnalyzePlanRequest for spark version returns java and scala versions") {
withClient { client =>
val request = proto.AnalyzePlanRequest
.newBuilder()
.setSparkVersion(
proto.AnalyzePlanRequest.SparkVersion.newBuilder().build()
)

val response = client.analyze(request)
val sparkVersionResponse = response.getSparkVersion
assert(sparkVersionResponse.getJavaVersion == System.getProperty("java.version"))
assert(sparkVersionResponse.getScalaVersion.matches("""\d+\.\d+\.\d+"""))
assert(sparkVersionResponse.getScalaVersion == scala.util.Properties.versionNumberString)
}
}

test("ReleaseSession releases all queries and does not allow more requests in the session") {
withClient { client =>
val query1 = client.execute(buildPlan(BIG_ENOUGH_QUERY))
Expand Down