aboutsummaryrefslogtreecommitdiff
path: root/R/pkg/NAMESPACE
diff options
context:
space:
mode:
authorYanbo Liang <ybliang8@gmail.com>2015-12-11 11:47:35 -0800
committerShivaram Venkataraman <shivaram@cs.berkeley.edu>2015-12-11 11:47:35 -0800
commit0fb9825556dbbcc98d7eafe9ddea8676301e09bb (patch)
treef89813a20b893dbf65c019e4a031a7d3e189c135 /R/pkg/NAMESPACE
parentc119a34d1e9e599e302acfda92e5de681086a19f (diff)
downloadspark-0fb9825556dbbcc98d7eafe9ddea8676301e09bb.tar.gz
spark-0fb9825556dbbcc98d7eafe9ddea8676301e09bb.tar.bz2
spark-0fb9825556dbbcc98d7eafe9ddea8676301e09bb.zip
[SPARK-12146][SPARKR] SparkR jsonFile should support multiple input files
* ```jsonFile``` should support multiple input files, such as: ```R jsonFile(sqlContext, c(“path1”, “path2”)) # character vector as arguments jsonFile(sqlContext, “path1,path2”) ``` * Meanwhile, ```jsonFile``` has been deprecated by Spark SQL and will be removed at Spark 2.0. So we mark ```jsonFile``` deprecated and use ```read.json``` at SparkR side. * Replace all ```jsonFile``` with ```read.json``` at test_sparkSQL.R, but still keep jsonFile test case. * If this PR is accepted, we should also make almost the same change for ```parquetFile```. cc felixcheung sun-rui shivaram Author: Yanbo Liang <ybliang8@gmail.com> Closes #10145 from yanboliang/spark-12146.
Diffstat (limited to 'R/pkg/NAMESPACE')
-rw-r--r--R/pkg/NAMESPACE1
1 files changed, 1 insertions, 0 deletions
diff --git a/R/pkg/NAMESPACE b/R/pkg/NAMESPACE
index ba64bc59ed..cab39d68c3 100644
--- a/R/pkg/NAMESPACE
+++ b/R/pkg/NAMESPACE
@@ -267,6 +267,7 @@ export("as.DataFrame",
"createExternalTable",
"dropTempTable",
"jsonFile",
+ "read.json",
"loadDF",
"parquetFile",
"read.df",