[ARVADOS] updated: 49030c3161523bc427e0aaa9d3edb517fc4c296c

git at public.curoverse.com git at public.curoverse.com
Mon Jan 5 09:48:48 EST 2015


Summary of changes:
 apps/workbench/Gemfile                             |  15 +-
 .../app/assets/stylesheets/application.css.scss    |   5 +
 .../controllers/pipeline_instances_controller.rb   |  20 +-
 .../app/controllers/virtual_machines_controller.rb |   3 -
 .../helpers/api_client_authorizations_helper.rb    |   2 -
 .../app/helpers/authorized_keys_helper.rb          |   2 -
 apps/workbench/app/helpers/groups_helper.rb        |   2 -
 apps/workbench/app/helpers/humans_helper.rb        |   2 -
 apps/workbench/app/helpers/job_tasks_helper.rb     |   2 -
 apps/workbench/app/helpers/keep_disks_helper.rb    |   2 -
 apps/workbench/app/helpers/links_helper.rb         |   2 -
 apps/workbench/app/helpers/logs_helper.rb          |   2 -
 apps/workbench/app/helpers/nodes_helper.rb         |   2 -
 apps/workbench/app/helpers/projects_helper.rb      |   2 -
 apps/workbench/app/helpers/repositories_helper.rb  |   2 -
 apps/workbench/app/helpers/sessions_helper.rb      |   2 -
 apps/workbench/app/helpers/specimens_helper.rb     |   2 -
 apps/workbench/app/helpers/traits_helper.rb        |   2 -
 .../app/helpers/user_agreements_helper.rb          |   2 -
 apps/workbench/app/helpers/users_helper.rb         |   2 -
 apps/workbench/app/helpers/vcf_pipeline_helper.rb  | 234 ---------------------
 .../app/helpers/virtual_machines_helper.rb         |   2 -
 .../views/application/_projects_tree_menu.html.erb |  55 +++--
 .../app/views/authorized_keys/_show_help.html.erb  |  10 -
 apps/workbench/app/views/layouts/body.html.erb     |  11 +-
 .../test/controllers/search_controller_test.rb     |  41 +++-
 apps/workbench/test/diagnostics_test_helper.rb     |   7 +-
 apps/workbench/test/performance_test_helper.rb     |  16 +-
 apps/workbench/test/test_helper.rb                 |   4 +
 .../test/unit/api_client_authorization_test.rb     |   7 -
 apps/workbench/test/unit/authorized_key_test.rb    |   7 -
 apps/workbench/test/unit/human_test.rb             |   7 -
 apps/workbench/test/unit/job_task_test.rb          |   7 -
 apps/workbench/test/unit/keep_disk_test.rb         |   4 -
 apps/workbench/test/unit/log_test.rb               |   7 -
 apps/workbench/test/unit/node_test.rb              |   7 -
 apps/workbench/test/unit/pipeline_template_test.rb |   7 -
 apps/workbench/test/unit/repository_test.rb        |   7 -
 apps/workbench/test/unit/specimen_test.rb          |   7 -
 apps/workbench/test/unit/trait_test.rb             |   7 -
 apps/workbench/test/unit/user_agreement_test.rb    |   7 -
 apps/workbench/test/unit/virtual_machine_test.rb   |   7 -
 crunch_scripts/run-command                         |   6 +-
 doc/_includes/_0_filter_py.liquid                  |  29 ++-
 doc/_includes/_concurrent_hash_script_py.liquid    |  33 ++-
 doc/_includes/_run_md5sum_py.liquid                |   7 +-
 doc/_includes/_tutorial_hash_script_py.liquid      |  44 ++--
 .../tutorial-firstscript.html.textile.liquid       |  15 +-
 sdk/cli/test/test_arv-get.rb                       |   2 +
 sdk/go/keepclient/keepclient.go                    |  18 +-
 sdk/go/keepclient/keepclient_test.go               |  91 ++++----
 sdk/go/keepclient/support.go                       |  69 +++---
 sdk/python/.gitignore                              |   6 +-
 sdk/python/arvados/commands/ls.py                  |  52 +++++
 sdk/python/bin/arv-get                             |   2 +-
 sdk/python/bin/arv-ls                              |  23 +-
 sdk/python/setup.py                                |   2 +-
 sdk/python/tests/test_arv_ls.py                    |  80 +++++++
 services/api/app/models/node.rb                    |  18 +-
 .../20140422011506_pipeline_instance_state.rb      |   9 +-
 services/api/test/fixtures/groups.yml              |  12 ++
 services/api/test/unit/arvados_model_test.rb       |  53 ++---
 services/fuse/setup.py                             |   2 +-
 services/keepproxy/keepproxy.go                    |  42 +++-
 services/keepproxy/keepproxy_test.go               |  29 ++-
 services/keepstore/handler_test.go                 |  18 +-
 services/keepstore/handlers.go                     |   2 +-
 services/keepstore/logging_router.go               |  14 +-
 services/nodemanager/.gitignore                    |   6 +-
 services/nodemanager/arvnodeman/clientactor.py     |  13 +-
 .../arvnodeman/computenode/dispatch/__init__.py    |  52 +++--
 .../arvnodeman/computenode/driver/__init__.py      |  20 ++
 .../arvnodeman/computenode/driver/ec2.py           |  12 +-
 services/nodemanager/arvnodeman/config.py          |   2 -
 services/nodemanager/arvnodeman/daemon.py          |  12 +-
 services/nodemanager/arvnodeman/jobqueue.py        |  13 +-
 services/nodemanager/arvnodeman/launcher.py        |  21 +-
 services/nodemanager/arvnodeman/nodelist.py        |  10 +-
 services/nodemanager/setup.py                      |   2 +-
 .../nodemanager/tests/test_computenode_dispatch.py |  23 +-
 .../tests/test_computenode_driver_ec2.py           |  52 +++--
 services/nodemanager/tests/test_daemon.py          |  80 ++++---
 services/nodemanager/tests/test_jobqueue.py        |  22 +-
 83 files changed, 742 insertions(+), 819 deletions(-)
 delete mode 100644 apps/workbench/app/helpers/api_client_authorizations_helper.rb
 delete mode 100644 apps/workbench/app/helpers/authorized_keys_helper.rb
 delete mode 100644 apps/workbench/app/helpers/groups_helper.rb
 delete mode 100644 apps/workbench/app/helpers/humans_helper.rb
 delete mode 100644 apps/workbench/app/helpers/job_tasks_helper.rb
 delete mode 100644 apps/workbench/app/helpers/keep_disks_helper.rb
 delete mode 100644 apps/workbench/app/helpers/links_helper.rb
 delete mode 100644 apps/workbench/app/helpers/logs_helper.rb
 delete mode 100644 apps/workbench/app/helpers/nodes_helper.rb
 delete mode 100644 apps/workbench/app/helpers/projects_helper.rb
 delete mode 100644 apps/workbench/app/helpers/repositories_helper.rb
 delete mode 100644 apps/workbench/app/helpers/sessions_helper.rb
 delete mode 100644 apps/workbench/app/helpers/specimens_helper.rb
 delete mode 100644 apps/workbench/app/helpers/traits_helper.rb
 delete mode 100644 apps/workbench/app/helpers/user_agreements_helper.rb
 delete mode 100644 apps/workbench/app/helpers/users_helper.rb
 delete mode 100644 apps/workbench/app/helpers/vcf_pipeline_helper.rb
 delete mode 100644 apps/workbench/app/helpers/virtual_machines_helper.rb
 delete mode 100644 apps/workbench/app/views/authorized_keys/_show_help.html.erb
 delete mode 100644 apps/workbench/test/unit/api_client_authorization_test.rb
 delete mode 100644 apps/workbench/test/unit/authorized_key_test.rb
 delete mode 100644 apps/workbench/test/unit/human_test.rb
 delete mode 100644 apps/workbench/test/unit/job_task_test.rb
 delete mode 100644 apps/workbench/test/unit/keep_disk_test.rb
 delete mode 100644 apps/workbench/test/unit/log_test.rb
 delete mode 100644 apps/workbench/test/unit/node_test.rb
 delete mode 100644 apps/workbench/test/unit/pipeline_template_test.rb
 delete mode 100644 apps/workbench/test/unit/repository_test.rb
 delete mode 100644 apps/workbench/test/unit/specimen_test.rb
 delete mode 100644 apps/workbench/test/unit/trait_test.rb
 delete mode 100644 apps/workbench/test/unit/user_agreement_test.rb
 delete mode 100644 apps/workbench/test/unit/virtual_machine_test.rb
 create mode 100755 sdk/python/arvados/commands/ls.py
 create mode 100644 sdk/python/tests/test_arv_ls.py
 mode change 100644 => 120000 services/nodemanager/.gitignore

       via  49030c3161523bc427e0aaa9d3edb517fc4c296c (commit)
       via  c4e7c6d5a1a9604c1c1e53a5aa749eb1e45f92a1 (commit)
       via  49b58cc43218106f1633c389598894d59447a26b (commit)
       via  56ec5cfb4ee8c4d5a00bfd031e4c79c5e2263762 (commit)
       via  a1d0dc23b205d8593b31a4696260e5ef680ec72c (commit)
       via  e3087e7d734515124df0aef78389d9981264b5db (commit)
       via  c7112a98dca78b2e3cc892e0c5f0f02071ac6e50 (commit)
       via  b06785a74d28149b92f289d56fa55914375ddfcf (commit)
       via  5aa470ef5aa86f7946be8d379e409deacfabba67 (commit)
       via  604a84ddb5c4d410889c0d7ae9c7c15a595c181d (commit)
       via  3212cecb5c090d2f331fd964a8855eaad508fdb9 (commit)
       via  68c8b2056d6c72f0229cf29f999a8e0a1e4231f9 (commit)
       via  4afcb8c40cf29b43a457b02123e8532b41df9afd (commit)
       via  1e31ae09539d8265820a2f75f8a981f7d415ef58 (commit)
       via  420d88e40bc5c2d12fe53a5f9f25ec19d80de797 (commit)
       via  d9ca40ab7cd6ab74fbfcd5287e9075a734107cd0 (commit)
       via  0ab83774eb4a234eea75686dd257da4dd799aef8 (commit)
       via  dd476af362769999d6317bc48a84c35d4d340377 (commit)
       via  2c62646581af6cc6d7858262a15ecd596730b3dd (commit)
       via  1e7641831c41f9a7b27aa2672211f6d607e8ff8e (commit)
       via  f69395a08509cc8c664c3256019d4d3cdb67db86 (commit)
       via  c47e7b17f55d546b4158ab4b0d61b8f7e081ef57 (commit)
       via  960e574bc6c559e67c12fc6ac844dd7aa6880051 (commit)
       via  51bae325be042ecfc2469eb9838671e1663e6a99 (commit)
       via  896d01ea7b3fed8b621ff930893d3ec806931dc9 (commit)
       via  69f03366de186c5a337e5dd14e83920fcab38a8f (commit)
       via  35016e091b321c41b6632d32a45f4b5591e98c67 (commit)
       via  4d154281759194e776b4fd2fa925de5036c2a3f4 (commit)
       via  3c92fedddb8ee6f804940a52955fce72311bac92 (commit)
       via  14421881c1962fdfba49dc004cfc69c0637fe454 (commit)
       via  b12343e7eec124b34139efae07b52e95a74b253a (commit)
       via  bfc2351320afd0c440bda51b4b4a2c51ddd4b5ef (commit)
       via  759878e0a72644c5e537c51da9806672cf92e458 (commit)
       via  fb2099b1de222b4aa05dd2ce12654ff32da3c18d (commit)
       via  2bf83ac52cf6af212044ec6f0d3c77b5713bb664 (commit)
       via  5f401b4457cd085ce3ecc5b15c4dbaef5a3df749 (commit)
       via  6ab7cf882cd9a268374b880b5e55b4c8946406b4 (commit)
       via  e86ad4d8172c24aae92ccd482ffb122ea01b55ab (commit)
       via  250ae26f6f006f973f62e8d35a6a34e3b0e9f21d (commit)
       via  70ffabfafec877a79cfd4ab5e4fb5831e37068fa (commit)
       via  0d735490830f2e1924019e23a388eabda59d076c (commit)
       via  e508f92b8efe56bff8932b46bda4cf0a04d2d3d4 (commit)
       via  7b26b999c98fdd0cc29f81cf1e537ae286e81783 (commit)
       via  1c9e7c47db6d2823939f4aa8021ec47d15c1522f (commit)
       via  131b0d92bd2154a97d1f13c26073bc47feba3c20 (commit)
       via  0b2005c4d8e1f8a5e1563373eb1eb49a908b7540 (commit)
       via  50b8fd6c6dd1137a06b7849665d8ba4276f62ba2 (commit)
       via  a6b1b78864353e3dcce2a1c5bf4afa2b4c88b036 (commit)
       via  955f8c26064c9c70b3a4ce33e04eda97c70a1787 (commit)
       via  812993586e7dc31ead38075e07616b7ec47fd347 (commit)
       via  04700fca9ad96c23119b474ba1f472b9d1da2b20 (commit)
       via  84b88010ca9cc0802a9d4810a1a83c2946c64573 (commit)
       via  b4a26f3454b98eb4cdc52ebbf8d4d00c67f5e49a (commit)
      from  ceb2ed3a4f6c68a1c95d92271ba77b5e3d8b6a58 (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 49030c3161523bc427e0aaa9d3edb517fc4c296c
Merge: ceb2ed3 c4e7c6d
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Jan 5 09:48:35 2015 -0500

    Merge branch 'master' into 4523-search-index
    
    Conflicts:
    	services/api/db/migrate/20141208164553_owner_uuid_index.rb
    	services/api/db/structure.sql
    	services/api/test/unit/arvados_model_test.rb

diff --cc services/api/test/unit/arvados_model_test.rb
index b353793,8c75764..63b4773
--- a/services/api/test/unit/arvados_model_test.rb
+++ b/services/api/test/unit/arvados_model_test.rb
@@@ -87,64 -87,26 +87,47 @@@ class ArvadosModelTest < ActiveSupport:
      end
    end
  
-   test "unique uuid index exists on all models with the column uuid" do
-     tables = ActiveRecord::Base.connection.tables
-     tables.each do |table|
-       columns = ActiveRecord::Base.connection.columns(table)
- 
-       uuid_column = columns.select do |column|
-         column.name == 'uuid'
-       end
- 
-       if !uuid_column.empty?
-         indexes = ActiveRecord::Base.connection.indexes(table)
-         uuid_index = indexes.select do |index|
-           index.columns == ['uuid'] and index.unique == true
-         end
- 
-         assert !uuid_index.empty?, "#{table} does not have unique uuid index"
-       end
-     end
-   end
- 
-   test "owner uuid index exists on all models with the owner_uuid column" do
-     all_tables = ActiveRecord::Base.connection.tables
- 
-     all_tables.each do |table|
-       columns = ActiveRecord::Base.connection.columns(table)
- 
-       uuid_column = columns.select do |column|
-         column.name == 'owner_uuid'
-       end
- 
-       if !uuid_column.empty?
-         indexes = ActiveRecord::Base.connection.indexes(table)
-         owner_uuid_index = indexes.select do |index|
-           index.columns == ['owner_uuid']
+   [['uuid', {unique: true}],
+    ['owner_uuid', {}]].each do |the_column, requires|
+     test "unique index on all models with #{the_column}" do
+       checked = 0
+       ActiveRecord::Base.connection.tables.each do |table|
+         columns = ActiveRecord::Base.connection.columns(table)
+ 
+         next unless columns.collect(&:name).include? the_column
+ 
+         indexes = ActiveRecord::Base.connection.indexes(table).reject do |index|
+           requires.map do |key, val|
+             index.send(key) == val
+           end.include? false
          end
-         assert !owner_uuid_index.empty?, "#{table} does not have owner_uuid index"
+         assert_includes indexes.collect(&:columns), [the_column], 'no index'
+         checked += 1
        end
+       # Sanity check: make sure we didn't just systematically miss everything.
+       assert_operator(10, :<, checked,
+                       "Only #{checked} tables have a #{the_column}?!")
      end
    end
 +
 +  test "search index exists on models that go into projects" do
 +    all_tables =  ActiveRecord::Base.connection.tables
 +    all_tables.delete 'schema_migrations'
 +
 +    all_tables.each do |table|
 +      table_class = table.classify.constantize
 +      if table_class.respond_to?('searchable_columns')
 +        search_index_columns = table_class.searchable_columns('ilike')
 +
 +        indexes = ActiveRecord::Base.connection.indexes(table)
 +        search_index_by_columns = indexes.select do |index|
 +          index.columns == search_index_columns
 +        end
 +        search_index_by_name = indexes.select do |index|
 +          index.name == "#{table}_search_index"
 +        end
 +        assert !search_index_by_columns.empty?, "#{table} has no search index with columns #{search_index_columns}. Instead found search index with columns #{search_index_by_name.first.andand.columns}"
 +      end
 +    end
 +  end
  end

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list