Skip to content

[SPARK-45022][SQL] Provide context for dataset API errors #43334

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
MaxGekk wants to merge 34 commits into from
Closed

[SPARK-45022][SQL] Provide context for dataset API errors #43334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
1be285c
[SPARK-45022][SQL] Provide context for dataset API errors
peter-toth Sep 18, 2023
4a3bc50
Remove an unused import
MaxGekk Oct 12, 2023
541928c
Merge remote-tracking branch 'origin/master' into context-for-dataset…
MaxGekk Oct 16, 2023
13dc953
Add stubs
MaxGekk Oct 17, 2023
eccd67a
Merge remote-tracking branch 'origin/master' into context-for-dataset…
MaxGekk Oct 17, 2023
6a2a33f
Fix MiMa
MaxGekk Oct 18, 2023
a364f29
Update proto QueryContext
MaxGekk Oct 22, 2023
4dc6cf1
Remove TODO
MaxGekk Oct 22, 2023
c58985a
Merge remote-tracking branch 'origin/master' into context-for-dataset…
MaxGekk Oct 22, 2023
a4e2093
Merge remote-tracking branch 'origin/master' into context-for-dataset…
MaxGekk Oct 22, 2023
fe1381e
Re-gen base_pb2.py
MaxGekk Oct 22, 2023
98fbc97
Fix a compile error
MaxGekk Oct 23, 2023
bc842a7
Fix SparkThrowableSuite
MaxGekk Oct 23, 2023
8de761d
Merge remote-tracking branch 'origin/master' into context-for-dataset…
MaxGekk Oct 23, 2023
8e09da0
Merge remote-tracking branch 'origin/master' into context-for-dataset…
MaxGekk Oct 24, 2023
1c33a00
Merge remote-tracking branch 'origin/master' into context-for-dataset…
MaxGekk Oct 25, 2023
3bf3bb9
Replace code by fragment
MaxGekk Oct 25, 2023
2bfac72
Remove code from proto
MaxGekk Oct 25, 2023
744b8ae
Re-gen base_pb2
MaxGekk Oct 25, 2023
651ee45
code -> fragment
MaxGekk Oct 26, 2023
98a12b5
Resolve conflicts in MiMa
MaxGekk Oct 26, 2023
61b34e6
Fix SparkThrowableSuite
MaxGekk Oct 26, 2023
29110b5
Remove framesToDrop
MaxGekk Oct 26, 2023
810076d
Remove optional
MaxGekk Oct 27, 2023
4042fb4
Re-gen base_pb2
MaxGekk Oct 27, 2023
115eca3
Merge remote-tracking branch 'origin/master' into context-for-dataset…
MaxGekk Oct 30, 2023
50fb94f
Revert override
MaxGekk Oct 31, 2023
9a31a07
since 3.5.0 -> since 4.0.0
MaxGekk Oct 31, 2023
0aa7850
Rename the enum: Dataset -> DataFrame
MaxGekk Oct 31, 2023
fe7b4a8
Rename proto: DATASET -> DATAFRAME
MaxGekk Oct 31, 2023
9ee81a6
Merge remote-tracking branch 'origin/master' into context-for-dataset…
MaxGekk Oct 31, 2023
75e251d
Rename the class: DatasetQueryContext -> DataFrameQueryContext
MaxGekk Oct 31, 2023
605fa50
Update summary: Dataset -> DataFrame
MaxGekk Oct 31, 2023
3cf20d7
Re-gen base_pb2.py
MaxGekk Oct 31, 2023
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
Prev Previous commit
Next Next commit
Rename the class: DatasetQueryContext -> DataFrameQueryContext
  • Loading branch information
@MaxGekk
MaxGekk committed Oct 31, 2023
commit 75e251d50f65c42ad59888528ed3eeb8abf8996d
8 changes: 4 additions & 4 deletions sql/api/src/main/scala/org/apache/spark/sql/catalyst/trees/QueryContexts.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ case class SQLQueryContext(
override def callSite: String = throw new UnsupportedOperationException
}

case class DatasetQueryContext(
case class DataFrameQueryContext(
override val fragment: String,
override val callSite: String) extends QueryContext {
override val contextType = QueryContextType.DataFrame
Expand All @@ -158,8 +158,8 @@ case class DatasetQueryContext(
}
}

object DatasetQueryContext {
def apply(elements: Array[StackTraceElement]): DatasetQueryContext = {
object DataFrameQueryContext {
def apply(elements: Array[StackTraceElement]): DataFrameQueryContext = {
val methodName = elements(0).getMethodName
val code = if (methodName.length > 1 && methodName(0) == '$') {
methodName.substring(1)
Expand All @@ -168,6 +168,6 @@ object DatasetQueryContext {
}
val callSite = elements(1).toString
Copy link
Member Author

@MaxGekk MaxGekk Oct 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We assume that elements contains at least two elements. The assumption comes from the code:

  private[sql] def withOrigin[T](f: => T): T = {
...
      var i = 3
      while (i < st.length && sparkCode(st(i))) i += 1

Copy link
Contributor

@cloud-fan cloud-fan Oct 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall we explicitly add an assert in this method?


DatasetQueryContext(code, callSite)
DataFrameQueryContext(code, callSite)
}
}
2 changes: 1 addition & 1 deletion sql/api/src/main/scala/org/apache/spark/sql/catalyst/trees/origin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ case class Origin(
stackTrace: Option[Array[StackTraceElement]] = None) {

lazy val context: QueryContext = if (stackTrace.isDefined) {
DatasetQueryContext(stackTrace.get)
DataFrameQueryContext(stackTrace.get)
} else {
SQLQueryContext(
line, startPosition, startIndex, stopIndex, sqlText, objectType, objectName)
Expand Down