Rename the enum: Dataset -> DataFrame

common/utils/src/main/java/org/apache/spark/QueryContextType.java

@@ -27,5 +27,5 @@
 @Evolving
 public enum QueryContextType {
     SQL,
-    Dataset
+    DataFrame
 }

common/utils/src/main/scala/org/apache/spark/SparkThrowableHelper.scala

@@ -123,7 +123,7 @@ private[spark] object SparkThrowableHelper {
                   val stopIndex = c.stopIndex() + 1
                   if (stopIndex > 0) g.writeNumberField("stopIndex", stopIndex)
                   g.writeStringField("fragment", c.fragment())
-                case QueryContextType.Dataset =>
+                case QueryContextType.DataFrame =>
                   g.writeStringField("fragment", c.fragment())
                   g.writeStringField("callSite", c.callSite())
               }

connector/connect/common/src/main/scala/org/apache/spark/sql/connect/client/GrpcExceptionConverter.scala

@@ -325,7 +325,7 @@ private[client] object GrpcExceptionConverter {
       new QueryContext {
         override def contextType(): QueryContextType = queryCtx.getContextType match {
           case FetchErrorDetailsResponse.QueryContext.ContextType.DATASET =>
-            QueryContextType.Dataset
+            QueryContextType.DataFrame
           case _ => QueryContextType.SQL
         }
         override def objectType(): String = queryCtx.getObjectType

core/src/test/scala/org/apache/spark/SparkFunSuite.scala

@@ -377,7 +377,7 @@ abstract class SparkFunSuite
           "Invalid stopIndex of a query context. Actual:" + actual.toString)
         assert(actual.fragment() === expected.fragment,
           "Invalid fragment of a query context. Actual:" + actual.toString)
-      } else if (actual.contextType() == QueryContextType.Dataset) {
+      } else if (actual.contextType() == QueryContextType.DataFrame) {
         assert(actual.fragment() === expected.fragment,
           "Invalid code fragment of a query context. Actual:" + actual.toString)
         assert(actual.callSite().matches(expected.callSitePattern),
@@ -487,7 +487,7 @@ abstract class SparkFunSuite
     }
 
     def apply(fragment: String, callSitePattern: String): ExpectedContext = {
-      new ExpectedContext(QueryContextType.Dataset, "", "", -1, -1, fragment, callSitePattern)
+      new ExpectedContext(QueryContextType.DataFrame, "", "", -1, -1, fragment, callSitePattern)
     }
   }
 

core/src/test/scala/org/apache/spark/SparkThrowableSuite.scala

@@ -582,7 +582,7 @@ class SparkThrowableSuite extends SparkFunSuite {
         |}""".stripMargin)
 
     class TestQueryContext2 extends QueryContext {
-      override val contextType = QueryContextType.Dataset
+      override val contextType = QueryContextType.DataFrame
       override def objectName: String = throw new UnsupportedOperationException
       override def objectType: String = throw new UnsupportedOperationException
       override def startIndex: Int = throw new UnsupportedOperationException

sql/api/src/main/scala/org/apache/spark/sql/catalyst/trees/QueryContexts.scala

@@ -137,7 +137,7 @@ case class SQLQueryContext(
 case class DatasetQueryContext(
     override val fragment: String,
     override val callSite: String) extends QueryContext {
-  override val contextType = QueryContextType.Dataset
+  override val contextType = QueryContextType.DataFrame
 
   override def objectType: String = throw new UnsupportedOperationException
   override def objectName: String = throw new UnsupportedOperationException