grundprinzip commented on code in PR #40160:
URL: https://github.com/apache/spark/pull/40160#discussion_r1119366678
##########
connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/SparkSession.scala:
##########
@@ -89,8 +90,29 @@ class SparkSession(
@Experimental
def sql(sqlText: String, args: java.util.Map[String, String]): DataFrame =
newDataset {
builder =>
- builder
- .setSql(proto.SQL.newBuilder().setQuery(sqlText).putAllArgs(args))
+ // Send the SQL once to the server and then check the output.
+ val cmd = newCommand(b =>
+
b.setSqlCommand(proto.SqlCommand.newBuilder().setSql(sqlText).putAllArgs(args)))
+ val plan = proto.Plan.newBuilder().setCommand(cmd)
+ val response = client.execute(plan.build())
+ val (data, isSqlCommand) =
+ response.asScala.foldLeft((Seq[ByteString](), false))((acc, resp) =>
Review Comment:
Fixed.
##########
connector/connect/server/src/main/scala/org/apache/spark/sql/connect/planner/SparkConnectPlanner.scala:
##########
@@ -1450,10 +1457,27 @@ class SparkConnectPlanner(val session: SparkSession) {
handleWriteOperationV2(command.getWriteOperationV2)
case proto.Command.CommandTypeCase.EXTENSION =>
handleCommandPlugin(command.getExtension)
+ case proto.Command.CommandTypeCase.SQL_COMMAND =>
+ handleSqlCommand(command.getSqlCommand, clientId, responseObserver)
case _ => throw new UnsupportedOperationException(s"$command not
supported.")
}
}
+ def handleSqlCommand(
+ getSqlCommand: SqlCommand,
+ clientId: String,
+ responseObserver: StreamObserver[ExecutePlanResponse]): Unit = {
+ val df = session.sql(getSqlCommand.getSql, getSqlCommand.getArgsMap)
+ val isCommand =
df.queryExecution.commandExecuted.isInstanceOf[CommandResult]
+ responseObserver.onNext(
+ ExecutePlanResponse
+ .newBuilder()
+ .setClientId(clientId)
+
.setSqlCommandResult(SqlCommandResult.newBuilder().setIsCommand(isCommand))
+ .build())
+ SparkConnectStreamHandler.processAsArrowBatches(clientId, df,
responseObserver)
Review Comment:
Removed :(
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
