Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 8b121ae31ca94c1c2a2c59b7f77da9c8097d2fa0 https://github.com/galaxyproject/galaxy/commit/8b121ae31ca94c1c2a2c59b7f77da... Author: John Chilton jmchilton@gmail.com Date: 2016-03-21 (Mon, 21 Mar 2016)

Changed paths: M lib/galaxy/tools/parameters/output_collect.py

Log Message: ----------- Improve logging message in output_collect.

Conflicts: lib/galaxy/tools/parameters/output_collect.py

Commit: 7c31a792fcdda60128848a53e9f567a99edb5c4a https://github.com/galaxyproject/galaxy/commit/7c31a792fcdda60128848a53e9f56... Author: John Chilton jmchilton@gmail.com Date: 2016-03-21 (Mon, 21 Mar 2016)

Changed paths: M lib/galaxy/model/__init__.py

Log Message: ----------- Allow add_datasets to use optimized even if quota is used...

Commit: ac14ad0897d4abb7875ad16a49dda7b6a43e3c84 https://github.com/galaxyproject/galaxy/commit/ac14ad0897d4abb7875ad16a49dda... Author: John Chilton jmchilton@gmail.com Date: 2016-03-21 (Mon, 21 Mar 2016)

Changed paths: M lib/galaxy/security/__init__.py M lib/galaxy/tools/parameters/output_collect.py

Log Message: ----------- Optimization for discovering datasets for dynamic output collection.

Batch up job creation and adding datasets to the history in order to eliminate a bunch of database flushes.

Using the create_input_collection tool from PR #1958 to create an output collection with 100 elements - the optimization reduces the job finish time from 45 seconds to 15 seconds.

Before:

``` galaxy.jobs DEBUG 2016-03-21 01:51:01,377 job 24 ended (finish() executed in (15474.472 ms)) ```

After:

``` galaxy.jobs DEBUG 2016-03-21 01:50:06,659 job 23 ended (finish() executed in (46430.736 ms)) ```

Commit: 1543f0d925075ca1058e7bca48361a97be9bd557 https://github.com/galaxyproject/galaxy/commit/1543f0d925075ca1058e7bca48361... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-05 (Tue, 05 Apr 2016)

Changed paths: M lib/galaxy/model/__init__.py M lib/galaxy/security/__init__.py M lib/galaxy/tools/parameters/output_collect.py

Log Message: ----------- Merge pull request #1959 from jmchilton/optimize_dataset_collection_discovery

Optimization for discovering datasets for dynamic output collection.

Compare: https://github.com/galaxyproject/galaxy/compare/497cd024da56...1543f0d92507