aboutsummaryrefslogtreecommitdiff
path: root/sql/core/src/main
diff options
context:
space:
mode:
authorJeff Zhang <zjffdu@apache.org>2017-03-09 11:44:34 -0800
committerHolden Karau <holden@us.ibm.com>2017-03-09 11:44:34 -0800
commitcabe1df8606e7e5b9e6efb106045deb3f39f5f13 (patch)
treef46f3bd4a2d85abe2b1b12632dfd7b27f0da226e /sql/core/src/main
parent30b18e69361746b4d656474374d8b486bb48a19e (diff)
downloadspark-cabe1df8606e7e5b9e6efb106045deb3f39f5f13.tar.gz
spark-cabe1df8606e7e5b9e6efb106045deb3f39f5f13.tar.bz2
spark-cabe1df8606e7e5b9e6efb106045deb3f39f5f13.zip
[SPARK-12334][SQL][PYSPARK] Support read from multiple input paths for orc file in DataFrameReader.orc
Beside the issue in spark api, also fix 2 minor issues in pyspark - support read from multiple input paths for orc - support read from multiple input paths for text Author: Jeff Zhang <zjffdu@apache.org> Closes #10307 from zjffdu/SPARK-12334.
Diffstat (limited to 'sql/core/src/main')
-rw-r--r--sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala
index a5e38e25b1..4f4cc93117 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala
@@ -262,7 +262,7 @@ class DataFrameReader private[sql](sparkSession: SparkSession) extends Logging {
}
/**
- * Loads a JSON file and returns the results as a `DataFrame`.
+ * Loads JSON files and returns the results as a `DataFrame`.
*
* <a href="http://jsonlines.org/">JSON Lines</a> (newline-delimited JSON) is supported by
* default. For JSON (one record per file), set the `wholeFile` option to true.
@@ -438,7 +438,7 @@ class DataFrameReader private[sql](sparkSession: SparkSession) extends Logging {
}
/**
- * Loads a CSV file and returns the result as a `DataFrame`.
+ * Loads CSV files and returns the result as a `DataFrame`.
*
* This function will go through the input once to determine the input schema if `inferSchema`
* is enabled. To avoid going through the entire data once, disable `inferSchema` option or
@@ -549,7 +549,7 @@ class DataFrameReader private[sql](sparkSession: SparkSession) extends Logging {
}
/**
- * Loads an ORC file and returns the result as a `DataFrame`.
+ * Loads ORC files and returns the result as a `DataFrame`.
*
* @param paths input paths
* @since 2.0.0