You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2015/02/13 05:55:02 UTC
spark git commit: [SQL] Fix docs of SQLContext.tables
Repository: spark
Updated Branches:
refs/heads/master 1d0596a16 -> 2aea892eb
[SQL] Fix docs of SQLContext.tables
Author: Yin Huai <yh...@databricks.com>
Closes #4579 from yhuai/tablesDoc and squashes the following commits:
7f8964c [Yin Huai] Fix doc.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2aea892e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2aea892e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2aea892e
Branch: refs/heads/master
Commit: 2aea892ebd4d6c802defeef35ef7ebfe42c06eba
Parents: 1d0596a
Author: Yin Huai <yh...@databricks.com>
Authored: Thu Feb 12 20:37:55 2015 -0800
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Thu Feb 12 20:37:55 2015 -0800
----------------------------------------------------------------------
.../main/scala/org/apache/spark/sql/SQLContext.scala | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2aea892e/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
index 0f8af75..2165949 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
@@ -775,8 +775,8 @@ class SQLContext(@transient val sparkContext: SparkContext)
DataFrame(this, catalog.lookupRelation(Seq(tableName)))
/**
- * Returns a [[DataFrame]] containing names of existing tables in the given database.
- * The returned DataFrame has two columns, tableName and isTemporary (a column with BooleanType
+ * Returns a [[DataFrame]] containing names of existing tables in the current database.
+ * The returned DataFrame has two columns, tableName and isTemporary (a Boolean
* indicating if a table is a temporary one or not).
*/
def tables(): DataFrame = {
@@ -784,8 +784,8 @@ class SQLContext(@transient val sparkContext: SparkContext)
}
/**
- * Returns a [[DataFrame]] containing names of existing tables in the current database.
- * The returned DataFrame has two columns, tableName and isTemporary (a column with BooleanType
+ * Returns a [[DataFrame]] containing names of existing tables in the given database.
+ * The returned DataFrame has two columns, tableName and isTemporary (a Boolean
* indicating if a table is a temporary one or not).
*/
def tables(databaseName: String): DataFrame = {
@@ -793,7 +793,7 @@ class SQLContext(@transient val sparkContext: SparkContext)
}
/**
- * Returns an array of names of tables in the current database.
+ * Returns the names of tables in the current database as an array.
*/
def tableNames(): Array[String] = {
catalog.getTables(None).map {
@@ -802,7 +802,7 @@ class SQLContext(@transient val sparkContext: SparkContext)
}
/**
- * Returns an array of names of tables in the given database.
+ * Returns the names of tables in the given database as an array.
*/
def tableNames(databaseName: String): Array[String] = {
catalog.getTables(Some(databaseName)).map {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org