GitHub user davies opened a pull request:

    https://github.com/apache/spark/pull/5436

    [WIP]  Merge recent SparkR-pkg changes

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/davies/spark R3

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/spark/pull/5436.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #5436
    
----
commit 3f22c8d82eaa4addf1b72b43eb236037d9aef342
Author: Shivaram Venkataraman <[email protected]>
Date:   2015-03-03T20:13:35Z

    Merge pull request #195 from cafreeman/sparkr-sql
    
    New 1.3 repo and updates to `column.R`

commit 4fa634328c7d11d31239b40eb6a9a44899f70266
Author: cafreeman <[email protected]>
Date:   2015-03-03T20:23:33Z

    Refactor `join` generic for use with `DataFrame`

commit 294ca4a9249618fffb523b341615e1e910344b9d
Author: cafreeman <[email protected]>
Date:   2015-03-03T21:01:22Z

    `join`, `sort`, and `filter`
    
    New DataFrame methods:
    
    - `join`
    - `sort`
    - `orderBy`
    - `filter`
    - `where`

commit 12a6db2e53448ebbc8ac447136974304d01ef929
Author: Davies Liu <[email protected]>
Date:   2015-03-03T21:22:14Z

    Merge branch 'sparkr-sql' of github.com:amplab-extras/SparkR-pkg into api
    
    Conflicts:
        pkg/src/build.sbt

commit 8ff29d6a82980e6e38e45a7721a7443ee9fa8be8
Author: Davies Liu <[email protected]>
Date:   2015-03-03T21:35:41Z

    fix tests

commit 2e7b19002918a1e447efe4b0b43af181c6b49844
Author: Felix Cheung <[email protected]>
Date:   2015-03-03T21:41:25Z

    small update on yarn deploy mode.

commit 32b37d1a8053dc328f2a2a377923a2141e197f2a
Author: cafreeman <[email protected]>
Date:   2015-03-03T21:53:08Z

    Fixed indent in `join` test.

commit e14c3289f65809fbf5dcd4513954e0bbf92a1b2b
Author: cafreeman <[email protected]>
Date:   2015-03-03T22:04:55Z

    `selectExpr`

commit 494a4ddef3bc39a8caa848c931033e1a6f6911bf
Author: cafreeman <[email protected]>
Date:   2015-03-03T22:06:06Z

    update export

commit cd7ac8ac6ee1f4b6c3258023d59cbd7ab88edb44
Author: Shivaram Venkataraman <[email protected]>
Date:   2015-03-03T22:12:47Z

    Merge pull request #197 from cafreeman/sparkr-sql
    
    [SparkR-209] `join`, `sort`, `filter` methods for DataFrame

commit 74269f301bc619febc7198aad0f657bb67815bd4
Author: cafreeman <[email protected]>
Date:   2015-03-03T22:16:06Z

    Merge branch 'dfMethods' into sparkr-sql

commit acea1468a9c71ea5d711e0a6845b79d4ad6c8b21
Author: cafreeman <[email protected]>
Date:   2015-03-03T22:20:55Z

    remove extra line

commit 79186340c2095ba6ec32b06ebb1a3daffd72b486
Author: cafreeman <[email protected]>
Date:   2015-03-03T22:22:31Z

    Fix test

commit 5073e0725ff6442b02728c0cd64a902295a58d02
Author: Davies Liu <[email protected]>
Date:   2015-03-04T05:53:19Z

    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

commit 32aa01defa93de72f805c0f7a55e1caca104ca1c
Author: Shivaram Venkataraman <[email protected]>
Date:   2015-03-04T06:35:52Z

    Merge pull request #191 from felixcheung/doc
    
    Doc updates: build and running on YARN

commit 197a79b856237f2752e31f76183e715da5b2146b
Author: Davies Liu <[email protected]>
Date:   2015-03-04T06:41:04Z

    add HiveContext (commented)

commit 4e0becce7ddf80e836c41e7ec502319498abec20
Author: Shivaram Venkataraman <[email protected]>
Date:   2015-03-04T06:42:59Z

    Merge pull request #194 from davies/api
    
    [SPARKR-210] Some APIs in SQLContext

commit 8de958d9f295643f3e5b7089ddb9363dad4f7421
Author: Davies Liu <[email protected]>
Date:   2015-03-04T06:45:02Z

    Update SparkRBackend.scala

commit d18f9d334c3f0bdf21cd9ab0372aa02f1fa9c7df
Author: Shivaram Venkataraman <[email protected]>
Date:   2015-03-04T06:57:36Z

    Remove SparkR snapshot build
    We now have 1.3.0 RC2 on Apache Staging

commit a37fd808254f506d252885ee4f9c9829eb6c8847
Author: Davies Liu <[email protected]>
Date:   2015-03-04T07:49:48Z

    Update sparkR.R

commit 3865f394e5e2187bc4ac710d587a48df1177b310
Author: Sun Rui <[email protected]>
Date:   2015-03-04T10:26:16Z

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

commit bc901159e30ef3bebb2b8a7a36c9abfb3b1cf230
Author: cafreeman <[email protected]>
Date:   2015-03-04T14:33:00Z

    Fixed docs

commit 8b9a9634441f04090321fb989a4e5150f7f7218f
Author: cafreeman <[email protected]>
Date:   2015-03-04T14:34:12Z

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

commit 870acd488d2894e7c185ab75aa136eba7e77c8ef
Author: Shivaram Venkataraman <[email protected]>
Date:   2015-03-04T16:52:20Z

    Use rc2 explicitly

commit 198c130fcc27e48f9618bccf96524db81d9687e6
Author: Shivaram Venkataraman <[email protected]>
Date:   2015-03-04T17:42:44Z

    Merge pull request #200 from shivaram/sparkr-sql-build
    
    Revert SparkR snapshot dependency

commit 6a1fe645adc0a15f708a652118138f7fac1ec96d
Author: Shivaram Venkataraman <[email protected]>
Date:   2015-03-04T17:43:27Z

    Merge pull request #198 from cafreeman/sparkr-sql
    
    `selectExpr`

commit 20242c4d1e13313d5a62f14617a75009fe787cf9
Author: cafreeman <[email protected]>
Date:   2015-03-04T19:36:16Z

    clean up docs

commit 0ac4abc5a58bd7c0cc06eaccc741124055f56b46
Author: cafreeman <[email protected]>
Date:   2015-03-04T19:36:37Z

    'explain`

commit 68b11cf53723188b1c93c084119c44b7b92f0340
Author: cafreeman <[email protected]>
Date:   2015-03-04T19:37:02Z

    `toJSON`

commit 779c1020b2a35d123212808d156381751a857be7
Author: cafreeman <[email protected]>
Date:   2015-03-04T19:38:43Z

    `isLocal`

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to