Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
ensembl-hive
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
7
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ensembl-gh-mirror
ensembl-hive
Commits
b54fda77
Commit
b54fda77
authored
12 years ago
by
Leo Gordon
Browse files
Options
Downloads
Patches
Plain Diff
renamed -input_job_id to -prev_job_id to be in sync with other names
parent
159e56ae
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/Bio/EnsEMBL/Hive/DBSQL/AnalysisJobAdaptor.pm
+5
-6
5 additions, 6 deletions
modules/Bio/EnsEMBL/Hive/DBSQL/AnalysisJobAdaptor.pm
modules/Bio/EnsEMBL/Hive/PipeConfig/HiveGeneric_conf.pm
+1
-1
1 addition, 1 deletion
modules/Bio/EnsEMBL/Hive/PipeConfig/HiveGeneric_conf.pm
with
6 additions
and
7 deletions
modules/Bio/EnsEMBL/Hive/DBSQL/AnalysisJobAdaptor.pm
+
5
−
6
View file @
b54fda77
...
...
@@ -57,10 +57,9 @@ use base ('Bio::EnsEMBL::DBSQL::BaseAdaptor');
=head2 CreateNewJob
Args : -input_id => string of input_id which will be passed to run the job (or a Perl hash that will be automagically stringified)
-analysis => Bio::EnsEMBL::Hive::Analysis object from a database
-block => int(0,1) set blocking state of job (default = 0)
-input_job_id => (optional) job_id of job that is creating this
job. Used purely for book keeping.
-analysis => Bio::EnsEMBL::Hive::Analysis object stored in the database
-prev_job_id => (optional) job_id of job that is creating this job.
Used purely for book keeping.
Example : $job_id = Bio::EnsEMBL::Hive::DBSQL::AnalysisJobAdaptor->CreateNewJob(
-input_id => 'my input data',
-analysis => $myAnalysis);
...
...
@@ -80,7 +79,7 @@ sub CreateNewJob {
my
(
$class
,
@args
)
=
@_
;
my
(
$input_id
,
$analysis
,
$prev_job
,
$prev_job_id
,
$semaphore_count
,
$semaphored_job_id
,
$push_new_semaphore
)
=
rearrange
([
qw(input_id analysis prev_job
input
_job_id semaphore_count semaphored_job_id push_new_semaphore)
],
@args
);
rearrange
([
qw(input_id analysis prev_job
prev
_job_id semaphore_count semaphored_job_id push_new_semaphore)
],
@args
);
throw
("
must define input_id
")
unless
(
$input_id
);
throw
("
must define analysis
")
unless
(
$analysis
);
...
...
@@ -88,7 +87,7 @@ sub CreateNewJob {
unless
(
$analysis
->
isa
('
Bio::EnsEMBL::Hive::Analysis
'));
throw
("
analysis must have adaptor connected to database
")
unless
(
$analysis
->
adaptor
and
$analysis
->
adaptor
->
db
);
throw
("
Please specify prev_job object instead of
input
_job_id if available
")
if
(
$prev_job_id
);
# 'obsolete' message
throw
("
Please specify prev_job object instead of
prev
_job_id if available
")
if
(
$prev_job_id
);
# 'obsolete' message
$prev_job_id
=
$prev_job
&&
$prev_job
->
dbID
();
...
...
This diff is collapsed.
Click to expand it.
modules/Bio/EnsEMBL/Hive/PipeConfig/HiveGeneric_conf.pm
+
1
−
1
View file @
b54fda77
...
...
@@ -442,7 +442,7 @@ sub run {
Bio::EnsEMBL::Hive::DBSQL::
AnalysisJobAdaptor
->
CreateNewJob
(
-
input_id
=>
$input_id_hash
,
# input_ids are now centrally stringified in the AnalysisJobAdaptor
-
analysis
=>
$analysis
,
-
input
_job_id
=>
undef
,
# these jobs are created by the initialization script, not by another job
-
prev
_job_id
=>
undef
,
# these jobs are created by the initialization script, not by another job
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment