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

refactored ReferenceFile to require SequenceDictionary #1086

Closed
wants to merge 1 commit into from

Conversation

akmorrow13
Copy link
Contributor

  • NucleotideContigFragmentRDD now extends ReferenceFile
  • ReferenceFile requires Sequence Dictionary

@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/1354/

Build result: FAILURE

GitHub pull request #1086 of commit 2f065ff 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 > /home/jenkins/git2/bin/git rev-parse --is-inside-work-tree # timeout=10Fetching changes from the remote Git repository > /home/jenkins/git2/bin/git config remote.origin.url https://github.com/bigdatagenomics/adam.git # timeout=10Fetching upstream changes from https://github.com/bigdatagenomics/adam.git > /home/jenkins/git2/bin/git --version # timeout=10 > /home/jenkins/git2/bin/git -c core.askpass=true fetch --tags --progress https://github.com/bigdatagenomics/adam.git +refs/pull/:refs/remotes/origin/pr/ # timeout=15 > /home/jenkins/git2/bin/git rev-parse origin/pr/1086/merge^{commit} # timeout=10 > /home/jenkins/git2/bin/git branch -a --contains 53fefde # timeout=10 > /home/jenkins/git2/bin/git rev-parse remotes/origin/pr/1086/merge^{commit} # timeout=10Checking out Revision 53fefde (origin/pr/1086/merge) > /home/jenkins/git2/bin/git config core.sparsecheckout # timeout=10 > /home/jenkins/git2/bin/git checkout -f 53fefde4c3a8171af3150fe52313af2f29a38f52First time build. Skipping changelog.Triggering ADAM-prb ? 2.6.0,2.11,1.5.2,centosTriggering ADAM-prb ? 2.6.0,2.10,1.5.2,centosTouchstone configurations resulted in FAILURE, so aborting...Notifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'
Test FAILed.

@akmorrow13
Copy link
Contributor Author

This is erroring out in 1.5.2 for files I did not modify.
For example: [ERROR] Error formatting /home/jenkins/workspace/ADAM-prb/HADOOP_VERSION/2.6.0/SCALAVER/2.10/SPARK_VERSION/1.5.2/label/centos/adam-cli/src/main/scala/org/bdgenomics/adam/cli/PrintADAM.scala: java.nio.charset.MalformedInputException: Input length = 1

@fnothaft
Copy link
Member

That error is fine. Keep reading down the log ;):

Please run './scripts/format-source'

@heuermh
Copy link
Member

heuermh commented Jul 19, 2016

Maven builds from the command line do that for you. Give up your IDE! 😄

@@ -169,7 +170,7 @@ case class NucleotideContigFragmentRDD(
* @param region Reference region over which to get sequence.
* @return String of bases corresponding to reference sequence.
*/
def getReferenceString(region: ReferenceRegion): String = {
def extract(region: ReferenceRegion): String = {
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't this read so much better if this class was a SequenceRDD (or SliceRDD, depending on how the data were loaded) and this method was

def slice(region: ReferenceRegion): Slice = { ... }

See bigdatagenomics/bdg-formats#83

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So you would like ReferenceFile to change its interface to be slice instead of extract?

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 it's fine for now, with an eye to refactor if/when the Slice stuff is added, between versions 0.20 and 0.21 presumably

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can definitely change it. I just am wondering if slice is generic enough for the 2bitFile, because this extends ReferenceFile as well.

Copy link
Member

Choose a reason for hiding this comment

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

extract is fine with me

@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/1360/
Test PASSed.

@akmorrow13
Copy link
Contributor Author

+1?

import org.bdgenomics.formats.avro.NucleotideContigFragment

case class ReferenceContigMap(contigMap: Map[String, Seq[NucleotideContigFragment]]) extends ReferenceFile {

/**
* Sequence dictionary extracted from contigMap
Copy link
Member

Choose a reason for hiding this comment

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

doc strings should be complete sentences

@heuermh
Copy link
Member

heuermh commented Jul 29, 2016

Added some minor doc-related review comments.

@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/1363/

Build result: FAILURE

[...truncated 24 lines...]Triggering ADAM-prb ? 2.3.0,2.10,1.4.1,centosTriggering ADAM-prb ? 2.3.0,2.10,1.5.2,centosTriggering ADAM-prb ? 2.6.0,2.11,1.4.1,centosTriggering ADAM-prb ? 2.6.0,2.10,1.3.1,centosTriggering ADAM-prb ? 2.6.0,2.11,1.3.1,centosTriggering ADAM-prb ? 2.3.0,2.11,1.5.2,centosTriggering ADAM-prb ? 2.6.0,2.11,1.6.1,centosTriggering ADAM-prb ? 2.3.0,2.11,1.4.1,centosTriggering ADAM-prb ? 2.3.0,2.11,1.6.1,centosADAM-prb ? 2.3.0,2.10,1.6.1,centos completed with result FAILUREADAM-prb ? 2.6.0,2.10,1.6.1,centos completed with result SUCCESSADAM-prb ? 2.6.0,2.10,1.4.1,centos completed with result SUCCESSADAM-prb ? 2.3.0,2.11,1.3.1,centos completed with result SUCCESSADAM-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.10,1.5.2,centos completed with result SUCCESSADAM-prb ? 2.6.0,2.11,1.4.1,centos completed with result SUCCESSADAM-prb ? 2.6.0,2.10,1.3.1,centos completed with result SUCCESSADAM-prb ? 2.6.0,2.11,1.3.1,centos completed with result SUCCESSADAM-prb ? 2.3.0,2.11,1.5.2,centos completed with result SUCCESSADAM-prb ? 2.6.0,2.11,1.6.1,centos completed with result SUCCESSADAM-prb ? 2.3.0,2.11,1.4.1,centos completed with result SUCCESSADAM-prb ? 2.3.0,2.11,1.6.1,centos completed with result SUCCESSNotifying endpoint 'HTTP:https://webhooks.gitter.im/e/ac8bb6e9f53357bc8aa8'
Test FAILed.

@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/1364/
Test PASSed.

@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/1365/
Test PASSed.

@akmorrow13
Copy link
Contributor Author

I fixed all the comments @heuermh

@akmorrow13
Copy link
Contributor Author

bump @heuermh or @fnothaft

@heuermh
Copy link
Member

heuermh commented Aug 2, 2016

LGTM

@jpdna
Copy link
Member

jpdna commented Aug 4, 2016

+1

@fnothaft
Copy link
Member

fnothaft commented Aug 4, 2016

So NucleotideContigFragmentRDD is not going to be usable as a ReferenceFile from inside an RDD. Is this OK? Because of such, I'm -0.9 on this PR, unless I misunderstand the use case for this PR.

@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/1369/
Test PASSed.

@fnothaft
Copy link
Member

fnothaft commented Aug 5, 2016

Thanks for updating this PR with the documentation fixes we discussed, @akmorrow13. I'm retracting my -0.9 and have just merged this as e7e1adf. Thank you!

@fnothaft fnothaft closed this Aug 5, 2016
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.

5 participants