Skip to content

Commit b01e622

Browse files
pzzspzzs
committed
Merge pull request apache#15 from apache/master
merge lastest spark
2 parents 8df716a + f38e619 commit b01e622

File tree

126 files changed

+3849
-809
lines changed

Some content is hidden

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

126 files changed

+3849
-809
lines changed

‎R/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The SparkR documentation (Rd files and HTML files) are not a part of the source
5252
SparkR comes with several sample programs in the `examples/src/main/r` directory.
5353
To run one of them, use `./bin/sparkR <filename> <args>`. For example:
5454

55-
./bin/sparkR examples/src/main/r/pi.R local[2]
55+
./bin/sparkR examples/src/main/r/dataframe.R
5656

5757
You can also run the unit-tests for SparkR by running (you need to install the [testthat](http://cran.r-project.org/web/packages/testthat/index.html) package first):
5858

@@ -63,5 +63,5 @@ You can also run the unit-tests for SparkR by running (you need to install the [
6363
The `./bin/spark-submit` and `./bin/sparkR` can also be used to submit jobs to YARN clusters. You will need to set YARN conf dir before doing so. For example on CDH you can run
6464
```
6565
export YARN_CONF_DIR=/etc/hadoop/conf
66-
./bin/spark-submit --master yarn examples/src/main/r/pi.R 4
66+
./bin/spark-submit --master yarn examples/src/main/r/dataframe.R
6767
```

‎R/pkg/NAMESPACE‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Imports from base R
22
importFrom(methods, setGeneric, setMethod, setOldClass)
3-
useDynLib(SparkR, stringHashCode)
3+
4+
# Disable native libraries till we figure out how to package it
5+
# See SPARKR-7839
6+
#useDynLib(SparkR, stringHashCode)
47

58
# S3 methods exported
69
export("sparkR.init")

0 commit comments

Comments
 (0)