This is an automated email from the ASF dual-hosted git repository.
yamamuro pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new a415d07 [MINOR][SQL] Fix error position of NOSCAN
a415d07 is described below
commit a415d07c90ad46c9d88d78e956cb5680b213ce71
Author: yi.wu <yi...@databricks.com>
AuthorDate: Fri Feb 21 15:21:53 2020 +0900
[MINOR][SQL] Fix error position of NOSCAN
### What changes were proposed in this pull request?
Point to correct position when miswrite `NOSCAN` detects.
### Why are the changes needed?
Before:
```
[info] org.apache.spark.sql.catalyst.parser.ParseException: Expected
`NOSCAN` instead of `SCAN`(line 1, pos 0)
[info]
[info] == SQL ==
[info] ANALYZE TABLE analyze_partition_with_null PARTITION (name) COMPUTE
STATISTICS SCAN
[info] ^^^
```
After:
```
[info] org.apache.spark.sql.catalyst.parser.ParseException: Expected
`NOSCAN` instead of `SCAN`(line 1, pos 78)
[info]
[info] == SQL ==
[info] ANALYZE TABLE analyze_partition_with_null PARTITION (name) COMPUTE
STATISTICS SCAN
[info]
------------------------------------------------------------------------------^^^
```
### Does this PR introduce any user-facing change?
Yes, user will see better error message.
### How was this patch tested?
Manually test.
Closes #27662 from Ngone51/fix_noscan_reference.
Authored-by: yi.wu <yi...@databricks.com>
Signed-off-by: Takeshi Yamamuro <yamam...@apache.org>
(cherry picked from commit 4d356554a61024c7d3dc450accec1b3639c37e19)
Signed-off-by: Takeshi Yamamuro <yamam...@apache.org>
---
.../main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
index 62e5685..36c1647 100644
---
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
+++
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
@@ -3165,7 +3165,8 @@ class AstBuilder(conf: SQLConf) extends
SqlBaseBaseVisitor[AnyRef] with Logging
}
if (ctx.identifier != null &&
ctx.identifier.getText.toLowerCase(Locale.ROOT) != "noscan") {
- throw new ParseException(s"Expected `NOSCAN` instead of
`${ctx.identifier.getText}`", ctx)
+ throw new ParseException(s"Expected `NOSCAN` instead of
`${ctx.identifier.getText}`",
+ ctx.identifier())
}
val tableName = visitMultipartIdentifier(ctx.multipartIdentifier())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
