[ARVADOS] updated: 12afe0eb0da3dfd2c4a136478628ec5726016596

[git at public.curoverse.com]

Summary of changes:
 docker/base/Dockerfile                             |  2 +-
 sdk/cli/bin/crunch-job                             | 21 ++++++------
 .../api/app/controllers/application_controller.rb  | 13 +++++---
 services/api/app/models/collection.rb              |  3 +-
 services/api/config/application.default.yml        | 28 +++++++++-------
 .../arvados/v1/collections_controller_test.rb      | 38 ++++++++++++++++++----
 6 files changed, 71 insertions(+), 34 deletions(-)

       via  12afe0eb0da3dfd2c4a136478628ec5726016596 (commit)
       via  c8a274ec5aaca4e039accd23f9920bbb232470c8 (commit)
       via  511daa2d275143d89600f015ee0bb19dcbe5641c (commit)
       via  b33597e94eec5f21fbbcfa72611a3b36397755d5 (commit)
       via  869f3f0ad541c85bfb72060b1018905d3f882292 (commit)
       via  a12cf91db3ececed782d9718af30553f8866ad81 (commit)
       via  602706ef5510b3f07fc5fa988019952d2133320c (commit)
       via  39a1340d56f7acbddb771f6bef36b68ee9076885 (commit)
       via  22c8b6367a9cd79b17240b7dca1ac8f7d8e7ee77 (commit)
       via  de8324b3fbbf3f67f0f61c162f5895e8dcd3142d (commit)
       via  69f592e029493afb8a0709811b5be1fefabafb4b (commit)
      from  b39d4108e3a78f3bfebc4cf934bfc202eb1f2cf0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 12afe0eb0da3dfd2c4a136478628ec5726016596
Author: radhika <radhika at curoverse.com>
Date:   Sat Jun 6 19:36:13 2015 -0400

    6203: Benchmarking revealed that regexp.match(string) is 2.5x more expensive than string =~ regexp. Updated check_signatures method accordingly.

diff --git a/services/api/app/models/collection.rb b/services/api/app/models/collection.rb
index 422a7ed..d4291b2 100644
--- a/services/api/app/models/collection.rb
+++ b/services/api/app/models/collection.rb
@@ -42,6 +42,7 @@ class Collection < ArvadosModel
                 )
   end
 
+  FILE_TOKEN = /^[[:digit:]]+:[[:digit:]]+:/
   def check_signatures
     return false if self.manifest_text.nil?
 
@@ -66,7 +67,7 @@ class Collection < ArvadosModel
       }
       self.manifest_text.lines.each do |entry|
         entry.split[1..-1].each do |tok|
-          if /^[[:digit:]]+:[[:digit:]]+:/.match tok
+          if tok =~ FILE_TOKEN
             # This is a filename token, not a blob locator. Note that we
             # keep checking tokens after this, even though manifest
             # format dictates that all subsequent tokens will also be

commit c8a274ec5aaca4e039accd23f9920bbb232470c8
Merge: b39d410 511daa2
Author: radhika <radhika at curoverse.com>
Date:   Sat Jun 6 18:59:33 2015 -0400

    Merge branch 'master' into 6203-collection-perf-api


-----------------------------------------------------------------------


hooks/post-receive
--