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

Small bugfixes and cleanups to BQSR #38

Merged
merged 5 commits into from
Jan 11, 2014
Merged

Conversation

jey
Copy link
Contributor

@jey jey commented Dec 20, 2013

This fixes crashes when a contig is not present in the dbSNP and cleans up some of the dbSNP and BQSR code.

@AmplabJenkins
Copy link

Can one of the admins verify this patch?

@massie
Copy link
Member

massie commented Dec 21, 2013

Jey, can you rebase this on 'master' please? You'll need to drop this change into the 'adam-core' module instead of the 'adam-commands' module.

@massie
Copy link
Member

massie commented Dec 21, 2013

Jenkins, add to whitelist.

@AmplabJenkins
Copy link

Build triggered.

@AmplabJenkins
Copy link

Build started.

@AmplabJenkins
Copy link

Build finished.

@AmplabJenkins
Copy link

All automated tests passed.
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/ADAM/139/

@AmplabJenkins
Copy link

Build triggered.

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

@jey
Copy link
Contributor Author

jey commented Jan 10, 2014

ERROR: Couldn't find any revision to build. Verify the repository and branch configuration for this job.

Looks like the pull request builder is having problems?

@massie
Copy link
Member

massie commented Jan 10, 2014

Jenkins, test this please.

@AmplabJenkins
Copy link

All automated tests passed.
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/20/

@@ -48,6 +51,7 @@ object AdamMain {
}

def main(args: Array[String]) {
log.info("ADAM starting")
Copy link
Member

Choose a reason for hiding this comment

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

If the args are not correct, this will print "ADAM starting" and then printCommands correct?

I would recommend we drop this info message or move it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The intention of this log message is to add a delimiter to the adam.log file to mark separate runs. (The default behavior for the adam.log file is to append, so that we don't destroy any old log data.) I'm definitely open to other ways to accomplish this, but I do think it's useful to have some kind of a delimiter printed to the log file as the very first thing so that we can tell separate runs of ADAM apart.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How about if we move it to the else branch at line 57 where printCommands() won't be called?

Copy link
Member

Choose a reason for hiding this comment

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

Makes sense.

How about adding the args to the message too to help with debugging then, e.g

"ADAM running with args=%s".format(args.mkString(" ")) or something like that.

Moving it to the else branch makes sense. We want to output help text when there are no args given and it would be confusing to say that ADAM is starting just before dumping help text.

@AmplabJenkins
Copy link

All automated tests passed.
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/22/

// suitable for copying and pasting back into the shell.
private def argsToString(args: Array[String]): String = {
def escapeArg(s: String) = "\"" + s.replaceAll("\\\"", "\\\\\"") + "\""
args.map(escapeArg(_)).mkString(" ")
Copy link
Member

Choose a reason for hiding this comment

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

The (_) isn't necessary here.

@massie
Copy link
Member

massie commented Jan 11, 2014

Aside from the small nits, this is ready to merge. Thanks for the much needed cleanup, Jey!

@AmplabJenkins
Copy link

All automated tests passed.
Refer to this link for build results: https://amplab.cs.berkeley.edu/jenkins/job/ADAM-prb/23/

massie added a commit that referenced this pull request Jan 11, 2014
Small bugfixes and cleanups to BQSR
@massie massie merged commit 9d90d1b into bigdatagenomics:master Jan 11, 2014
@massie
Copy link
Member

massie commented Jan 11, 2014

Thanks, Jey!

@jey jey deleted the bqsr branch February 4, 2014 00:43
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