ionagamed commented on code in PR #56190:
URL: https://github.com/apache/spark/pull/56190#discussion_r3491879866
##########
sql/connect/common/src/main/scala/org/apache/spark/sql/connect/Dataset.scala:
##########
@@ -241,6 +241,29 @@ class Dataset[T] private[sql] (
// scalastyle:on println
}
+ private[connect] def explainString(mode: String): String = {
+ val protoMode = mode.trim.toLowerCase(util.Locale.ROOT) match {
+ case "simple" =>
proto.AnalyzePlanRequest.Explain.ExplainMode.EXPLAIN_MODE_SIMPLE
+ case "extended" =>
proto.AnalyzePlanRequest.Explain.ExplainMode.EXPLAIN_MODE_EXTENDED
+ case "codegen" =>
proto.AnalyzePlanRequest.Explain.ExplainMode.EXPLAIN_MODE_CODEGEN
+ case "cost" =>
proto.AnalyzePlanRequest.Explain.ExplainMode.EXPLAIN_MODE_COST
+ case "formatted" =>
proto.AnalyzePlanRequest.Explain.ExplainMode.EXPLAIN_MODE_FORMATTED
+ case _ => throw new IllegalArgumentException("Unsupported explain mode:
" + mode)
+ }
+ sparkSession
+ .analyze(plan, proto.AnalyzePlanRequest.AnalyzeCase.EXPLAIN,
Some(protoMode))
+ .getExplain
+ .getExplainString
+ }
+
+ private[connect] def explainString(extended: Boolean): String = if
(extended) {
+ explainString("extended")
+ } else {
+ explainString("simple")
+ }
+
+ private[connect] def explainString(): String = explainString("simple")
Review Comment:
Agreed, dropped.
##########
sql/core/src/test/scala/org/apache/spark/sql/CheckAnswerHelper.scala:
##########
@@ -0,0 +1,215 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql
+
+import java.util.TimeZone
+
+import org.scalatest.Assertions
+
+import org.apache.spark.annotation.Experimental
+import org.apache.spark.sql.catalyst.ExtendedAnalysisException
+import org.apache.spark.sql.catalyst.plans.logical
+import org.apache.spark.util.{SparkErrorUtils, SparkStringUtils}
+
+/**
+ * Provides [[checkAnswer]] helper for SQL- & DataFrame-API tests.
+ *
+ * TODO: should be moved to sql/api together with SessionQueryTestBase
+ */
+@Experimental
+trait CheckAnswerHelper extends Assertions {
+
+ /**
+ * Runs the plan and makes sure the answer matches the expected result.
+ *
+ * @param df the DataFrame to be executed
+ * @param expectedAnswer the expected result in a Seq of Rows.
+ */
+ protected def checkAnswer(df: => DataFrame, expectedAnswer: Seq[Row]): Unit
= {
+
+ val analyzedDF = try df catch {
+ case ae: ExtendedAnalysisException =>
+ if (ae.plan.isDefined) {
+ fail(
+ s"""
+ |Failed to analyze query: $ae
+ |${ae.plan.get}
+ |
+ |${SparkErrorUtils.stackTraceToString(ae)}
+ |""".stripMargin)
+ } else {
+ throw ae
+ }
+ }
+
+ getErrorMessageInCheckAnswer(analyzedDF, expectedAnswer) match {
+ case Some(errorMessage) => fail(errorMessage)
+ case None =>
+ }
+ }
+
+ /*
+ * Note: when moving this to sql/api, implementation should stay in sql/core
+ * (i.e. only have abstract decl in sql/api)
+ */
+ protected def isDfSorted(df: DataFrame): Boolean = {
+ df match {
+ case df: classic.DataFrame =>
+ df.logicalPlan.collectFirst { case s: logical.Sort => s }.nonEmpty
+ case _ =>
+ // isDfSorted should be overriden by connect so that this case can't
be reached.
Review Comment:
Thanks! Fixed.
--
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]
