Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SPARK-5654] Integrate SparkR #5096

Closed
wants to merge 940 commits into from
Closed

[SPARK-5654] Integrate SparkR #5096

wants to merge 940 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Mar 2, 2015

  1. fix first(0

    @davies
    davies committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    71d66a1 View commit details
    Browse the repository at this point in the history

  2. define generic for 'first' in RDD API

    cafreeman committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    e998356 View commit details
    Browse the repository at this point in the history

  3. Fix brackets

    cafreeman committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    f585929 View commit details
    Browse the repository at this point in the history

  4. return object instead of a list of one object

    cafreeman committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    1955a09 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2015

  1. Merge pull request apache#192 from cafreeman/sparkr-sql 

    define generic for 'first' in RDD API
    @shivaram
    shivaram committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    76cf2e0 View commit details
    Browse the repository at this point in the history

  2. Updates as per feedback on sparkR-submit

    Felix Cheung authored and Felix Cheung committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    03402eb View commit details
    Browse the repository at this point in the history

  3. Update DataFrame.R

    Davies Liu committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    1d0f2ae View commit details
    Browse the repository at this point in the history

  4. Update column.R

    Davies Liu committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    f798402 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … column
    @davies
    davies committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    524c122 View commit details
    Browse the repository at this point in the history

  6. Merge pull request apache#188 from davies/column 

    [SPARKR-189] [SPARKR-190] Column and expression
    @shivaram
    shivaram committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    8a676b1 View commit details
    Browse the repository at this point in the history

  7. launch R worker by a daemon

    @davies
    davies committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    06cbc2d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … api

Conflicts:
	pkg/R/RDD.R
    @davies
    davies committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    3beadcf View commit details
    Browse the repository at this point in the history

  9. Fixed small typos

    Felix Cheung authored and Felix Cheung committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    e2d144a View commit details
    Browse the repository at this point in the history

  10. fix test and docs

    @davies
    davies committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    98cc97a View commit details
    Browse the repository at this point in the history

  11. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … group

Conflicts:
	pkg/NAMESPACE
	pkg/R/DataFrame.R
	pkg/R/utils.R
	pkg/inst/tests/test_sparkSQL.R
    @davies
    davies committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    39c253d View commit details
    Browse the repository at this point in the history

  12. Merge branch 'group' of github.com:davies/SparkR-pkg into group 

    Conflicts:
	pkg/NAMESPACE
	pkg/R/DataFrame.R
    @davies
    davies committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    03bcf20 View commit details
    Browse the repository at this point in the history

  13. address comments

    @davies
    davies committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    ed9a89f View commit details
    Browse the repository at this point in the history

  14. New 1.3 repo and updates to column.R 

    Updated column to use `functions` instead of `Dsl` in accordance with the new API changes.

Also created separate classes for `asc` and `desc`.
    cafreeman committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    e8639c3 View commit details
    Browse the repository at this point in the history

  15. shutdown the JVM after R process die

    @davies
    davies committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    2b6f980 View commit details
    Browse the repository at this point in the history

  16. Merge pull request apache#195 from cafreeman/sparkr-sql 

    New 1.3 repo and updates to `column.R`
    @shivaram
    shivaram committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    3f22c8d View commit details
    Browse the repository at this point in the history

  17. Refactor join generic for use with DataFrame

    cafreeman committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    4fa6343 View commit details
    Browse the repository at this point in the history

  18. join, sort, and filter 

    New DataFrame methods:

- `join`
- `sort`
- `orderBy`
- `filter`
- `where`
    cafreeman committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    294ca4a View commit details
    Browse the repository at this point in the history

  19. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … api

Conflicts:
	pkg/src/build.sbt
    @davies
    davies committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    12a6db2 View commit details
    Browse the repository at this point in the history

  20. fix tests

    @davies
    davies committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    8ff29d6 View commit details
    Browse the repository at this point in the history

  21. small update on yarn deploy mode.

    Felix Cheung authored and Felix Cheung committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    2e7b190 View commit details
    Browse the repository at this point in the history

  22. Fixed indent in join test.

    cafreeman committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    32b37d1 View commit details
    Browse the repository at this point in the history

  23. selectExpr

    cafreeman committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    e14c328 View commit details
    Browse the repository at this point in the history

  24. update export

    cafreeman committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    494a4dd View commit details
    Browse the repository at this point in the history

  25. Merge pull request apache#197 from cafreeman/sparkr-sql 

    [SparkR-209] `join`, `sort`, `filter` methods for DataFrame
    @shivaram
    shivaram committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    cd7ac8a View commit details
    Browse the repository at this point in the history

  26. Merge branch 'dfMethods' into sparkr-sql

    cafreeman committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    74269f3 View commit details
    Browse the repository at this point in the history

  27. remove extra line

    cafreeman committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    acea146 View commit details
    Browse the repository at this point in the history

  28. Fix test

    cafreeman committed Mar 3, 2015
    Configuration menu
    Copy the full SHA
    7918634 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2015

  1. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … load

Conflicts:
	pkg/NAMESPACE
	pkg/R/utils.R
	pkg/inst/tests/test_sparkSQL.R
	pkg/src/src/main/scala/edu/berkeley/cs/amplab/sparkr/SQLUtils.scala
    @davies
    davies committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    5073e07 View commit details
    Browse the repository at this point in the history

  2. Merge pull request apache#191 from felixcheung/doc 

    Doc updates: build and running on YARN
    @shivaram
    shivaram committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    32aa01d View commit details
    Browse the repository at this point in the history

  3. add HiveContext (commented)

    @davies
    davies committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    197a79b View commit details
    Browse the repository at this point in the history

  4. Merge pull request apache#194 from davies/api 

    [SPARKR-210] Some APIs in SQLContext
    @shivaram
    shivaram committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    4e0becc View commit details
    Browse the repository at this point in the history

  5. Update SparkRBackend.scala

    Davies Liu committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    8de958d View commit details
    Browse the repository at this point in the history

  6. Remove SparkR snapshot build 

    We now have 1.3.0 RC2 on Apache Staging
    @shivaram
    shivaram committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    d18f9d3 View commit details
    Browse the repository at this point in the history

  7. Update sparkR.R

    Davies Liu committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    a37fd80 View commit details
    Browse the repository at this point in the history

  8. [SPARKR-156] phase 1: implement zipWithUniqueId() of the RDD class.

    Sun Rui committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    3865f39 View commit details
    Browse the repository at this point in the history

  9. Fixed docs

    cafreeman committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    bc90115 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'sparkr-sql' of https://github.com/amplab-extras/SparkR-pkg 

     into sparkr-sql
    cafreeman committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    8b9a963 View commit details
    Browse the repository at this point in the history

  11. Use rc2 explicitly

    @shivaram
    shivaram committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    870acd4 View commit details
    Browse the repository at this point in the history

  12. Merge pull request apache#200 from shivaram/sparkr-sql-build 

    Revert SparkR snapshot dependency
    @shivaram
    shivaram committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    198c130 View commit details
    Browse the repository at this point in the history

  13. Merge pull request apache#198 from cafreeman/sparkr-sql 

    `selectExpr`
    @shivaram
    shivaram committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    6a1fe64 View commit details
    Browse the repository at this point in the history

  14. clean up docs

    cafreeman committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    20242c4 View commit details
    Browse the repository at this point in the history

  15. 'explain`

    cafreeman committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    0ac4abc View commit details
    Browse the repository at this point in the history

  16. toJSON

    cafreeman committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    68b11cf View commit details
    Browse the repository at this point in the history

  17. isLocal

    cafreeman committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    779c102 View commit details
    Browse the repository at this point in the history

  18. showDF

    cafreeman committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    3fab0f8 View commit details
    Browse the repository at this point in the history

  19. fix test

    cafreeman committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    a5c2887 View commit details
    Browse the repository at this point in the history

  20. 'saveAsParquetFile`

    cafreeman committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    ff8b005 View commit details
    Browse the repository at this point in the history

  21. address comments

    @davies
    davies committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    f10a24e View commit details
    Browse the repository at this point in the history

  22. support Column expression in agg()

    @davies
    davies committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    6fac596 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … load

Conflicts:
	pkg/NAMESPACE
	pkg/R/SQLContext.R
    @davies
    davies committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    5fd9575 View commit details
    Browse the repository at this point in the history

  24. Update explain and fixed doc for toJSON

    cafreeman committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    3675fcf View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2015

  1. Merge pull request apache#202 from cafreeman/sparkr-sql 

    [SparkR-209] `explain`, `toJSON`, `isLocal`, `showDF`, `saveAsParquetFile` DataFrame methods
    @shivaram
    shivaram committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    de2abfa View commit details
    Browse the repository at this point in the history

  2. fix style

    @davies
    davies committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    b875b4f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … group

Conflicts:
	pkg/NAMESPACE
	pkg/R/DataFrame.R
	pkg/inst/tests/test_sparkSQL.R
    @davies
    davies committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    e9e2a03 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … load

Conflicts:
	pkg/NAMESPACE
    @davies
    davies committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    bb46832 View commit details
    Browse the repository at this point in the history

  5. fix HiveContext

    @davies
    davies committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    8b7fb67 View commit details
    Browse the repository at this point in the history

  6. Merge pull request apache#199 from davies/load 

    [SPARKR-203] load and save DataFrame
    @shivaram
    shivaram committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    d0d4626 View commit details
    Browse the repository at this point in the history

  7. fix tests

    @davies
    davies committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    fb3b139 View commit details
    Browse the repository at this point in the history

  8. Fix HiveContext package name

    @shivaram
    shivaram committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    47a613f View commit details
    Browse the repository at this point in the history

  9. Fix test hive context package name

    @shivaram
    shivaram committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    62b0760 View commit details
    Browse the repository at this point in the history

  10. Merge pull request apache#203 from shivaram/sparkr-hive-fix 

    Fix HiveContext package name
    @shivaram
    shivaram committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    4d0fb56 View commit details
    Browse the repository at this point in the history

  11. close monitor connection in sparkR.stop()

    @davies
    davies committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    ac8a852 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'die' of github.com:davies/SparkR-pkg into die

    @davies
    davies committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    3c7674f View commit details
    Browse the repository at this point in the history

  13. Use mapply() instead of for statement.

    Sun Rui committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    f06ccec View commit details
    Browse the repository at this point in the history

  14. address comments

    @davies
    davies committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    dfb399a View commit details
    Browse the repository at this point in the history

  15. Merge pull request apache#201 from sun-rui/SPARKR-156_1 

    [SPARKR-156] phase 1: implement zipWithUniqueId() of the RDD class.
    @shivaram
    shivaram committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    18c6004 View commit details
    Browse the repository at this point in the history

  16. add test to start and stop context multiple times

    @davies
    davies committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    d8c1c09 View commit details
    Browse the repository at this point in the history

  17. dropTempTable 

    Add `dropTempTable` function and update tests to drop the test table at the end of every test.
    cafreeman committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    9d01bcd View commit details
    Browse the repository at this point in the history

  18. insertInto

    cafreeman committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    befbd32 View commit details
    Browse the repository at this point in the history

  19. intersect, subtract, unionAll

    cafreeman committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    fef99de View commit details
    Browse the repository at this point in the history

  20. remove test, catch exception

    @davies
    davies committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    428a99a View commit details
    Browse the repository at this point in the history

  21. improve logging

    @davies
    davies committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    e6fb8d8 View commit details
    Browse the repository at this point in the history

  22. Update SparkRBackendHandler.scala

    Davies Liu committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    9dd6a5a View commit details
    Browse the repository at this point in the history

  23. Merge pull request apache#180 from davies/group 

    [SPARKR-191] groupBy and agg() API for DataFrame
    @shivaram
    shivaram committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    bcb0bf5 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2015

  1. New select method 

    Added another version of `select` that will take a list as an argument (instead of just specific column names or expression)
    cafreeman committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    c5fa3b9 View commit details
    Browse the repository at this point in the history

  2. withColumn and withColumnRenamed

    cafreeman committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    7a5d6fd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dfMethods' into sparkr-sql

    cafreeman committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    a582810 View commit details
    Browse the repository at this point in the history

  4. [SPARKR-156] phase 2: implement zipWithIndex() of the RDD class.

    Sun Rui committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    f3d99a6 View commit details
    Browse the repository at this point in the history

  5. Fix indentation.

    Sun Rui committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    5e3a576 View commit details
    Browse the repository at this point in the history

  6. Remove print statement in SparkRBackendHandler 

    This print statement is noisy for SQL methods which have multiple APIs
(like loadDF). We already have a better error message when no valid
methods are found
    @shivaram
    shivaram committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    a8cebf0 View commit details
    Browse the repository at this point in the history

  7. Fix minor typos in the function description.

    Sun Rui committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    3f7aed6 View commit details
    Browse the repository at this point in the history

  8. Merge pull request apache#206 from sun-rui/SPARKR-156_2 

    [SPARKR-156] phase 2: implement zipWithIndex() of the RDD class.
    @shivaram
    shivaram committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    5eec6fc View commit details
    Browse the repository at this point in the history

  9. update tests to guarantee row order

    cafreeman committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    e60578a View commit details
    Browse the repository at this point in the history

  10. Merge pull request apache#207 from shivaram/err-remove 

    Remove print statement in SparkRBackendHandler
    @shivaram
    shivaram committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    789be97 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'sparkr-sql' of https://github.com/amplab-extras/SparkR-pkg 

     into sparkr-sql
    cafreeman committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    3db5649 View commit details
    Browse the repository at this point in the history

  12. use fork package

    @davies
    davies committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    b4c0b2e View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2015

  1. Add checks for namespace access operators in cleanClosure.

    @hlin09
    hlin09 committed Mar 8, 2015
    Configuration menu
    Copy the full SHA
    dc1291b View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2015

  1. Fix example for dropTempTable

    cafreeman committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    15a713f View commit details
    Browse the repository at this point in the history

  2. Merge pull request apache#204 from cafreeman/sparkr-sql 

    [SparkR-209] Remaining DataFrame methods + `dropTempTable`
    @shivaram
    shivaram committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    09ff163 View commit details
    Browse the repository at this point in the history

  3. Add a test for access operators.

    @hlin09
    hlin09 committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    97dde1a View commit details
    Browse the repository at this point in the history

  4. Move setGeneric() to 00-generics.R.

    @hlin09
    hlin09 committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    89b886d View commit details
    Browse the repository at this point in the history

  5. Move getJRDD and broadcast's value to 00-generic.R.

    @hlin09
    hlin09 committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    471c794 View commit details
    Browse the repository at this point in the history

  6. Merge pull request apache#210 from hlin09/hlin09 

    Add checks for namespace access operators (:: and :::) in cleanClosure.
    @shivaram
    shivaram committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    ffd6e8e View commit details
    Browse the repository at this point in the history

  7. Move roxygen doc back to implementation.

    @hlin09
    hlin09 committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    6bccbbf View commit details
    Browse the repository at this point in the history

  8. switch back to use parallel

    @davies
    davies committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    8f8813f View commit details
    Browse the repository at this point in the history

  9. make RStudio happy

    @davies
    davies committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    411b751 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2015

  1. Remove duplication.

    @hlin09
    hlin09 committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    ecdfda1 View commit details
    Browse the repository at this point in the history

  2. Remove missingOrInteger.

    @hlin09
    hlin09 committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    ff948db View commit details
    Browse the repository at this point in the history

  3. add config for using daemon, refactor

    @davies
    davies committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    01aa5ee View commit details
    Browse the repository at this point in the history

  4. retry

    @davies
    davies committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    46cea3d View commit details
    Browse the repository at this point in the history

  5. readFully()

    @davies
    davies committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    8583968 View commit details
    Browse the repository at this point in the history

  6. Merge pull request apache#211 from hlin09/generics 

    [SPARKR-220] Move setGeneric() to a separate file (00-generics.R) to make S4 generic methods easier to follow, and visible to all data types' implementation.
    @shivaram
    shivaram committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    90f2692 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2015

  1. Merge pull request apache#196 from davies/die 

    [SPARKR-198] shutdown the JVM after R process die
    @shivaram
    shivaram committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    5757b95 View commit details
    Browse the repository at this point in the history

  2. createDataFrame from rdd

    @davies
    davies committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    4e4908a View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2015

  1. support date.frame and Date/Time

    @davies
    davies committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    26a3621 View commit details
    Browse the repository at this point in the history

  2. remove dependency of jsonlite

    @davies
    davies committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    a6dc435 View commit details
    Browse the repository at this point in the history

  3. improve comment and logging

    @davies
    davies committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    e87bb98 View commit details
    Browse the repository at this point in the history

  4. include grouping columns in agg() 

    add docs for groupBy() and agg()
    @davies
    davies committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    9a6be74 View commit details
    Browse the repository at this point in the history

  5. add more selecter for DataFrame

    @davies
    davies committed Mar 12, 2015
    Configuration menu
    Copy the full SHA
    0467474 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2015

  1. Merge pull request apache#193 from davies/daemon 

    [SPARKR-214] launch R worker by a daemon
    @shivaram
    shivaram committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    3e0555d View commit details
    Browse the repository at this point in the history

  2. Merge pull request apache#216 from davies/select2 

    [SPARKR-189] add more selector for DataFrame
    @shivaram
    shivaram committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    55c38bc View commit details
    Browse the repository at this point in the history

  3. address commets

    @davies
    davies committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    66cc92a View commit details
    Browse the repository at this point in the history

  4. Update SQLContext.R

    Davies Liu committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    72adb14 View commit details
    Browse the repository at this point in the history

  5. Update DataFrame.R

    Davies Liu committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    8e1497d View commit details
    Browse the repository at this point in the history

  6. Merge pull request apache#215 from davies/agg 

    [SPARKR-221] include grouping columns in agg()
    @shivaram
    shivaram committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    05b9126 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … toDF

Conflicts:
	pkg/src/src/main/scala/edu/berkeley/cs/amplab/sparkr/SQLUtils.scala
    @davies
    davies committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    e52258f View commit details
    Browse the repository at this point in the history

  8. Remove staging repo now that 1.3 is released

    @shivaram
    shivaram committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    8bff523 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into merge 

    Conflicts:
	.gitignore
	pkg/DESCRIPTION
	pkg/NAMESPACE
	pkg/R/RDD.R
	pkg/R/pairRDD.R
	pkg/R/sparkR.R
	pkg/R/utils.R
	pkg/inst/sparkR-submit
	pkg/inst/tests/test_rdd.R
	pkg/inst/worker/worker.R
	pkg/src/src/main/scala/edu/berkeley/cs/amplab/sparkr/RRDD.scala
	pkg/src/src/main/scala/edu/berkeley/cs/amplab/sparkr/SparkRRunner.scala
    @davies
    davies committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    963c7ee View commit details
    Browse the repository at this point in the history

  10. Merge pull request apache#219 from shivaram/sparkr-build-final 

    Remove staging repo now that 1.3 is released
    @shivaram
    shivaram committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    d8c8fcc View commit details
    Browse the repository at this point in the history

  11. fixed parquetFile signature

    @evertlammerts
    evertlammerts committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    8190127 View commit details
    Browse the repository at this point in the history

  12. added tests

    @evertlammerts
    evertlammerts committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    7695d36 View commit details
    Browse the repository at this point in the history

  13. Merge pull request apache#179 from evertlammerts/sparkr-sql 

    [SPARKR-208] Changed SQLContext.R#parquetFile signature to match the java version
    @shivaram
    shivaram committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    1bc2998 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2015

  1. Include utils before SparkR for head to work 

    Before this change calling `head` on a DataFrame would not
work from the sparkR script as utils would be loaded after SparkR
and placed ahead in the search list. This change requires utils to
be loaded before SparkR
    @shivaram
    shivaram committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    662938a View commit details
    Browse the repository at this point in the history

  2. Merge pull request apache#220 from shivaram/sparkr-utils-include 

    Include utils before SparkR for `head` to work
    @shivaram
    shivaram committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    dd52cbc View commit details
    Browse the repository at this point in the history

  3. address comments

    @davies
    davies committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    46454e4 View commit details
    Browse the repository at this point in the history

  4. Update SerDe.scala

    Davies Liu committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    7f5e70c View commit details
    Browse the repository at this point in the history

  5. handle NULL

    @davies
    davies committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    bc2ff38 View commit details
    Browse the repository at this point in the history

  6. handle NULL

    @davies
    davies committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    6122e0e View commit details
    Browse the repository at this point in the history

  7. Merge pull request apache#212 from davies/toDF 

    [SPARKR-192]  createDataFrame from rdd
    @shivaram
    shivaram committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    3139325 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … merge
    @davies
    davies committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    4b1628d View commit details
    Browse the repository at this point in the history

  9. address comments

    @davies
    davies committed Mar 14, 2015
    Configuration menu
    Copy the full SHA
    70f620c View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2015

  1. Merge pull request apache#218 from davies/merge 

    [SPARKR-225] Merge master into sparkr-sql branch
    @shivaram
    shivaram committed Mar 16, 2015
    Configuration menu
    Copy the full SHA
    f5d3355 View commit details
    Browse the repository at this point in the history

  2. Merge pull request apache#217 from hlin09/cleanClosureFix 

    Fix cleanClosure() on recursive function calls.
    @shivaram
    shivaram committed Mar 16, 2015
    Configuration menu
    Copy the full SHA
    3214c6d View commit details
    Browse the repository at this point in the history

  3. Merge pull request apache#221 from shivaram/sparkr-stop-start 

    [SPARKR-219] Clear broadcast variables when JVM is shutdown
    @shivaram
    shivaram committed Mar 16, 2015
    Configuration menu
    Copy the full SHA
    6f95d49 View commit details
    Browse the repository at this point in the history

  4. add more API for Column

    @davies
    davies committed Mar 16, 2015
    Configuration menu
    Copy the full SHA
    5e610cb View commit details
    Browse the repository at this point in the history

  5. fix test

    @davies
    davies committed Mar 16, 2015
    Configuration menu
    Copy the full SHA
    b043876 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2015

  1. Merge pull request apache#222 from davies/column2 

    [SPARKR-233] [SPARKR-190] add more API for Column
    @shivaram
    shivaram committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    2fc553f View commit details
    Browse the repository at this point in the history

  2. Moved files to R/

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    44994c2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'remote_r' into R

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    49a8133 View commit details
    Browse the repository at this point in the history

  4. delete man pages

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    014d253 View commit details
    Browse the repository at this point in the history

  5. move scala

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    180fc9c View commit details
    Browse the repository at this point in the history

  6. move Scala source into core/ and sql/

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    3415cc7 View commit details
    Browse the repository at this point in the history

  7. move R/examples into examples/src/main/r

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    df3eeea View commit details
    Browse the repository at this point in the history

  8. fix path of assembly jar

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    a76472f View commit details
    Browse the repository at this point in the history

  9. move sparkR into bin/

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    0a0e632 View commit details
    Browse the repository at this point in the history

  10. update docs

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    18e5eed View commit details
    Browse the repository at this point in the history

  11. add .gitignore for .o, .so, .Rd

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    facb6e0 View commit details
    Browse the repository at this point in the history

  12. add LICENSE header for R sources

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    50bff63 View commit details
    Browse the repository at this point in the history

  13. reduce size of example data

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    35e5755 View commit details
    Browse the repository at this point in the history

  14. fix .gitignore

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    e8fc7ca View commit details
    Browse the repository at this point in the history

  15. run sparkr tests in Spark

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    c4a5bdf View commit details
    Browse the repository at this point in the history

  16. rm .travis.yml

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    f403b4a View commit details
    Browse the repository at this point in the history

  17. support R in spark-submit

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    ba53b09 View commit details
    Browse the repository at this point in the history

  18. cleanup

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    043959e View commit details
    Browse the repository at this point in the history

  19. remove Spark prefix for class

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    f7b6936 View commit details
    Browse the repository at this point in the history

  20. Remove DFC example

    @shivaram
    shivaram committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    e4f1937 View commit details
    Browse the repository at this point in the history

  21. Fix style

    @shivaram
    shivaram committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    ff776aa View commit details
    Browse the repository at this point in the history

  22. fix rat

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    aae881b View commit details
    Browse the repository at this point in the history

  23. Build SparkR with Maven profile

    @shivaram
    shivaram committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    2d235d4 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'R' of https://github.com/amplab-extras/spark into R

    @shivaram
    shivaram committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    716b16f View commit details
    Browse the repository at this point in the history

  25. Add missing comma

    @shivaram
    shivaram committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    52ca6e5 View commit details
    Browse the repository at this point in the history

  26. change println() to logging

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    479e3fe View commit details
    Browse the repository at this point in the history

  27. Merge branch 'R' of github.com:amplab-extras/spark into R

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    9f6aa1f View commit details
    Browse the repository at this point in the history

  28. fix bin/sparkR

    Davies Liu committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    0e2412c View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2015

  1. fix spark-submit with R path and sparkR -h

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    ea90fab View commit details
    Browse the repository at this point in the history

  2. Fix run-tests path

    @shivaram
    shivaram committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    d6f2bdd View commit details
    Browse the repository at this point in the history

  3. Make bin/sparkR use spark-submit 

    As a part of this move the R initialization functions
into first.R and first-submit.R
    @shivaram
    shivaram committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    baefd9e View commit details
    Browse the repository at this point in the history

  4. fix spark-submit with R scripot

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    95d2de3 View commit details
    Browse the repository at this point in the history

  5. Only stop backend JVM if R launched it

    @shivaram
    shivaram committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    05afef0 View commit details
    Browse the repository at this point in the history

  6. Set windows file separators, install dirs

    @shivaram
    shivaram committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    8030847 View commit details
    Browse the repository at this point in the history

  7. Add scripts to start SparkR on windows

    @shivaram
    shivaram committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    cb6e5e3 View commit details
    Browse the repository at this point in the history

  8. Merge pull request apache#214 from sun-rui/SPARKR-156_3 

    [SPARKR-156] Phase 3: Implement zip() in the RDD class.
Conflicts:
	pkg/inst/worker/worker.R
    @shivaram
    shivaram committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    a1870e8 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'R' of github.com:amplab-extras/spark into R 

    Conflicts:
	R/pkg/R/sparkRClient.R
	bin/sparkR
	core/src/main/scala/org/apache/spark/deploy/RRunner.scala
	launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    ef26015 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'R' of github.com:amplab-extras/spark into R

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    42d8b4c View commit details
    Browse the repository at this point in the history

  11. fix exit code of sparkr unit test

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    028cbfb View commit details
    Browse the repository at this point in the history

  12. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … remote_r
    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    f04080c View commit details
    Browse the repository at this point in the history

  13. Merge branch 'remote_r' into R

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    ba4b80b View commit details
    Browse the repository at this point in the history

  14. rm man page

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    56670ef View commit details
    Browse the repository at this point in the history

  15. rm PROJECT_HOME

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    1a16cd6 View commit details
    Browse the repository at this point in the history

  16. Merge pull request apache#224 from sun-rui/SPARKR-224-new 

    [SPARKR-224] The serialized flag in a PipelinedRDD is not set correctly.
    @shivaram
    shivaram committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    40d193a View commit details
    Browse the repository at this point in the history

  17. add missing files

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    d436f26 View commit details
    Browse the repository at this point in the history

  18. Update README remove outdated TODO

    @shivaram
    shivaram committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    756ece0 View commit details
    Browse the repository at this point in the history

  19. fix test of zipRDD()

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    38cbf59 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'R' of github.com:amplab-extras/spark into R

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    ebd4d07 View commit details
    Browse the repository at this point in the history

  21. support R in YARN cluster

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    2892e29 View commit details
    Browse the repository at this point in the history

  22. fix build

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    7da0049 View commit details
    Browse the repository at this point in the history

  23. fix license check

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    ce3ca62 View commit details
    Browse the repository at this point in the history

  24. disable spark and python tests temporary

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    d8b24fc View commit details
    Browse the repository at this point in the history

  25. fix zipRDD() tests

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    410ec18 View commit details
    Browse the repository at this point in the history

  26. fix flaky test

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    974e4ea View commit details
    Browse the repository at this point in the history

  27. Ignore unknown jobj in cleanup

    @shivaram
    shivaram committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    423ea3c View commit details
    Browse the repository at this point in the history

  28. mark R classes/objects are private

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    9fb6af3 View commit details
    Browse the repository at this point in the history

  29. Merge branch 'R' of github.com:amplab-extras/spark into R

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    855537f View commit details
    Browse the repository at this point in the history

  30. Include RStudio instructions in README

    @shivaram
    shivaram committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    b44e371 View commit details
    Browse the repository at this point in the history

  31. sort generics

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    05e7375 View commit details
    Browse the repository at this point in the history

  32. Merge branch 'R' of github.com:amplab-extras/spark into R

    Davies Liu committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    bdf3a14 View commit details
    Browse the repository at this point in the history

  33. Fix libPaths in README

    @shivaram
    shivaram committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    7100fb9 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2015

  1. fix flaky tests

    Davies Liu committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    d87a181 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'R' of github.com:amplab-extras/spark into R

    Davies Liu committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    afd8a77 View commit details
    Browse the repository at this point in the history

  3. fix code style

    Davies Liu committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    0e5a83f View commit details
    Browse the repository at this point in the history

  4. enable spark and pyspark tests

    Davies Liu committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    d6d3729 View commit details
    Browse the repository at this point in the history

  5. Add a script to generate R docs (Rd, html) 

    Also fix some issues with our documentation
    @shivaram
    shivaram committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    02b4833 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'R' of https://github.com/amplab-extras/spark into R

    @shivaram
    shivaram committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    1f478c5 View commit details
    Browse the repository at this point in the history

  7. Add instructions to generate docs

    @shivaram
    shivaram committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    6ff5ea2 View commit details
    Browse the repository at this point in the history

  8. Add license to create-docs.sh

    @shivaram
    shivaram committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    52cc92d View commit details
    Browse the repository at this point in the history

  9. Merge branch 'R' of https://github.com/amplab-extras/spark into R

    @shivaram
    shivaram committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    58276f5 View commit details
    Browse the repository at this point in the history

  10. Send Spark INFO logs to a file in SparkR tests

    @shivaram
    shivaram committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    e1f83ab View commit details
    Browse the repository at this point in the history

  11. Address comments

    @shivaram
    shivaram committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    a1493d7 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #1 from shivaram/log4j-tests 

    Send Spark INFO logs to a file in SparkR tests
    Davies Liu committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    b21a0da View commit details
    Browse the repository at this point in the history

  13. update R examples (remove master from args)

    Davies Liu committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    733380d View commit details
    Browse the repository at this point in the history

  14. fix flaky test

    Davies Liu committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    3eacfc0 View commit details
    Browse the repository at this point in the history

  15. Merge pull request apache#226 from RevolutionAnalytics/master 

    [SPARKR-236] Use .onLoad instead of .onAttach to initialize SparkR
    @shivaram
    shivaram committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    85a50ec View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2015

  1. Remove unused numCols argument

    @shivaram
    shivaram committed Mar 20, 2015
    Configuration menu
    Copy the full SHA
    cf5cd99 View commit details
    Browse the repository at this point in the history

  2. Check the right env in exists

    @shivaram
    shivaram committed Mar 20, 2015
    Configuration menu
    Copy the full SHA
    104ad4e View commit details
    Browse the repository at this point in the history

  3. Some fixes to DataFrame, RDD, SQLContext docs

    @shivaram
    shivaram committed Mar 20, 2015
    Configuration menu
    Copy the full SHA
    1f1a7e0 View commit details
    Browse the repository at this point in the history

  4. Some doc fixes for column, generics, group

    @shivaram
    shivaram committed Mar 20, 2015
    Configuration menu
    Copy the full SHA
    d425363 View commit details
    Browse the repository at this point in the history

  5. Remove arg from sparkR.stop and update docs

    @shivaram
    shivaram committed Mar 20, 2015
    Configuration menu
    Copy the full SHA
    bc2d6d8 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2 from shivaram/doc-fixes 

    Some bug fixes and docs fixes
    Davies Liu committed Mar 20, 2015
    Configuration menu
    Copy the full SHA
    463e28c View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2015

  1. Merge pull request apache#225 from sun-rui/SPARKR-154_2 

    [SPARKR-154] Phase 1: implement glom().
    @shivaram
    Davies Liu authored and shivaram committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    e089151 View commit details
    Browse the repository at this point in the history

  2. Merge pull request apache#228 from felixcheung/doc 

    Port create-doc script from amplab-extras/spark/R
    @shivaram
    shivaram committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    a1cedad View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2015

  1. Merge branch 'master' of github.com:apache/spark into R 

    Conflicts:
	dev/run-tests
	dev/run-tests-codes.sh
	dev/run-tests-jenkins
    Davies Liu committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    b433817 View commit details
    Browse the repository at this point in the history

  2. address comments

    Davies Liu committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    6e20e71 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'R' of github.com:amplab-extras/spark into R

    Davies Liu committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    e88b649 View commit details
    Browse the repository at this point in the history

  4. move rules into R/.gitignore

    Davies Liu committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    a1777eb View commit details
    Browse the repository at this point in the history

  5. remove ::: in SparkR

    Davies Liu committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    e7104b6 View commit details
    Browse the repository at this point in the history

  6. mute logging when start/stop context

    Davies Liu committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    f8fa8af View commit details
    Browse the repository at this point in the history

  7. Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into… 

    … remote_r
    Davies Liu committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    19c9368 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'remote_r' into R 

    Conflicts:
	R/pkg/R/generics.R
	R/pkg/R/zzz.R
    Davies Liu committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    b045701 View commit details
    Browse the repository at this point in the history

  9. remove duplicated file

    Davies Liu committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    c300e08 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2015

  1. Update R to fail early if SparkR package is missing

    @felixcheung
    felixcheung committed Mar 30, 2015
    Configuration menu
    Copy the full SHA
    11981b7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from felixcheung/r-require 

    [SPARKR-241] Update R to fail early if SparkR package is missing
    @shivaram
    shivaram committed Mar 30, 2015
    Configuration menu
    Copy the full SHA
    1d1802e View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2015

  1. Add tests log in .gitignore.

    @hlin09
    hlin09 committed Mar 31, 2015
    Configuration menu
    Copy the full SHA
    3487461 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from hlin09/doc-fix 

    Adds tests log in .gitignore.
    @shivaram
    shivaram committed Mar 31, 2015
    Configuration menu
    Copy the full SHA
    0e788c0 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2015

  1. [SPARKR-92] Phase 2: implement sum(rdd)

    @hqzizania
    hqzizania committed Apr 4, 2015
    Configuration menu
    Copy the full SHA
    940b631 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2015

  1. Merge pull request #7 from hqzizania/R3 

    [SPARKR-92] Phase 2: implement sum(rdd)
    @shivaram
    shivaram committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    5133f3a View commit details
    Browse the repository at this point in the history

  2. Update sparkR.R

    Davies Liu committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    a18ff5c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3 from davies/R2 

    remove unnecesary ::: inside SparkR
    @shivaram
    shivaram committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    eb5da53 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2015

  1. Merge remote-tracking branch 'apache/master' into R

    @shivaram
    shivaram committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    377151f View commit details
    Browse the repository at this point in the history

  2. Address code review comments 

    Changes include
1. Adding SparkR docs to API docs generated
2. Style fixes in SparkR scala files
3. Clean up of shell scripts and explanation of install-dev.sh
    @shivaram
    shivaram committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    d7c3f22 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'R' of https://github.com/amplab-extras/spark into R

    @shivaram
    shivaram committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    64eda24 View commit details
    Browse the repository at this point in the history

  4. Only run SparkR tests if R is installed

    @shivaram
    shivaram committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    f731b48 View commit details
    Browse the repository at this point in the history

  5. update author of SparkR

    Davies Liu committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    5581c75 View commit details
    Browse the repository at this point in the history

  6. fix tests

    Davies Liu committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    55808e4 View commit details
    Browse the repository at this point in the history

  7. check exclusive of primary-py-file and primary-r-file 

    add return type and use change GroupedData.toDF to private[sql]
    Davies Liu committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    59266d1 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2015

  1. fix Date serialization

    Davies Liu committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    da64742 View commit details
    Browse the repository at this point in the history