Skip to content

[MINOR] Minor English fixes #45461

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
nchammas wants to merge 2 commits into from
Closed

[MINOR] Minor English fixes #45461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2939299
minor English fixes
nchammas Mar 11, 2024
1af2f40
fix test
nchammas Mar 12, 2024
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
8 changes: 4 additions & 4 deletions common/utils/src/main/resources/error/error-classes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"AMBIGUOUS_COLUMN_REFERENCE" : {
"message" : [
"Column <name> is ambiguous. It's because you joined several DataFrame together, and some of these DataFrames are the same.",
"This column points to one of the DataFrame but Spark is unable to figure out which one.",
"This column points to one of the DataFrames but Spark is unable to figure out which one.",
"Please alias the DataFrames with different names via `DataFrame.alias` before joining them,",
"and specify the column using qualified name, e.g. `df.alias(\"a\").join(df.alias(\"b\"), col(\"a.id\") > col(\"b.id\"))`."
],
Expand Down Expand Up @@ -6138,17 +6138,17 @@
},
"_LEGACY_ERROR_TEMP_2109" : {
"message" : [
"Cannot build HashedRelation with more than 1/3 billions unique keys."
"Cannot build HashedRelation with more than 1/3 billion unique keys."
]
},
"_LEGACY_ERROR_TEMP_2110" : {
"message" : [
"Can not build a HashedRelation that is larger than 8G."
"Cannot build a HashedRelation that is larger than 8G."
]
},
"_LEGACY_ERROR_TEMP_2111" : {
"message" : [
"failed to push a row into <rowQueue>."
"Failed to push a row into <rowQueue>."
]
},
"_LEGACY_ERROR_TEMP_2112" : {
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,11 @@ class BlockManagerMasterEndpoint(
val isAlive = try {
driverEndpoint.askSync[Boolean](CoarseGrainedClusterMessages.IsExecutorAlive(executorId))
} catch {
// ignore the non-fatal error from driverEndpoint since the caller doesn't really
// care about the return result of removing blocks. And so we could avoid breaking
// Ignore the non-fatal error from driverEndpoint since the caller doesn't really
// care about the return result of removing blocks. That way we avoid breaking
// down the whole application.
case NonFatal(e) =>
logError(s"Fail to know the executor $executorId is alive or not.", e)
logError(s"Cannot determine whether executor $executorId is alive or not.", e)
false
}
if (!isAlive) {
Expand Down
2 changes: 1 addition & 1 deletion docs/sql-error-conditions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Column or field `<name>` is ambiguous and has `<n>` matches.
[SQLSTATE: 42702](sql-error-conditions-sqlstates.html#class-42-syntax-error-or-access-rule-violation)

Column `<name>` is ambiguous. It's because you joined several DataFrame together, and some of these DataFrames are the same.
This column points to one of the DataFrame but Spark is unable to figure out which one.
This column points to one of the DataFrames but Spark is unable to figure out which one.
Please alias the DataFrames with different names via `DataFrame.alias` before joining them,
and specify the column using qualified name, e.g. `df.alias("a").join(df.alias("b"), col("a.id") > col("b.id"))`.

Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/execution/ui/UISeleniumSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class UISeleniumSuite extends SparkFunSuite with WebBrowser {
test("SPARK-44801: Analyzer failure shall show the query in failed table") {
spark = creatSparkSessionWithUI

intercept[Exception](spark.sql("SELECT * FROM I_AM_A_INVISIBLE_TABLE").isEmpty)
intercept[Exception](spark.sql("SELECT * FROM I_AM_AN_INVISIBLE_TABLE").isEmpty)
eventually(timeout(10.seconds), interval(100.milliseconds)) {
val sd = findErrorMessageOnSQLUI()
assert(sd.size === 1, "Analyze fail shall show the query in failed table")
Expand Down