Skip to content

Commit 6ad8dd5

Browse files
author
Andrew Or
committed
Minor changes
1 parent 37854fc commit 6ad8dd5

File tree

3 files changed

+34
-26
lines changed

3 files changed

+34
-26
lines changed

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/ParserUtils.scala‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ object ParserUtils {
8181
}
8282
}
8383

84-
def parseFailed(msg: String, node: ASTNode): Nothing = {
85-
throw new AnalysisException(s"$msg: '${node.source}")
86-
}
87-
8884
def getClauses(
8985
clauseNames: Seq[String],
9086
nodeList: Seq[ASTNode]): Seq[Option[ASTNode]] = {
@@ -166,7 +162,14 @@ object ParserUtils {
166162
}
167163

168164
/**
169-
* Throw an exception because we cannot parse the given node.
165+
* Throw an exception because we cannot parse the given node for some unexpected reason.
166+
*/
167+
def parseFailed(msg: String, node: ASTNode): Nothing = {
168+
throw new AnalysisException(s"$msg: '${node.source}")
169+
}
170+
171+
/**
172+
* Throw an exception because there are no rules to parse the node.
170173
*/
171174
def noParseRule(msg: String, node: ASTNode): Nothing = {
172175
throw new NotImplementedError(

‎sql/core/src/main/scala/org/apache/spark/sql/execution/SparkQl.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private[sql] class SparkQl(conf: ParserConf = SimpleParserConf()) extends Cataly
3737
* For each node, extract properties in the form of a list ['key1', 'key2', 'key3', 'value']
3838
* into a pair (key1.key2.key3, value).
3939
*/
40-
protected def extractProps(
40+
private def extractProps(
4141
props: Seq[ASTNode],
4242
expectedNodeText: String): Seq[(String, String)] = {
4343
props.map {

‎sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLCommandSuite.scala‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,12 @@ class DDLCommandSuite extends PlanTest {
242242
""".stripMargin
243243
val parsed1 = parser.parsePlan(sql1)
244244
val parsed2 = parser.parsePlan(sql2)
245+
val tableIdent = TableIdentifier("table_name", None)
245246
val expected1 = AlterTableSkewedLocation(
246-
TableIdentifier("table_name", None),
247+
tableIdent,
247248
Map("123" -> "location1", "test" -> "location2"))(sql1)
248249
val expected2 = AlterTableSkewedLocation(
249-
TableIdentifier("table_name", None),
250+
tableIdent,
250251
Map("2008-08-08" -> "location1", "us" -> "location1", "test" -> "location2"))(sql2)
251252
comparePlans(parsed1, expected1)
252253
comparePlans(parsed2, expected2)
@@ -310,15 +311,16 @@ class DDLCommandSuite extends PlanTest {
310311
""".stripMargin
311312
val parsed1 = parser.parsePlan(sql1)
312313
val parsed2 = parser.parsePlan(sql2)
314+
val tableIdent = TableIdentifier("table_name", None)
313315
val expected1 = AlterTableDropPartition(
314-
TableIdentifier("table_name", None),
316+
tableIdent,
315317
Seq(
316318
Map("dt" -> "2008-08-08", "country" -> "us"),
317319
Map("dt" -> "2009-09-09", "country" -> "uk")),
318320
ifExists = true,
319321
purge = false)(sql1)
320322
val expected2 = AlterTableDropPartition(
321-
TableIdentifier("table_name", None),
323+
tableIdent,
322324
Seq(
323325
Map("dt" -> "2008-08-08", "country" -> "us"),
324326
Map("dt" -> "2009-09-09", "country" -> "uk")),
@@ -359,18 +361,19 @@ class DDLCommandSuite extends PlanTest {
359361
val parsed1 = parser.parsePlan(sql1)
360362
val parsed2 = parser.parsePlan(sql2)
361363
val parsed3 = parser.parsePlan(sql3)
364+
val tableIdent = TableIdentifier("table_name", None)
362365
val expected1 = AlterTableSetFileFormat(
363-
TableIdentifier("table_name", None),
366+
tableIdent,
364367
None,
365368
List("test", "test", "test", "test", "test"),
366369
None)(sql1)
367370
val expected2 = AlterTableSetFileFormat(
368-
TableIdentifier("table_name", None),
371+
tableIdent,
369372
None,
370373
List("test", "test", "test"),
371374
None)(sql2)
372375
val expected3 = AlterTableSetFileFormat(
373-
TableIdentifier("table_name", None),
376+
tableIdent,
374377
Some(Map("dt" -> "2008-08-08", "country" -> "us")),
375378
Seq(),
376379
Some("PARQUET"))(sql3)
@@ -385,12 +388,13 @@ class DDLCommandSuite extends PlanTest {
385388
"SET LOCATION 'new location'"
386389
val parsed1 = parser.parsePlan(sql1)
387390
val parsed2 = parser.parsePlan(sql2)
391+
val tableIdent = TableIdentifier("table_name", None)
388392
val expected1 = AlterTableSetLocation(
389-
TableIdentifier("table_name", None),
393+
tableIdent,
390394
None,
391395
"new location")(sql1)
392396
val expected2 = AlterTableSetLocation(
393-
TableIdentifier("table_name", None),
397+
tableIdent,
394398
Some(Map("dt" -> "2008-08-08", "country" -> "us")),
395399
"new location")(sql2)
396400
comparePlans(parsed1, expected1)
@@ -402,11 +406,12 @@ class DDLCommandSuite extends PlanTest {
402406
val sql2 = "ALTER TABLE table_name TOUCH PARTITION (dt='2008-08-08', country='us')"
403407
val parsed1 = parser.parsePlan(sql1)
404408
val parsed2 = parser.parsePlan(sql2)
409+
val tableIdent = TableIdentifier("table_name", None)
405410
val expected1 = AlterTableTouch(
406-
TableIdentifier("table_name", None),
411+
tableIdent,
407412
None)(sql1)
408413
val expected2 = AlterTableTouch(
409-
TableIdentifier("table_name", None),
414+
tableIdent,
410415
Some(Map("dt" -> "2008-08-08", "country" -> "us")))(sql2)
411416
comparePlans(parsed1, expected1)
412417
comparePlans(parsed2, expected2)
@@ -421,12 +426,13 @@ class DDLCommandSuite extends PlanTest {
421426
""".stripMargin
422427
val parsed1 = parser.parsePlan(sql1)
423428
val parsed2 = parser.parsePlan(sql2)
429+
val tableIdent = TableIdentifier("table_name", None)
424430
val expected1 = AlterTableCompact(
425-
TableIdentifier("table_name", None),
431+
tableIdent,
426432
None,
427433
"compaction_type")(sql1)
428434
val expected2 = AlterTableCompact(
429-
TableIdentifier("table_name", None),
435+
tableIdent,
430436
Some(Map("dt" -> "2008-08-08", "country" -> "us")),
431437
"MAJOR")(sql2)
432438
comparePlans(parsed1, expected1)
@@ -438,12 +444,10 @@ class DDLCommandSuite extends PlanTest {
438444
val sql2 = "ALTER TABLE table_name PARTITION (dt='2008-08-08', country='us') CONCATENATE"
439445
val parsed1 = parser.parsePlan(sql1)
440446
val parsed2 = parser.parsePlan(sql2)
441-
val expected1 = AlterTableMerge(
442-
TableIdentifier("table_name", None),
443-
None)(sql1)
447+
val tableIdent = TableIdentifier("table_name", None)
448+
val expected1 = AlterTableMerge(tableIdent, None)(sql1)
444449
val expected2 = AlterTableMerge(
445-
TableIdentifier("table_name", None),
446-
Some(Map("dt" -> "2008-08-08", "country" -> "us")))(sql2)
450+
tableIdent, Some(Map("dt" -> "2008-08-08", "country" -> "us")))(sql2)
447451
comparePlans(parsed1, expected1)
448452
comparePlans(parsed2, expected2)
449453
}
@@ -515,16 +519,17 @@ class DDLCommandSuite extends PlanTest {
515519
val parsed2 = parser.parsePlan(sql2)
516520
val meta1 = new MetadataBuilder().putString("comment", "test_comment").build()
517521
val meta2 = new MetadataBuilder().putString("comment", "test_comment2").build()
522+
val tableIdent = TableIdentifier("table_name", None)
518523
val expected1 = AlterTableAddCol(
519-
TableIdentifier("table_name", None),
524+
tableIdent,
520525
Some(Map("dt" -> "2008-08-08", "country" -> "us")),
521526
StructType(Seq(
522527
StructField("new_col1", IntegerType, nullable = true, meta1),
523528
StructField("new_col2", LongType, nullable = true, meta2))),
524529
restrict = false,
525530
cascade = true)(sql1)
526531
val expected2 = AlterTableReplaceCol(
527-
TableIdentifier("table_name", None),
532+
tableIdent,
528533
None,
529534
StructType(Seq(
530535
StructField("new_col1", IntegerType, nullable = true, meta1),

0 commit comments

Comments
 (0)