Skip to content

Commit 5e031ce

Browse files
liyezhang556520liyezhang556520
committed
merge to latest master branch from spark-9104-draft
2 parents 0ea7cab + 8cfa218 commit 5e031ce

File tree

1,519 files changed

+33816
-20983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,519 files changed

+33816
-20983
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ dev/create-release/*final
6060
spark-*-bin-*.tgz
6161
unit-tests.log
6262
/lib/
63-
ec2/lib/
6463
rat-results.txt
6564
scalastyle.txt
6665
scalastyle-output.xml

‎.rat-excludes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,5 @@ gen-java.*
8484
org.apache.spark.sql.sources.DataSourceRegister
8585
org.apache.spark.scheduler.SparkHistoryListenerFactory
8686
.*parquet
87+
LZ4BlockInputStream.java
88+
spark-deps-.*

‎NOTICE‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,4 +606,11 @@ Vis.js uses and redistributes the following third-party libraries:
606606

607607
- keycharm
608608
https://github.com/AlexDM0/keycharm
609-
The MIT License
609+
The MIT License
610+
611+
===============================================================================
612+
613+
The CSS style for the navigation sidebar of the documentation was originally
614+
submitted by Óscar Nájera for the scikit-learn project. The scikit-learn project
615+
is distributed under the 3-Clause BSD license.
616+
===============================================================================

‎R/pkg/DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: SparkR
22
Type: Package
33
Title: R frontend for Spark
4-
Version: 1.6.0
4+
Version: 2.0.0
55
Date: 2013-09-09
66
Author: The Apache Software Foundation
77
Maintainer: Shivaram Venkataraman <[email protected]>

‎R/pkg/NAMESPACE‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@ exportMethods("arrange",
9292
"with",
9393
"withColumn",
9494
"withColumnRenamed",
95-
"write.df")
95+
"write.df",
96+
"write.json",
97+
"write.parquet",
98+
"write.text")
9699

97100
exportClasses("Column")
98101

@@ -127,6 +130,7 @@ exportMethods("%in%",
127130
"count",
128131
"countDistinct",
129132
"crc32",
133+
"hash",
130134
"cume_dist",
131135
"date_add",
132136
"date_format",
@@ -267,9 +271,12 @@ export("as.DataFrame",
267271
"createExternalTable",
268272
"dropTempTable",
269273
"jsonFile",
274+
"read.json",
270275
"loadDF",
271276
"parquetFile",
272277
"read.df",
278+
"read.parquet",
279+
"read.text",
273280
"sql",
274281
"table",
275282
"tableNames",

0 commit comments

Comments
 (0)