-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-33789][SQL][TESTS] Refactor unified V1 and V2 datasource tests #30779
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.
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
Closed
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
42d15f5
Move a test to DDLCommandTestUtils
MaxGekk e699ab8
Move withNsTable() to DDLCommandTestUtils
MaxGekk 853f0fe
Re-use withNsTable in SHOW TABLES and SHOW PARTITIONS tests
MaxGekk 4a0ded4
Move checkPartitions() to DDLCommandTestUtils
MaxGekk 99da3cd
Put common code to CommandSuiteBase
MaxGekk 89e3898
Remove unused imports
MaxGekk 5836e54
Update sql/core/src/test/scala/org/apache/spark/sql/execution/command…
MaxGekk 838fb00
Remove some methods
MaxGekk 04fd90b
withNsTable -> withNamespaceAndTable
MaxGekk 35dc058
Merge remote-tracking branch 'remotes/origin/master' into refactor-un…
MaxGekk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
60 changes: 60 additions & 0 deletions
60
sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLCommandTestUtils.scala
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,60 @@ | ||
| /* | ||
| * 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.Row | ||
| import org.apache.spark.sql.execution.datasources.PartitioningUtils | ||
| import org.apache.spark.sql.test.SQLTestUtils | ||
|
|
||
| trait DDLCommandTestUtils extends SQLTestUtils { | ||
| // The version of the catalog under testing such as "V1", "V2", "Hive V1". | ||
| protected def version: String | ||
| // Name of the command as SQL statement, for instance "SHOW PARTITIONS" | ||
| protected def command: String | ||
| protected def catalog: String | ||
| protected def defaultUsing: String | ||
|
|
||
| override def test(testName: String, testTags: Tag*)(testFun: => Any) | ||
| (implicit pos: Position): Unit = { | ||
| super.test(s"$command $version: " + testName, testTags: _*)(testFun) | ||
| } | ||
|
|
||
| protected def withNamespaceAndTable(ns: String, tableName: String, cat: String = catalog) | ||
| (f: String => Unit): Unit = { | ||
| val nsCat = s"$cat.$ns" | ||
| withNamespace(nsCat) { | ||
| sql(s"CREATE NAMESPACE $nsCat") | ||
| val t = s"$nsCat.$tableName" | ||
| withTable(t) { | ||
| f(t) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| protected def checkPartitions(t: String, expected: Map[String, String]*): Unit = { | ||
| val partitions = sql(s"SHOW PARTITIONS $t") | ||
| .collect() | ||
| .toSet | ||
| .map((row: Row) => row.getString(0)) | ||
| .map(PartitioningUtils.parsePathFragment) | ||
| assert(partitions === expected.toSet) | ||
| } | ||
| } | ||
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.
very nit: the parameter names for namespace and catalog are both very short(
nsandcat), we should probably usetto be consistent.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.
If the build fails, I will change this to re-trigger GA or Jenkins.