Skip to content

Commit

Permalink
Optimized workflow invocation step update.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmchilton committed Sep 27, 2016
1 parent 780473a commit 9eba273
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
10 changes: 10 additions & 0 deletions lib/galaxy/model/mapping.py
Expand Up @@ -2530,6 +2530,16 @@ def db_next_hid( self, n=1 ):
model.History._next_hid = db_next_hid


def _workflow_invocation_update( self ):
conn = object_session( self ).connection()
table = self.table
now_val = now()
stmt = table.update().values(update_time=now_val).where(and_(table.c.id == self.id, table.c.update_time < now_val))
conn.execute(stmt)

model.WorkflowInvocation.update = _workflow_invocation_update


def init( file_path, url, engine_options={}, create_tables=False, map_install_models=False,
database_query_profiling_proxy=False, object_store=None, trace_logger=None, use_pbkdf2=True ):
"""Connect mappings to the database"""
Expand Down
20 changes: 19 additions & 1 deletion test/unit/test_galaxy_mapping.py
@@ -1,9 +1,18 @@
# -*- coding: utf-8 -*-
import time
import unittest
import galaxy.model.mapping as mapping
import uuid

from six import text_type

import galaxy.datatypes
import galaxy.model
import galaxy.model.mapping as mapping

datatypes_registry = galaxy.datatypes.registry.Registry()
datatypes_registry.load_datatypes()
galaxy.model.set_datatypes_registry(datatypes_registry)


class MappingTests( unittest.TestCase ):

Expand Down Expand Up @@ -450,6 +459,15 @@ def workflow_from_steps(steps):

assert subworkflow_invocation_assoc.subworkflow_invocation.history.id == history_id

u1 = loaded_invocation.update_time
time.sleep(1)
loaded_invocation.steps[0].update()
self.expunge()
loaded_invocation = self.query( model.WorkflowInvocation ).get( workflow_invocation.id )
u2 = loaded_invocation.update_time

assert u1 != u2

def new_hda( self, history, **kwds ):
return history.add_dataset( self.model.HistoryDatasetAssociation( create_dataset=True, sa_session=self.model.session, **kwds ) )

Expand Down

0 comments on commit 9eba273

Please sign in to comment.