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

New schema, variant context converter changes, and removal of old genoty... #97

Merged
merged 3 commits into from Feb 13, 2014
Merged

Conversation

nealsid
Copy link

@nealsid nealsid commented Feb 11, 2014

...pe converter code

@AmplabJenkins
Copy link

One or more automated tests failed
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/102/

@fnothaft
Copy link
Member

@nealsid

Do you want this merged into the topic branch, even with the failing tests?

@nealsid
Copy link
Author

nealsid commented Feb 11, 2014

Yes, I believe that was the direction we decided is best (see PR #87) given the total size of all the variant changes. Doing both tasks of splitting up the changes into manageable chunks and keeping the build green will be near impossible, I think.

@fnothaft
Copy link
Member

Ah! OK, got it now. To confirm my understanding then, you are splitting the original PR into several smaller chunks, all of which will roll in to the topic branch?

@nealsid
Copy link
Author

nealsid commented Feb 11, 2014

That's correct. Before the topic branch gets merged back into master, the build will be green and tests will all pass, of course.

@fnothaft
Copy link
Member

Sure, makes perfect sense now. However, from an organizational perspective, I think it should be possible to keep the tests green—I think this should be possible if all of the code you are replacing gets removed first, along with the tests that attach to this code. Throughout the set of PRs, you'll then get all the functionality replaced. Thoughts?

@fnothaft
Copy link
Member

That should also make the diffs a bit more straightforward.

@nealsid
Copy link
Author

nealsid commented Feb 11, 2014

I would like to do this....BUT, I think this is why we switched to a topic branch to begin with. I'm actually not pulling code from all commits, or 1 squashed commit, but just the first of many. Keeping green would require digging through several commits, that sometimes spanned commits merged in from the Bigdatagenomics master.

@fnothaft
Copy link
Member

Sure, let's not worry about that for now. For future big changes though, that might be a good process to follow.

@@ -30,521 +31,61 @@ import fi.tkk.ics.hadoop.bam.VariantContextWritable
* If an annotation has a corresponding set of fields in the VCF standard, a conversion to/from the
* GATK VariantContext should be implemented in this class.
*/
class VariantContextConverter extends Serializable {
private[adam] class VariantContextConverter extends Serializable with Logging {
initLogging()
Copy link
Member

Choose a reason for hiding this comment

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

I think @jey did some cleaning a while back and identified that initLogging is superfluous.

@massie
Copy link
Member

massie commented Feb 12, 2014

The goal of this approach was to make it easier for @nealsid to share all his work in pieces. Let's not worry about green tests on a per-commit basis in this topic branch. We'll make sure that all tests pass (of course) before we merge the "vcf-work" branch to "master".

@fnothaft
Copy link
Member

@massie Sure, I understand that. My suggestion is for the next time we do a large feature on a new topic branch: we should start by deleting the code that will be replaced along with it's unit tests. Then, we won't struggle with diffs that have such massive amounts of deletions, and we'll be able to keep the unit tests green the whole route.

@massie
Copy link
Member

massie commented Feb 12, 2014

Make sense to me. If future work deletes and then recreates code, we'll make sure to teardown the code and tests first. Good suggestion, @fnothaft.

Keep the pull requests coming, @nealsid!

@AmplabJenkins
Copy link

One or more automated tests failed
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/103/

@AmplabJenkins
Copy link

One or more automated tests failed
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/106/

fnothaft added a commit that referenced this pull request Feb 13, 2014
New schema, variant context converter changes, and removal of old genoty...
@fnothaft fnothaft merged commit 36ab2a7 into bigdatagenomics:vcf-work Feb 13, 2014
@fnothaft
Copy link
Member

Merging to allow better review of #98

@nealsid nealsid deleted the vcf-work-schema branch February 20, 2014 15:52
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

5 participants