forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-3299][SQL]Public API in SQLContext to list tables
https://issues.apache.org/jira/browse/SPARK-3299 Author: Yin Huai <yhuai@databricks.com> Closes apache#4547 from yhuai/tables and squashes the following commits: 6c8f92e [Yin Huai] Add tableNames. acbb281 [Yin Huai] Update Python test. 7793dcb [Yin Huai] Fix scala test. 572870d [Yin Huai] Address comments. aba2e88 [Yin Huai] Format. 12c86df [Yin Huai] Add tables() to SQLContext to return a DataFrame containing existing tables.
- Loading branch information
Showing
6 changed files
with
265 additions
and
0 deletions.
There are no files selected for viewing
This file contains 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 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 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
76 changes: 76 additions & 0 deletions
76
sql/core/src/test/scala/org/apache/spark/sql/ListTablesSuite.scala
This file contains 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,76 @@ | ||
/* | ||
* 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 | ||
|
||
import org.scalatest.BeforeAndAfter | ||
|
||
import org.apache.spark.sql.test.TestSQLContext | ||
import org.apache.spark.sql.test.TestSQLContext._ | ||
import org.apache.spark.sql.types.{BooleanType, StringType, StructField, StructType} | ||
|
||
class ListTablesSuite extends QueryTest with BeforeAndAfter { | ||
|
||
import org.apache.spark.sql.test.TestSQLContext.implicits._ | ||
|
||
val df = | ||
sparkContext.parallelize((1 to 10).map(i => (i,s"str$i"))).toDataFrame("key", "value") | ||
|
||
before { | ||
df.registerTempTable("ListTablesSuiteTable") | ||
} | ||
|
||
after { | ||
catalog.unregisterTable(Seq("ListTablesSuiteTable")) | ||
} | ||
|
||
test("get all tables") { | ||
checkAnswer( | ||
tables().filter("tableName = 'ListTablesSuiteTable'"), | ||
Row("ListTablesSuiteTable", true)) | ||
|
||
catalog.unregisterTable(Seq("ListTablesSuiteTable")) | ||
assert(tables().filter("tableName = 'ListTablesSuiteTable'").count() === 0) | ||
} | ||
|
||
test("getting all Tables with a database name has no impact on returned table names") { | ||
checkAnswer( | ||
tables("DB").filter("tableName = 'ListTablesSuiteTable'"), | ||
Row("ListTablesSuiteTable", true)) | ||
|
||
catalog.unregisterTable(Seq("ListTablesSuiteTable")) | ||
assert(tables().filter("tableName = 'ListTablesSuiteTable'").count() === 0) | ||
} | ||
|
||
test("query the returned DataFrame of tables") { | ||
val tableDF = tables() | ||
val schema = StructType( | ||
StructField("tableName", StringType, true) :: | ||
StructField("isTemporary", BooleanType, false) :: Nil) | ||
assert(schema === tableDF.schema) | ||
|
||
tableDF.registerTempTable("tables") | ||
checkAnswer( | ||
sql("SELECT isTemporary, tableName from tables WHERE tableName = 'ListTablesSuiteTable'"), | ||
Row(true, "ListTablesSuiteTable") | ||
) | ||
checkAnswer( | ||
tables().filter("tableName = 'tables'").select("tableName", "isTemporary"), | ||
Row("tables", true)) | ||
dropTempTable("tables") | ||
} | ||
} |
This file contains 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
77 changes: 77 additions & 0 deletions
77
sql/hive/src/test/scala/org/apache/spark/sql/hive/ListTablesSuite.scala
This file contains 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,77 @@ | ||
/* | ||
* 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.hive | ||
|
||
import org.scalatest.BeforeAndAfterAll | ||
|
||
import org.apache.spark.sql.hive.test.TestHive | ||
import org.apache.spark.sql.hive.test.TestHive._ | ||
import org.apache.spark.sql.QueryTest | ||
import org.apache.spark.sql.Row | ||
|
||
class ListTablesSuite extends QueryTest with BeforeAndAfterAll { | ||
|
||
import org.apache.spark.sql.hive.test.TestHive.implicits._ | ||
|
||
val df = | ||
sparkContext.parallelize((1 to 10).map(i => (i,s"str$i"))).toDataFrame("key", "value") | ||
|
||
override def beforeAll(): Unit = { | ||
// The catalog in HiveContext is a case insensitive one. | ||
catalog.registerTable(Seq("ListTablesSuiteTable"), df.logicalPlan) | ||
catalog.registerTable(Seq("ListTablesSuiteDB", "InDBListTablesSuiteTable"), df.logicalPlan) | ||
sql("CREATE TABLE HiveListTablesSuiteTable (key int, value string)") | ||
sql("CREATE DATABASE IF NOT EXISTS ListTablesSuiteDB") | ||
sql("CREATE TABLE ListTablesSuiteDB.HiveInDBListTablesSuiteTable (key int, value string)") | ||
} | ||
|
||
override def afterAll(): Unit = { | ||
catalog.unregisterTable(Seq("ListTablesSuiteTable")) | ||
catalog.unregisterTable(Seq("ListTablesSuiteDB", "InDBListTablesSuiteTable")) | ||
sql("DROP TABLE IF EXISTS HiveListTablesSuiteTable") | ||
sql("DROP TABLE IF EXISTS ListTablesSuiteDB.HiveInDBListTablesSuiteTable") | ||
sql("DROP DATABASE IF EXISTS ListTablesSuiteDB") | ||
} | ||
|
||
test("get all tables of current database") { | ||
val allTables = tables() | ||
// We are using default DB. | ||
checkAnswer( | ||
allTables.filter("tableName = 'listtablessuitetable'"), | ||
Row("listtablessuitetable", true)) | ||
assert(allTables.filter("tableName = 'indblisttablessuitetable'").count() === 0) | ||
checkAnswer( | ||
allTables.filter("tableName = 'hivelisttablessuitetable'"), | ||
Row("hivelisttablessuitetable", false)) | ||
assert(allTables.filter("tableName = 'hiveindblisttablessuitetable'").count() === 0) | ||
} | ||
|
||
test("getting all tables with a database name") { | ||
val allTables = tables("ListTablesSuiteDB") | ||
checkAnswer( | ||
allTables.filter("tableName = 'listtablessuitetable'"), | ||
Row("listtablessuitetable", true)) | ||
checkAnswer( | ||
allTables.filter("tableName = 'indblisttablessuitetable'"), | ||
Row("indblisttablessuitetable", true)) | ||
assert(allTables.filter("tableName = 'hivelisttablessuitetable'").count() === 0) | ||
checkAnswer( | ||
allTables.filter("tableName = 'hiveindblisttablessuitetable'"), | ||
Row("hiveindblisttablessuitetable", false)) | ||
} | ||
} |