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.

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

Merge cascading3 to develop #1586

Open
wants to merge 105 commits into
base: develop
Choose a base branch
from
Open

Merge cascading3 to develop #1586

wants to merge 105 commits into from

Conversation

rubanm
Copy link
Contributor

@rubanm rubanm commented Aug 10, 2016

This is a single merge consisting of the piecemeal changes listed in #1465

For testing, I've published 0.16.1-cascading3-RC2 to sonatype.

@johnynek @ianoc would be great if this can be integrated/tested at Stripe before we merge to develop. Thanks!

Note that this does not include the HashJoin DistCacheTap change from #1585, which can be treated as an add-on change and merged subsequently. We do not have any pre-existing usage outside of Twitter afaik (the corresponding 2.5 fix was made in Twitter's Cascading fork).

cc @piyushnarang @isnotinvain

Joe Nievelt and others added 30 commits May 14, 2015 13:18
Conflicts:
	CHANGES.md
	README.md
	project/Build.scala
	scalding-core/src/main/scala/com/twitter/package.scala
	tutorial/execution-tutorial/ExecutionTutorial.scala
	version.sbt
…r internally. This will be updated as part of the eventual merge to develop.
…ojects

[cascading3] Move parquet cascading schemes to subprojects
Hadoop's -libjars doesn't support wildcards, with large class paths its easy to exhaust the max arg length for linux/os x when running commands. This acts as a filter above our interaction with the generic options parser to expand wildcards
@CLAassistant
Copy link

CLAassistant commented Jan 25, 2018

CLA assistant check
All committers have signed the CLA.

@rubanm
Copy link
Contributor Author

rubanm commented Jan 25, 2018

Just signed it. Glad to see this being merged!

@johnynek
Copy link
Collaborator

Just FYI others, you don't need to sign this if you were a twitter employee when you did the work (which I think is true).

@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
package com.twitter.scalding.parquet.scrooge;
package com.twitter.scalding.parquet.cascading.scrooge;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@piyushnarang looks like the package name does not match the file name. not scrooge/cascading, but we have cascading.scrooge.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can push a follow up fix for this tomorrow.

piyushnarang and others added 3 commits January 26, 2018 17:02
Update packages in scalding-parquet-scrooge cascading to match files
* Remove a quadradic function in our cascading3 support

* fix a bug
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants