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

[ADAM-848] TwoBitFile now support nBlocks and maskBlocks #850

Merged
merged 1 commit into from
Oct 6, 2015

Conversation

laserson
Copy link
Contributor

@laserson laserson commented Oct 6, 2015

Fixes #848.

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/964/
Test PASSed.

@@ -165,7 +165,7 @@ object BroadcastRegionJoin extends RegionJoin {
*
* @param regions The input-set of regions.
*/
private[rdd] class NonoverlappingRegions(regions: Iterable[ReferenceRegion]) extends Serializable {
Copy link
Member

Choose a reason for hiding this comment

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

Why are we making these public? IMO, they should stay package private or move to the org.bdgenomics.adam.models package.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, couldn't decide what to do with this. models doesn't exactly seem like the right place for it IMO either, since it's used more like a utility for things. What about org.bdgenomics.adam.util?

Copy link
Member

Choose a reason for hiding this comment

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

I mean, it is a model, right? Mostly just a container with an invariant (regions shouldn't overlap).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

lol, true. k, I'll move it there...

@fnothaft fnothaft added this to the 0.18.0 milestone Oct 6, 2015
@fnothaft
Copy link
Member

fnothaft commented Oct 6, 2015

Other than nits around packaging, LGTM!

@laserson
Copy link
Contributor Author

laserson commented Oct 6, 2015

Ok, ready for squash and merge if you are.

@laserson
Copy link
Contributor Author

laserson commented Oct 6, 2015

(and rebase)

@fnothaft
Copy link
Member

fnothaft commented Oct 6, 2015

That sounds good! Can you squash and rebase and I will merge?

@@ -0,0 +1,194 @@
package org.bdgenomics.adam.models
Copy link
Member

Choose a reason for hiding this comment

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

Also, add the license header. (You can do this with ./scripts/format-source).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My favorite script :) Haven't run that guy in a while

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/973/
Test PASSed.

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/974/

Build result: FAILURE

GitHub pull request #850 of commit bada988.Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'[EnvInject] - Loading node environment variables.Building remotely on amp-jenkins-worker-05 (centos spark-test) in workspace /home/jenkins/workspace/ADAM-prb > git rev-parse --is-inside-work-tree # timeout=10Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/bigdatagenomics/adam.git # timeout=10Fetching upstream changes from https://github.com/bigdatagenomics/adam.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/bigdatagenomics/adam.git +refs/pull/:refs/remotes/origin/pr/ > git rev-parse bada988^{commit} # timeout=10 > git branch -a --contains bada988 # timeout=10Checking out Revision bada988 () > git config core.sparsecheckout # timeout=10 > git checkout -f bada9887a500190cce8a38cf4fb1499263ccaf23First time build. Skipping changelog.Triggering ADAM-prb ? 2.6.0,2.11,1.4.1,centosTriggering ADAM-prb ? 2.6.0,2.10,1.4.1,centosTouchstone configurations resulted in FAILURE, so aborting...Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'
Test FAILed.

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/975/

Build result: FAILURE

GitHub pull request #850 of commit 3be2dcf.Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'[EnvInject] - Loading node environment variables.Building remotely on amp-jenkins-worker-05 (centos spark-test) in workspace /home/jenkins/workspace/ADAM-prb > git rev-parse --is-inside-work-tree # timeout=10Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/bigdatagenomics/adam.git # timeout=10Fetching upstream changes from https://github.com/bigdatagenomics/adam.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/bigdatagenomics/adam.git +refs/pull/:refs/remotes/origin/pr/ > git rev-parse 3be2dcf^{commit} # timeout=10 > git branch -a --contains 3be2dcf # timeout=10Checking out Revision 3be2dcf () > git config core.sparsecheckout # timeout=10 > git checkout -f 3be2dcfd349f1f5bead880f30e09e18ddcf88793First time build. Skipping changelog.Triggering ADAM-prb ? 2.6.0,2.11,1.4.1,centosTriggering ADAM-prb ? 2.6.0,2.10,1.4.1,centosTouchstone configurations resulted in FAILURE, so aborting...Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'
Test FAILed.

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/976/

Build result: FAILURE

GitHub pull request #850 of commit 1f23804.Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'[EnvInject] - Loading node environment variables.Building remotely on amp-jenkins-worker-05 (centos spark-test) in workspace /home/jenkins/workspace/ADAM-prb > git rev-parse --is-inside-work-tree # timeout=10Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/bigdatagenomics/adam.git # timeout=10Fetching upstream changes from https://github.com/bigdatagenomics/adam.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/bigdatagenomics/adam.git +refs/pull/:refs/remotes/origin/pr/ > git rev-parse 1f23804^{commit} # timeout=10 > git branch -a --contains 1f23804 # timeout=10 > git rev-parse remotes/origin/pr/850/head^{commit} # timeout=10Checking out Revision 1f23804 (origin/pr/850/head) > git config core.sparsecheckout # timeout=10 > git checkout -f 1f23804 > git rev-list 877caa3 # timeout=10Triggering ADAM-prb ? 2.6.0,2.11,1.4.1,centosTriggering ADAM-prb ? 2.6.0,2.10,1.4.1,centosTouchstone configurations resulted in FAILURE, so aborting...Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'
Test FAILed.

@laserson laserson force-pushed the twobit branch 2 times, most recently from 1165c0f to 848f24b Compare October 6, 2015 22:08
@laserson
Copy link
Contributor Author

laserson commented Oct 6, 2015

Jenkins, retest this please

@laserson
Copy link
Contributor Author

laserson commented Oct 6, 2015

We should be good to go on this one.

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/977/
Test FAILed.

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/978/

Build result: FAILURE

GitHub pull request #850 of commit 848f24b automatically merged.Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'[EnvInject] - Loading node environment variables.Building remotely on amp-jenkins-worker-05 (centos spark-test) in workspace /home/jenkins/workspace/ADAM-prb > git rev-parse --is-inside-work-tree # timeout=10Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/bigdatagenomics/adam.git # timeout=10Fetching upstream changes from https://github.com/bigdatagenomics/adam.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/bigdatagenomics/adam.git +refs/pull/:refs/remotes/origin/pr/ > git rev-parse origin/pr/850/merge^{commit} # timeout=10 > git branch -a --contains 34ee141140505b0d37847d1164a15486bece51ce # timeout=10 > git rev-parse remotes/origin/pr/850/merge^{commit} # timeout=10Checking out Revision 34ee141140505b0d37847d1164a15486bece51ce (origin/pr/850/merge) > git config core.sparsecheckout # timeout=10 > git checkout -f 34ee141140505b0d37847d1164a15486bece51ceFirst time build. Skipping changelog.Triggering ADAM-prb ? 2.6.0,2.11,1.4.1,centosTriggering ADAM-prb ? 2.6.0,2.10,1.4.1,centosTouchstone configurations resulted in FAILURE, so aborting...Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'
Test FAILed.

@laserson
Copy link
Contributor Author

laserson commented Oct 6, 2015

Jenkins, retest this please

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/979/

Build result: FAILURE

[...truncated 16 lines...] > git rev-list 34ee141140505b0d37847d1164a15486bece51ce # timeout=10Triggering ADAM-prb ? 2.6.0,2.11,1.4.1,centosTriggering ADAM-prb ? 2.6.0,2.10,1.4.1,centosTriggering ADAM-prb ? 2.3.0,2.11,1.2.1,centosTriggering ADAM-prb ? 2.6.0,2.10,1.3.1,centosTriggering ADAM-prb ? 1.0.4,2.10,1.2.1,centosTriggering ADAM-prb ? 2.3.0,2.11,1.3.1,centosTriggering ADAM-prb ? 2.3.0,2.10,1.2.1,centosTriggering ADAM-prb ? 2.6.0,2.11,1.3.1,centosTriggering ADAM-prb ? 1.0.4,2.11,1.2.1,centosTriggering ADAM-prb ? 2.3.0,2.10,1.3.1,centosTriggering ADAM-prb ? 2.3.0,2.10,1.4.1,centosTriggering ADAM-prb ? 2.3.0,2.11,1.4.1,centosADAM-prb ? 2.3.0,2.11,1.2.1,centos completed with result FAILUREADAM-prb ? 2.6.0,2.10,1.3.1,centos completed with result SUCCESSADAM-prb ? 1.0.4,2.10,1.2.1,centos completed with result FAILUREADAM-prb ? 2.3.0,2.11,1.3.1,centos completed with result SUCCESSADAM-prb ? 2.3.0,2.10,1.2.1,centos completed with result FAILUREADAM-prb ? 2.6.0,2.11,1.3.1,centos completed with result SUCCESSADAM-prb ? 1.0.4,2.11,1.2.1,centos completed with result FAILUREADAM-prb ? 2.3.0,2.10,1.3.1,centos completed with result SUCCESSADAM-prb ? 2.3.0,2.10,1.4.1,centos completed with result SUCCESSADAM-prb ? 2.3.0,2.11,1.4.1,centos completed with result SUCCESSNotifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'
Test FAILed.

@laserson
Copy link
Contributor Author

laserson commented Oct 6, 2015

Jenkins, retest this please

1 similar comment
@laserson
Copy link
Contributor Author

laserson commented Oct 6, 2015

Jenkins, retest this please

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/980/

Build result: FAILURE

GitHub pull request #850 of commit c6c9919 automatically merged.Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'[EnvInject] - Loading node environment variables.Building remotely on amp-jenkins-worker-05 (centos spark-test) in workspace /home/jenkins/workspace/ADAM-prb > git rev-parse --is-inside-work-tree # timeout=10Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/bigdatagenomics/adam.git # timeout=10Fetching upstream changes from https://github.com/bigdatagenomics/adam.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/bigdatagenomics/adam.git +refs/pull/:refs/remotes/origin/pr/ > git rev-parse origin/pr/850/merge^{commit} # timeout=10 > git branch -a --contains 71d4c282501eaf9ce360a3820e8278d30233b5f1 # timeout=10 > git rev-parse remotes/origin/pr/850/merge^{commit} # timeout=10Checking out Revision 71d4c282501eaf9ce360a3820e8278d30233b5f1 (origin/pr/850/merge) > git config core.sparsecheckout # timeout=10 > git checkout -f 71d4c282501eaf9ce360a3820e8278d30233b5f1 > git rev-list 34ee141140505b0d37847d1164a15486bece51ce # timeout=10Triggering ADAM-prb ? 2.6.0,2.11,1.4.1,centosTriggering ADAM-prb ? 2.6.0,2.10,1.4.1,centosTouchstone configurations resulted in FAILURE, so aborting...Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'
Test FAILed.

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/981/

Build result: FAILURE

GitHub pull request #850 of commit c6c9919 automatically merged.Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'[EnvInject] - Loading node environment variables.Building remotely on amp-jenkins-worker-05 (centos spark-test) in workspace /home/jenkins/workspace/ADAM-prb > git rev-parse --is-inside-work-tree # timeout=10Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/bigdatagenomics/adam.git # timeout=10Fetching upstream changes from https://github.com/bigdatagenomics/adam.git > git --version # timeout=10 > git fetch --tags --progress https://github.com/bigdatagenomics/adam.git +refs/pull/:refs/remotes/origin/pr/ > git rev-parse origin/pr/850/merge^{commit} # timeout=10 > git branch -a --contains 71d4c282501eaf9ce360a3820e8278d30233b5f1 # timeout=10 > git rev-parse remotes/origin/pr/850/merge^{commit} # timeout=10Checking out Revision 71d4c282501eaf9ce360a3820e8278d30233b5f1 (origin/pr/850/merge) > git config core.sparsecheckout # timeout=10 > git checkout -f 71d4c282501eaf9ce360a3820e8278d30233b5f1 > git rev-list 71d4c282501eaf9ce360a3820e8278d30233b5f1 # timeout=10Triggering ADAM-prb ? 2.6.0,2.11,1.4.1,centosTriggering ADAM-prb ? 2.6.0,2.10,1.4.1,centosTouchstone configurations resulted in FAILURE, so aborting...Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'
Test FAILed.

@laserson
Copy link
Contributor Author

laserson commented Oct 6, 2015

Jenkins, retest this please

@laserson
Copy link
Contributor Author

laserson commented Oct 6, 2015

(it's hard to stay this polite to Jenkins)

@AmplabJenkins
Copy link

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/982/
Test PASSed.

@laserson
Copy link
Contributor Author

laserson commented Oct 6, 2015

Hallelujah, @fnothaft, think we're good to go.

@fnothaft fnothaft merged commit 09f01b3 into bigdatagenomics:master Oct 6, 2015
@fnothaft
Copy link
Member

fnothaft commented Oct 6, 2015

Thank you @laserson! I've just merged.

@AmplabJenkins
Copy link

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/983/
Test FAILed.

@laserson laserson deleted the twobit branch October 7, 2015 00:07
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