diff options
author | Andrew Or <andrew@databricks.com> | 2016-04-29 09:34:10 -0700 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2016-04-29 09:34:10 -0700 |
commit | a7d0fedc940721d09350f2e57ae85591e0a3d90e (patch) | |
tree | 5f96e980e810cd13f36658ed052a1e987c5d261c /sql | |
parent | 7feeb82cb7f462e44f7e698c7c3b6ac3a77aade4 (diff) | |
download | spark-a7d0fedc940721d09350f2e57ae85591e0a3d90e.tar.gz spark-a7d0fedc940721d09350f2e57ae85591e0a3d90e.tar.bz2 spark-a7d0fedc940721d09350f2e57ae85591e0a3d90e.zip |
[SPARK-14988][PYTHON] SparkSession catalog and conf API
## What changes were proposed in this pull request?
The `catalog` and `conf` APIs were exposed in `SparkSession` in #12713 and #12669. This patch adds those to the python API.
## How was this patch tested?
Python tests.
Author: Andrew Or <andrew@databricks.com>
Closes #12765 from andrewor14/python-spark-session-more.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/catalog/Catalog.scala | 4 | ||||
-rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/catalog/interface.scala | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/catalog/Catalog.scala b/sql/core/src/main/scala/org/apache/spark/sql/catalog/Catalog.scala index 868cc3a726..7a815c1f99 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/catalog/Catalog.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/catalog/Catalog.scala @@ -176,9 +176,9 @@ abstract class Catalog { /** * Drops the temporary table with the given table name in the catalog. - * If the table has been cached/persisted before, it's also unpersisted. + * If the table has been cached before, then it will also be uncached. * - * @param tableName the name of the table to be unregistered. + * @param tableName the name of the table to be dropped. * @since 2.0.0 */ def dropTempTable(tableName: String): Unit diff --git a/sql/core/src/main/scala/org/apache/spark/sql/catalog/interface.scala b/sql/core/src/main/scala/org/apache/spark/sql/catalog/interface.scala index d5de6cd484..0f7feb8eee 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/catalog/interface.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/catalog/interface.scala @@ -83,6 +83,7 @@ class Column( } +// TODO(andrew): should we include the database here? class Function( val name: String, @Nullable val description: String, |