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

Fix LzoTextLine as a TypedSource #921

Merged
merged 2 commits into from
Jun 30, 2014
Merged

Fix LzoTextLine as a TypedSource #921

merged 2 commits into from
Jun 30, 2014

Conversation

jcoveney
Copy link
Contributor

LzoTextLine didn't work properly as a TypedSource

@jcoveney
Copy link
Contributor Author

Am testing this internally at Twitter

@@ -180,15 +180,15 @@ class Job(val args: Args) extends FieldConversions with java.io.Serializable {

Config.overwrite(nonStrings,
defaultComparator.map(init.setDefaultComparator)
.getOrElse(init)
Copy link
Collaborator

Choose a reason for hiding this comment

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

how did this happen with the plugin?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Was wondering that myself. Maybe oscar's patch hadn't run scalariform? I don't think this is such a bad thing. Scalariform will carry us forward in an automated fashion. As long as the diffs aren't huge, shouldn't be a huge risk of merge conflicts.

@ianoc
Copy link
Collaborator

ianoc commented Jun 26, 2014

Can we add a test with the local/platform tests for this?

@jcoveney
Copy link
Contributor Author

Testing with Lzo is very tricky because of the env stuff...

@ianoc
Copy link
Collaborator

ianoc commented Jun 26, 2014

Ahh, fair enough. Once your happy with it via manual tests, and green will merge. LGTM

@johnynek
Copy link
Collaborator

If someone has tested this internally, I say merge.

johnynek added a commit that referenced this pull request Jun 30, 2014
Fix LzoTextLine as a TypedSource
@johnynek johnynek merged commit 525dad1 into develop Jun 30, 2014
@johnynek johnynek deleted the jco/textline branch June 30, 2014 19:40
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.

3 participants