You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2022/06/19 10:36:41 UTC
[GitHub] [spark] MaxGekk opened a new pull request, #36912: [WIP][SPARK-37888][SQL][TESTS] Unify v1 and v2 `DESCRIBE TABLE` tests
MaxGekk opened a new pull request, #36912:
URL: https://github.com/apache/spark/pull/36912
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
### How was this patch tested?
By running the modified test suites:
```
$ build/sbt "testOnly *DDLParserSuite"
```
and new test suites:
```
$ build/sbt "sql/test:testOnly *DescribeTableParserSuite"
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #36912: [SPARK-37888][SQL][TESTS] Unify v1 and v2 `DESCRIBE TABLE` tests
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #36912:
URL: https://github.com/apache/spark/pull/36912#discussion_r911206258
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala:
##########
@@ -0,0 +1,106 @@
+/*
+ * 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, QueryTest, Row}
+import org.apache.spark.sql.execution.command
+import org.apache.spark.sql.types.StringType
+
+/**
+ * This base suite contains unified tests for the `DESCRIBE TABLE` command that checks V1
+ * table catalogs. The tests that cannot run for all V1 catalogs are located in more
+ * specific test suites:
+ *
+ * - V1 In-Memory catalog: `org.apache.spark.sql.execution.command.v1.DescribeTableSuite`
+ * - V1 Hive External catalog:
+ * `org.apache.spark.sql.hive.execution.command.DescribeTableSuite`
+ */
+trait DescribeTableSuiteBase extends command.DescribeTableSuiteBase
+ with command.TestsV1AndV2Commands {
+
+ test("DESCRIBE TABLE with non-'partitioned-by' clause") {
+ withNamespaceAndTable("ns", "table") { tbl =>
+ spark.sql(s"CREATE TABLE $tbl (id bigint, data string) $defaultUsing")
+ val descriptionDf = spark.sql(s"DESCRIBE TABLE $tbl")
+ assert(descriptionDf.schema.map(field => (field.name, field.dataType)) ===
+ Seq(
+ ("col_name", StringType),
+ ("data_type", StringType),
+ ("comment", StringType)))
+ QueryTest.checkAnswer(
+ descriptionDf,
+ Seq(
+ Row("data", "string", null),
+ Row("id", "bigint", null)))
+ }
+ }
+
+ test("Describing a partition is not supported") {
+ withNamespaceAndTable("ns", "table") { tbl =>
+ spark.sql(s"CREATE TABLE $tbl (id bigint, data string) $defaultUsing " +
+ "PARTITIONED BY (id)")
+ val e = intercept[AnalysisException] {
+ sql(s"DESCRIBE TABLE $tbl PARTITION (id = 1)")
+ }
+ assert(e.message === "Partition not found in table 'table' database 'ns':\nid -> 1")
+ }
+ }
+}
+
+/**
+ * The class contains tests for the `DESCRIBE TABLE` command to check V1 In-Memory
+ * table catalog.
+ */
+class DescribeTableSuite extends DescribeTableSuiteBase with CommandSuiteBase {
+ override def commandVersion: String = super[DescribeTableSuiteBase].commandVersion
+
+ test("DESCRIBE TABLE EXTENDED of a partitioned table") {
+ withNamespaceAndTable("ns", "table") { tbl =>
+ spark.sql(s"CREATE TABLE $tbl (id bigint, data string) $defaultUsing" +
+ " PARTITIONED BY (id)" +
+ " TBLPROPERTIES ('bar'='baz')" +
+ " COMMENT 'this is a test table'" +
+ " LOCATION 'file:/tmp/testcat/table_name'")
+ val descriptionDf = spark.sql(s"DESCRIBE TABLE EXTENDED $tbl")
+ assert(descriptionDf.schema.map(field => (field.name, field.dataType)) === Seq(
+ ("col_name", StringType),
+ ("data_type", StringType),
+ ("comment", StringType)))
+ QueryTest.checkAnswer(
+ descriptionDf.filter("col_name != 'Created Time'"),
+ Seq(
+ Row("data", "string", null),
+ Row("id", "bigint", null),
+ Row("# Partition Information", "", ""),
+ Row("# col_name", "data_type", "comment"),
+ Row("id", "bigint", null),
+ Row("", "", ""),
+ Row("# Detailed Table Information", "", ""),
+ Row("Database", "ns", ""),
+ Row("Table", "table", ""),
+ Row("Last Access", "UNKNOWN", ""),
+ Row("Created By", "Spark 3.4.0-SNAPSHOT", ""),
Review Comment:
we should filter out this row as well, otherwise we need to keep updating this test when making a new release. cc @MaxGekk
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #36912: [SPARK-37888][SQL][TESTS] Unify v1 and v2 `DESCRIBE TABLE` tests
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on code in PR #36912:
URL: https://github.com/apache/spark/pull/36912#discussion_r922242829
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala:
##########
@@ -0,0 +1,106 @@
+/*
+ * 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, QueryTest, Row}
+import org.apache.spark.sql.execution.command
+import org.apache.spark.sql.types.StringType
+
+/**
+ * This base suite contains unified tests for the `DESCRIBE TABLE` command that checks V1
+ * table catalogs. The tests that cannot run for all V1 catalogs are located in more
+ * specific test suites:
+ *
+ * - V1 In-Memory catalog: `org.apache.spark.sql.execution.command.v1.DescribeTableSuite`
+ * - V1 Hive External catalog:
+ * `org.apache.spark.sql.hive.execution.command.DescribeTableSuite`
+ */
+trait DescribeTableSuiteBase extends command.DescribeTableSuiteBase
+ with command.TestsV1AndV2Commands {
+
+ test("DESCRIBE TABLE with non-'partitioned-by' clause") {
+ withNamespaceAndTable("ns", "table") { tbl =>
+ spark.sql(s"CREATE TABLE $tbl (id bigint, data string) $defaultUsing")
+ val descriptionDf = spark.sql(s"DESCRIBE TABLE $tbl")
+ assert(descriptionDf.schema.map(field => (field.name, field.dataType)) ===
+ Seq(
+ ("col_name", StringType),
+ ("data_type", StringType),
+ ("comment", StringType)))
+ QueryTest.checkAnswer(
+ descriptionDf,
+ Seq(
+ Row("data", "string", null),
+ Row("id", "bigint", null)))
+ }
+ }
+
+ test("Describing a partition is not supported") {
+ withNamespaceAndTable("ns", "table") { tbl =>
+ spark.sql(s"CREATE TABLE $tbl (id bigint, data string) $defaultUsing " +
+ "PARTITIONED BY (id)")
+ val e = intercept[AnalysisException] {
+ sql(s"DESCRIBE TABLE $tbl PARTITION (id = 1)")
+ }
+ assert(e.message === "Partition not found in table 'table' database 'ns':\nid -> 1")
+ }
+ }
+}
+
+/**
+ * The class contains tests for the `DESCRIBE TABLE` command to check V1 In-Memory
+ * table catalog.
+ */
+class DescribeTableSuite extends DescribeTableSuiteBase with CommandSuiteBase {
+ override def commandVersion: String = super[DescribeTableSuiteBase].commandVersion
+
+ test("DESCRIBE TABLE EXTENDED of a partitioned table") {
+ withNamespaceAndTable("ns", "table") { tbl =>
+ spark.sql(s"CREATE TABLE $tbl (id bigint, data string) $defaultUsing" +
+ " PARTITIONED BY (id)" +
+ " TBLPROPERTIES ('bar'='baz')" +
+ " COMMENT 'this is a test table'" +
+ " LOCATION 'file:/tmp/testcat/table_name'")
+ val descriptionDf = spark.sql(s"DESCRIBE TABLE EXTENDED $tbl")
+ assert(descriptionDf.schema.map(field => (field.name, field.dataType)) === Seq(
+ ("col_name", StringType),
+ ("data_type", StringType),
+ ("comment", StringType)))
+ QueryTest.checkAnswer(
+ descriptionDf.filter("col_name != 'Created Time'"),
+ Seq(
+ Row("data", "string", null),
+ Row("id", "bigint", null),
+ Row("# Partition Information", "", ""),
+ Row("# col_name", "data_type", "comment"),
+ Row("id", "bigint", null),
+ Row("", "", ""),
+ Row("# Detailed Table Information", "", ""),
+ Row("Database", "ns", ""),
+ Row("Table", "table", ""),
+ Row("Last Access", "UNKNOWN", ""),
+ Row("Created By", "Spark 3.4.0-SNAPSHOT", ""),
Review Comment:
Next time, let's address comments immediately. We missed fixing it in the next PR...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] MaxGekk commented on a diff in pull request #36912: [SPARK-37888][SQL][TESTS] Unify v1 and v2 `DESCRIBE TABLE` tests
Posted by GitBox <gi...@apache.org>.
MaxGekk commented on code in PR #36912:
URL: https://github.com/apache/spark/pull/36912#discussion_r911359433
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala:
##########
@@ -0,0 +1,106 @@
+/*
+ * 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, QueryTest, Row}
+import org.apache.spark.sql.execution.command
+import org.apache.spark.sql.types.StringType
+
+/**
+ * This base suite contains unified tests for the `DESCRIBE TABLE` command that checks V1
+ * table catalogs. The tests that cannot run for all V1 catalogs are located in more
+ * specific test suites:
+ *
+ * - V1 In-Memory catalog: `org.apache.spark.sql.execution.command.v1.DescribeTableSuite`
+ * - V1 Hive External catalog:
+ * `org.apache.spark.sql.hive.execution.command.DescribeTableSuite`
+ */
+trait DescribeTableSuiteBase extends command.DescribeTableSuiteBase
+ with command.TestsV1AndV2Commands {
+
+ test("DESCRIBE TABLE with non-'partitioned-by' clause") {
+ withNamespaceAndTable("ns", "table") { tbl =>
+ spark.sql(s"CREATE TABLE $tbl (id bigint, data string) $defaultUsing")
+ val descriptionDf = spark.sql(s"DESCRIBE TABLE $tbl")
+ assert(descriptionDf.schema.map(field => (field.name, field.dataType)) ===
+ Seq(
+ ("col_name", StringType),
+ ("data_type", StringType),
+ ("comment", StringType)))
+ QueryTest.checkAnswer(
+ descriptionDf,
+ Seq(
+ Row("data", "string", null),
+ Row("id", "bigint", null)))
+ }
+ }
+
+ test("Describing a partition is not supported") {
+ withNamespaceAndTable("ns", "table") { tbl =>
+ spark.sql(s"CREATE TABLE $tbl (id bigint, data string) $defaultUsing " +
+ "PARTITIONED BY (id)")
+ val e = intercept[AnalysisException] {
+ sql(s"DESCRIBE TABLE $tbl PARTITION (id = 1)")
+ }
+ assert(e.message === "Partition not found in table 'table' database 'ns':\nid -> 1")
+ }
+ }
+}
+
+/**
+ * The class contains tests for the `DESCRIBE TABLE` command to check V1 In-Memory
+ * table catalog.
+ */
+class DescribeTableSuite extends DescribeTableSuiteBase with CommandSuiteBase {
+ override def commandVersion: String = super[DescribeTableSuiteBase].commandVersion
+
+ test("DESCRIBE TABLE EXTENDED of a partitioned table") {
+ withNamespaceAndTable("ns", "table") { tbl =>
+ spark.sql(s"CREATE TABLE $tbl (id bigint, data string) $defaultUsing" +
+ " PARTITIONED BY (id)" +
+ " TBLPROPERTIES ('bar'='baz')" +
+ " COMMENT 'this is a test table'" +
+ " LOCATION 'file:/tmp/testcat/table_name'")
+ val descriptionDf = spark.sql(s"DESCRIBE TABLE EXTENDED $tbl")
+ assert(descriptionDf.schema.map(field => (field.name, field.dataType)) === Seq(
+ ("col_name", StringType),
+ ("data_type", StringType),
+ ("comment", StringType)))
+ QueryTest.checkAnswer(
+ descriptionDf.filter("col_name != 'Created Time'"),
+ Seq(
+ Row("data", "string", null),
+ Row("id", "bigint", null),
+ Row("# Partition Information", "", ""),
+ Row("# col_name", "data_type", "comment"),
+ Row("id", "bigint", null),
+ Row("", "", ""),
+ Row("# Detailed Table Information", "", ""),
+ Row("Database", "ns", ""),
+ Row("Table", "table", ""),
+ Row("Last Access", "UNKNOWN", ""),
+ Row("Created By", "Spark 3.4.0-SNAPSHOT", ""),
Review Comment:
Will do in another PR for `DESCRIBE TABLE` tests.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] MaxGekk commented on pull request #36912: [SPARK-37888][SQL][TESTS] Unify v1 and v2 `DESCRIBE TABLE` tests
Posted by GitBox <gi...@apache.org>.
MaxGekk commented on PR #36912:
URL: https://github.com/apache/spark/pull/36912#issuecomment-1161380498
Merging to master. Thank you, @cloud-fan for review.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on pull request #36912: [SPARK-37888][SQL][TESTS] Unify v1 and v2 `DESCRIBE TABLE` tests
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on PR #36912:
URL: https://github.com/apache/spark/pull/36912#issuecomment-1161330631
A major problem in https://github.com/apache/spark/pull/35265 is how to unify the v1 and v2 DESCRIBE TABLE command. I'm OK to unify the tests first, and let's unify the commands in a later PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] MaxGekk closed pull request #36912: [SPARK-37888][SQL][TESTS] Unify v1 and v2 `DESCRIBE TABLE` tests
Posted by GitBox <gi...@apache.org>.
MaxGekk closed pull request #36912: [SPARK-37888][SQL][TESTS] Unify v1 and v2 `DESCRIBE TABLE` tests
URL: https://github.com/apache/spark/pull/36912
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org