Skip to content

[SPARK-40324][SQL][FOLLOWUP] Fix a bug in setting query context in Analyzer #37861

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
gengliangwang wants to merge 9 commits into from
Closed

[SPARK-40324][SQL][FOLLOWUP] Fix a bug in setting query context in Analyzer #37861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8ed5460
fix
gengliangwang Sep 13, 2022
8e46212
fix test failures
gengliangwang Sep 13, 2022
3f4b5be
Merge remote-tracking branch 'upstream/master' into fxiReg
gengliangwang Sep 13, 2022
d24ced5
fix
gengliangwang Sep 13, 2022
4703a70
fix
gengliangwang Sep 13, 2022
70e0ff4
fix SQLQuerySuite
gengliangwang Sep 13, 2022
8add274
fix more test failures
gengliangwang Sep 14, 2022
86ceebf
Merge remote-tracking branch 'upstream/master' into fxiReg
gengliangwang Sep 14, 2022
76ec4b8
fix
gengliangwang Sep 14, 2022
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
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/AnalysisException.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class AnalysisException protected[sql] (
cause: Option[Throwable] = this.cause,
errorClass: Option[String] = this.errorClass,
messageParameters: Map[String, String] = this.messageParameters,
context: Array[QueryContext] = Array.empty): AnalysisException =
context: Array[QueryContext] = this.context): AnalysisException =
new AnalysisException(message, line, startPosition, plan, cause, errorClass, errorSubClass,
messageParameters, context)

Expand Down
3 changes: 1 addition & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,7 @@ class Analyzer(override val catalogManager: CatalogManager)
analyzed
} catch {
case e: AnalysisException =>
val ae = e.copy(plan = Option(analyzed),
context = analyzed.origin.getQueryContext)
val ae = e.copy(plan = Option(analyzed))
ae.setStackTrace(e.getStackTrace)
throw ae
}
Expand Down
118 changes: 59 additions & 59 deletions sql/core/src/test/resources/sql-tests/results/ansi/interval.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 30,
"fragment" : "select '2' / interval 2 second"
"fragment" : "'2' / interval 2 second"
} ]
}

Expand All @@ -320,9 +320,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 28,
"fragment" : "select '2' / interval 2 year"
"fragment" : "'2' / interval 2 year"
} ]
}

Expand Down Expand Up @@ -430,9 +430,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 28,
"fragment" : "select 2 / interval '2' year"
"fragment" : "2 / interval '2' year"
} ]
}

Expand All @@ -454,9 +454,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 28,
"fragment" : "select 2 / interval '2' hour"
"fragment" : "2 / interval '2' hour"
} ]
}

Expand All @@ -478,9 +478,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 31,
"fragment" : "select null / interval '2' year"
"fragment" : "null / interval '2' year"
} ]
}

Expand All @@ -502,9 +502,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 31,
"fragment" : "select null / interval '2' hour"
"fragment" : "null / interval '2' hour"
} ]
}

Expand Down Expand Up @@ -1680,9 +1680,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"stopIndex" : 388,
"fragment" : "select\n interval '2' year + '3-3 year to month',\n interval '2' year - '3 month',\n '3-2 year to month' + interval '2-2' year to month,\n '3 year' - interval '2-2' year to month,\n interval '99 11:22:33.123456789' day to second + '12:12 hour to second',\n interval '99 11:22:33.123456789' day to second - '12 hour',\n '4 day' + interval '10' day,\n '4 22 day to hour' - interval '10' day"
"startIndex" : 10,
"stopIndex" : 48,
"fragment" : "interval '2' year + '3-3 year to month'"
} ]
}

Expand Down Expand Up @@ -1720,9 +1720,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 32,
"fragment" : "select interval '2' year + '3-3'"
"fragment" : "interval '2' year + '3-3'"
} ]
}

Expand All @@ -1744,9 +1744,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 30,
"fragment" : "select interval '2' year - '4'"
"fragment" : "interval '2' year - '4'"
} ]
}

Expand Down Expand Up @@ -1826,9 +1826,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"stopIndex" : 49,
"fragment" : "select interval '2' year + str from interval_view"
"startIndex" : 8,
"stopIndex" : 30,
"fragment" : "interval '2' year + str"
} ]
}

