[SPARK-33453][SQL][TESTS] Unify v1 and v2 SHOW PARTITIONS tests #30377
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.execution.command | ||
|
|
||
| import org.apache.spark.sql.catalyst.analysis.AnalysisTest | ||
| import org.apache.spark.sql.catalyst.parser.CatalystSqlParser.parsePlan | ||
| import org.apache.spark.sql.catalyst.parser.ParseException | ||
| import org.apache.spark.sql.catalyst.plans.logical.ShowPartitionsStatement | ||
| import org.apache.spark.sql.execution.SparkSqlParser | ||
| import org.apache.spark.sql.internal.SQLConf | ||
| import org.apache.spark.sql.test.SharedSparkSession | ||
|
|
||
| class ShowPartitionsParserSuite extends AnalysisTest with SharedSparkSession { | ||
| test("SHOW PARTITIONS") { | ||
| Seq( | ||
| "SHOW PARTITIONS t1" -> ShowPartitionsStatement(Seq("t1"), None), | ||
| "SHOW PARTITIONS db1.t1" -> ShowPartitionsStatement(Seq("db1", "t1"), None), | ||
| "SHOW PARTITIONS t1 PARTITION(partcol1='partvalue', partcol2='partvalue')" -> | ||
| ShowPartitionsStatement( | ||
| Seq("t1"), | ||
| Some(Map("partcol1" -> "partvalue", "partcol2" -> "partvalue"))), | ||
| "SHOW PARTITIONS a.b.c" -> ShowPartitionsStatement(Seq("a", "b", "c"), None), | ||
| "SHOW PARTITIONS a.b.c PARTITION(ds='2017-06-10')" -> | ||
| ShowPartitionsStatement(Seq("a", "b", "c"), Some(Map("ds" -> "2017-06-10"))) | ||
| ).foreach { case (sql, expected) => | ||
| val parsed = parsePlan(sql) | ||
| comparePlans(parsed, expected) | ||
| } | ||
| } | ||
|
|
||
| test("empty values in non-optional partition specs") { | ||
| val parser = new SparkSqlParser(new SQLConf) | ||
| val e = intercept[ParseException] { | ||
| parser.parsePlan( | ||
| "SHOW PARTITIONS dbx.tab1 PARTITION (a='1', b)") | ||
| }.getMessage | ||
| assert(e.contains("Found an empty partition key 'b'")) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.execution.command | ||
|
|
||
| import org.scalactic.source.Position | ||
| import org.scalatest.Tag | ||
|
|
||
| import org.apache.spark.sql.QueryTest | ||
| import org.apache.spark.sql.test.SQLTestUtils | ||
|
|
||
| trait ShowPartitionsSuiteBase extends QueryTest with SQLTestUtils { | ||
| protected def version: String | ||
| protected def catalog: String | ||
| protected def defaultNamespace: Seq[String] | ||
| protected def defaultUsing: String | ||
|
|
||
| override def test(testName: String, testTags: Tag*)(testFun: => Any) | ||
| (implicit pos: Position): Unit = { | ||
| super.test(s"SHOW PARTITIONS $version: " + testName, testTags: _*)(testFun) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.execution.command.v1 | ||
|
|
||
| import org.apache.spark.sql.{AnalysisException, Row, SaveMode} | ||
| import org.apache.spark.sql.catalyst.analysis.NoSuchTableException | ||
| import org.apache.spark.sql.connector.catalog.CatalogManager | ||
| import org.apache.spark.sql.execution.command | ||
| import org.apache.spark.sql.test.SharedSparkSession | ||
|
|
||
| trait ShowPartitionsSuiteBase extends command.ShowPartitionsSuiteBase { | ||
| override def version: String = "V1" | ||
| override def catalog: String = CatalogManager.SESSION_CATALOG_NAME | ||
| override def defaultNamespace: Seq[String] = Seq("default") | ||
| override def defaultUsing: String = "USING parquet" | ||
|
|
||
| protected def createDateTable(table: String): Unit = { | ||
| sql(s""" | ||
| |CREATE TABLE $table (price int, qty int, year int, month int) | ||
| |$defaultUsing | ||
| |partitioned by (year, month)""".stripMargin) | ||
| } | ||
|
|
||
| protected def fillDateTable(table: String): Unit = { | ||
| sql(s"INSERT INTO $table PARTITION(year = 2015, month = 1) SELECT 1, 1") | ||
| sql(s"INSERT INTO $table PARTITION(year = 2015, month = 2) SELECT 2, 2") | ||
| sql(s"INSERT INTO $table PARTITION(year = 2016, month = 2) SELECT 3, 3") | ||
| sql(s"INSERT INTO $table PARTITION(year = 2016, month = 3) SELECT 3, 3") | ||
| } | ||
|
|
||
| protected def createWideTable(table: String): Unit = { | ||
| sql(s""" | ||
| |CREATE TABLE $table ( | ||
| | price int, qty int, | ||
| | year int, month int, hour int, minute int, sec int, extra int) | ||
| |$defaultUsing | ||
| |PARTITIONED BY (year, month, hour, minute, sec, extra)""".stripMargin) | ||
| } | ||
|
|
||
| protected def fillWideTable(table: String): Unit = { | ||
| sql(s""" | ||
| |INSERT INTO $table | ||
| |PARTITION(year = 2016, month = 3, hour = 10, minute = 10, sec = 10, extra = 1) SELECT 3, 3 | ||
| """.stripMargin) | ||
| sql(s""" | ||
| |INSERT INTO $table | ||
| |PARTITION(year = 2016, month = 4, hour = 10, minute = 10, sec = 10, extra = 1) SELECT 3, 3 | ||
| """.stripMargin) | ||
| } | ||
|
|
||
| test("show everything") { | ||
| val table = "dateTable" | ||
| withTable(table) { | ||
| createDateTable(table) | ||
| fillDateTable(table) | ||
| checkAnswer( | ||
| sql(s"show partitions $table"), | ||
| Row("year=2015/month=1") :: | ||
| Row("year=2015/month=2") :: | ||
| Row("year=2016/month=2") :: | ||
| Row("year=2016/month=3") :: Nil) | ||
|
|
||
| checkAnswer( | ||
| sql(s"show partitions default.$table"), | ||
| Row("year=2015/month=1") :: | ||
| Row("year=2015/month=2") :: | ||
| Row("year=2016/month=2") :: | ||
| Row("year=2016/month=3") :: Nil) | ||
| } | ||
| } | ||
|
|
||
| test("filter by partitions") { | ||
| val table = "dateTable" | ||
| withTable(table) { | ||
| createDateTable(table) | ||
| fillDateTable(table) | ||
| checkAnswer( | ||
| sql(s"show partitions default.$table PARTITION(year=2015)"), | ||
| Row("year=2015/month=1") :: | ||
| Row("year=2015/month=2") :: Nil) | ||
| checkAnswer( | ||
| sql(s"show partitions default.$table PARTITION(year=2015, month=1)"), | ||
| Row("year=2015/month=1") :: Nil) | ||
| checkAnswer( | ||
| sql(s"show partitions default.$table PARTITION(month=2)"), | ||
| Row("year=2015/month=2") :: | ||
| Row("year=2016/month=2") :: Nil) | ||
| } | ||
| } | ||
|
|
||
| test("show everything more than 5 part keys") { | ||
| val table = "wideTable" | ||
| withTable(table) { | ||
| createWideTable(table) | ||
| fillWideTable(table) | ||
| checkAnswer( | ||
| sql(s"show partitions $table"), | ||
| Row("year=2016/month=3/hour=10/minute=10/sec=10/extra=1") :: | ||
| Row("year=2016/month=4/hour=10/minute=10/sec=10/extra=1") :: Nil) | ||
| } | ||
| } | ||
|
|
||
| test("non-partitioning columns") { | ||
| val table = "dateTable" | ||
| withTable(table) { | ||
| createDateTable(table) | ||
| fillDateTable(table) | ||
| val errMsg = intercept[AnalysisException] { | ||
| sql(s"SHOW PARTITIONS $table PARTITION(abcd=2015, xyz=1)") | ||
| }.getMessage | ||
| assert(errMsg.contains("Non-partitioning column(s) [abcd, xyz] are specified")) | ||
| } | ||
| } | ||
|
|
||
| test("show partitions of not partitioned table") { | ||
| val table = "not_partitioned_table" | ||
| withTable(table) { | ||
| sql(s"CREATE TABLE $table (col1 int) $defaultUsing") | ||
| val errMsg = intercept[AnalysisException] { | ||
| sql(s"SHOW PARTITIONS $table") | ||
| }.getMessage | ||
| assert(errMsg.contains("not allowed on a table that is not partitioned")) | ||
| } | ||
| } | ||
|
|
||
| test("show partitions of a view") { | ||
| val table = "dateTable" | ||
| withTable(table) { | ||
| createDateTable(table) | ||
| val view = "view1" | ||
| withView(view) { | ||
| sql(s"CREATE VIEW $view as select * from $table") | ||
| val errMsg = intercept[AnalysisException] { | ||
| sql(s"SHOW PARTITIONS $view") | ||
| }.getMessage | ||
| assert(errMsg.contains("is not allowed on a view")) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| test("show partitions of a temporary view") { | ||
| val viewName = "test_view" | ||
| withTempView(viewName) { | ||
| spark.range(10).createTempView(viewName) | ||
| val errMsg = intercept[NoSuchTableException] { | ||
| sql(s"SHOW PARTITIONS $viewName") | ||
| }.getMessage | ||
| assert(errMsg.contains(s"Table or view '$viewName' not found")) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| class ShowPartitionsSuite extends ShowPartitionsSuiteBase with SharedSparkSession { | ||
| // The test is placed here because it fails with `USING HIVE`: | ||
| // org.apache.spark.sql.AnalysisException: | ||
| // Hive data source can only be used with tables, you can't use it with CREATE TEMP VIEW USING | ||
| test("issue exceptions on the temporary view") { | ||
| val viewName = "test_view" | ||
| withTempView(viewName) { | ||
| sql(s""" | ||
| |CREATE TEMPORARY VIEW $viewName (c1 INT, c2 STRING) | ||
| |$defaultUsing""".stripMargin) | ||
| val errMsg = intercept[NoSuchTableException] { | ||
| sql(s"SHOW PARTITIONS $viewName") | ||
| }.getMessage | ||
| assert(errMsg.contains(s"Table or view '$viewName' not found")) | ||
| } | ||
| } | ||
|
|
||
| test("show partitions from a datasource") { | ||
| import testImplicits._ | ||
| withTable("part_datasrc") { | ||
| val df = (1 to 3).map(i => (i, s"val_$i", i * 2)).toDF("a", "b", "c") | ||
| df.write | ||
| .partitionBy("a") | ||
| .format("parquet") | ||
| .mode(SaveMode.Overwrite) | ||
| .saveAsTable("part_datasrc") | ||
|
Contributor
There was a problem hiding this comment. this seems like testing the DataFrameWriter API not the SHOW PARTITIONS command.
Contributor
There was a problem hiding this comment. ah the test was already there. Let's keep it then. |
||
|
|
||
| assert(sql("SHOW PARTITIONS part_datasrc").count() == 3) | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"non-partitioned" sounds a bit more natural.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you. I will address your comment together with others. @HyukjinKwon @cloud-fan Do you have any comments for this PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are a few places with
not partitioned:I will change the title of this test but I am not sure about other places. I will leave them AS IS so far. @janekdb If you want, you can open a PR and fix them when it makes sense.