Expand All @@ -1850,9 +1850,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"stopIndex" : 49,
"fragment" : "select interval '2' year - str from interval_view"
"startIndex" : 8,
"stopIndex" : 30,
"fragment" : "interval '2' year - str"
} ]
}

Expand Down Expand Up @@ -1951,9 +1951,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 54,
"fragment" : "select interval '3' day - interval '2-2' year to month"
"fragment" : "interval '3' day - interval '2-2' year to month"
} ]
}

Expand Down Expand Up @@ -1984,9 +1984,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 29,
"fragment" : "select 1 + interval '2' month"
"fragment" : "1 + interval '2' month"
} ]
}

Expand Down Expand Up @@ -2017,9 +2017,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 29,
"fragment" : "select interval '2' month - 1"
"fragment" : "interval '2' month - 1"
} ]
}

Expand Down Expand Up @@ -2888,9 +2888,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 42,
"fragment" : "SELECT INTERVAL 1 MONTH > INTERVAL 20 DAYS"
"fragment" : "INTERVAL 1 MONTH > INTERVAL 20 DAYS"
} ]
}

Expand All @@ -2912,9 +2912,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 29,
"fragment" : "SELECT INTERVAL '1' DAY < '1'"
"fragment" : "INTERVAL '1' DAY < '1'"
} ]
}

Expand All @@ -2936,9 +2936,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 29,
"fragment" : "SELECT INTERVAL '1' DAY = '1'"
"fragment" : "INTERVAL '1' DAY = '1'"
} ]
}

Expand All @@ -2960,9 +2960,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 29,
"fragment" : "SELECT INTERVAL '1' DAY > '1'"
"fragment" : "INTERVAL '1' DAY > '1'"
} ]
}

Expand All @@ -2984,9 +2984,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 29,
"fragment" : "SELECT '1' < INTERVAL '1' DAY"
"fragment" : "'1' < INTERVAL '1' DAY"
} ]
}

Expand All @@ -3008,9 +3008,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 29,
"fragment" : "SELECT '1' = INTERVAL '1' DAY"
"fragment" : "'1' = INTERVAL '1' DAY"
} ]
}

Expand All @@ -3032,9 +3032,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 29,
"fragment" : "SELECT '1' > INTERVAL '1' DAY"
"fragment" : "'1' > INTERVAL '1' DAY"
} ]
}

Expand All @@ -3056,9 +3056,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 30,
"fragment" : "SELECT INTERVAL '1' YEAR < '1'"
"fragment" : "INTERVAL '1' YEAR < '1'"
} ]
}

Expand All @@ -3080,9 +3080,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 30,
"fragment" : "SELECT INTERVAL '1' YEAR = '1'"
"fragment" : "INTERVAL '1' YEAR = '1'"
} ]
}

Expand All @@ -3104,9 +3104,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 30,
"fragment" : "SELECT INTERVAL '1' YEAR > '1'"
"fragment" : "INTERVAL '1' YEAR > '1'"
} ]
}

Expand All @@ -3128,9 +3128,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 30,
"fragment" : "SELECT '1' < INTERVAL '1' YEAR"
"fragment" : "'1' < INTERVAL '1' YEAR"
} ]
}

Expand All @@ -3152,9 +3152,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 30,
"fragment" : "SELECT '1' = INTERVAL '1' YEAR"
"fragment" : "'1' = INTERVAL '1' YEAR"
} ]
}

Expand All @@ -3176,9 +3176,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 30,
"fragment" : "SELECT '1' > INTERVAL '1' YEAR"
"fragment" : "'1' > INTERVAL '1' YEAR"
} ]
}

Expand Down Expand Up @@ -3298,9 +3298,9 @@ org.apache.spark.sql.AnalysisException
"queryContext" : [ {
"objectType" : "",
"objectName" : "",
"startIndex" : 1,
"startIndex" : 8,
"stopIndex" : 49,
"fragment" : "SELECT div(INTERVAL '1' MONTH, INTERVAL '-1' DAY)"
"fragment" : "div(INTERVAL '1' MONTH, INTERVAL '-1' DAY)"
} ]
}

Expand Down
Loading