[ARVADOS] updated: 1.3.0-1045-g333b241e8

Git user git at public.curoverse.com
Mon Jun 10 14:09:31 UTC 2019


Summary of changes:
 build/build-dev-docker-jobs-image.sh               |   8 +-
 build/run-build-packages-one-target.sh             |   5 +-
 build/run-build-packages-sso.sh                    |   4 +-
 build/run-build-test-packages-one-target.sh        |   6 +-
 build/run-tests.sh                                 |   3 +
 doc/admin/upgrading.html.textile.liquid            |  49 +++-
 doc/install/install-controller.html.textile.liquid |  11 +-
 .../install-dispatch-cloud.html.textile.liquid     |  87 ++++---
 lib/cloud/azure/azure.go                           |  51 ++--
 lib/cloud/azure/azure_test.go                      |  27 ++-
 lib/cloud/ec2/ec2.go                               |  66 ++----
 lib/cloud/ec2/ec2_test.go                          |  12 +-
 lib/cloud/interfaces.go                            |  35 ++-
 lib/config/cmd_test.go                             |  19 ++
 lib/config/config.default.yml                      | 171 ++++++++++++-
 lib/config/deprecated.go                           |  24 +-
 lib/config/generated_config.go                     | 171 ++++++++++++-
 lib/config/load.go                                 |  23 +-
 lib/config/load_test.go                            |  58 +++++
 lib/controller/cmd.go                              |   4 +-
 lib/controller/federation_test.go                  |  62 +----
 lib/controller/handler.go                          |  42 ++--
 lib/controller/handler_test.go                     |  14 +-
 lib/controller/server_test.go                      |  15 +-
 lib/dispatchcloud/cmd.go                           |   4 +-
 lib/dispatchcloud/dispatcher.go                    |  12 +-
 lib/dispatchcloud/dispatcher_test.go               |  47 ++--
 lib/dispatchcloud/driver.go                        |  67 +++++-
 lib/dispatchcloud/test/stub_driver.go              |   2 +-
 lib/dispatchcloud/worker/pool.go                   |  47 ++--
 lib/dispatchcloud/worker/pool_test.go              |  27 ++-
 lib/dispatchcloud/worker/verify.go                 |   6 +-
 lib/dispatchcloud/worker/worker.go                 |   4 +-
 lib/dispatchcloud/worker/worker_test.go            |   2 +-
 lib/service/cmd.go                                 |  38 +--
 lib/service/cmd_test.go                            |   2 +-
 lib/service/error.go                               |   2 +-
 sdk/cli/bin/crunch-job                             |   4 +-
 sdk/cli/test/test_crunch-job.rb                    |   2 +
 sdk/cwl/arvados_cwl/__init__.py                    |  21 +-
 ...{arv-cwl-schema.yml => arv-cwl-schema-v1.0.yml} |   0
 ...{arv-cwl-schema.yml => arv-cwl-schema-v1.1.yml} |  56 -----
 sdk/cwl/arvados_cwl/arvcontainer.py                |  12 +-
 sdk/cwl/arvados_cwl/arvjob.py                      |   7 +-
 sdk/cwl/arvados_cwl/arvtool.py                     |  26 +-
 sdk/cwl/arvados_cwl/arvworkflow.py                 |  13 +-
 sdk/cwl/arvados_cwl/done.py                        |   2 +-
 sdk/cwl/arvados_cwl/executor.py                    |  72 ++++--
 sdk/cwl/arvados_cwl/runner.py                      | 180 ++++++++++++--
 sdk/cwl/setup.py                                   |   6 +-
 sdk/cwl/test_with_arvbox.sh                        |  35 ++-
 sdk/cwl/tests/test_container.py                    | 264 ++++++++++++++++++++-
 sdk/cwl/tests/test_job.py                          |  49 ++--
 sdk/cwl/tests/test_submit.py                       |  31 ++-
 sdk/cwl/tests/wf/scatter2_subwf.cwl                |  12 +-
 sdk/dev-jobs.dockerfile                            |  17 +-
 sdk/go/arvados/config.go                           | 183 +++++---------
 sdk/go/arvados/duration.go                         |  11 +-
 sdk/go/arvados/duration_test.go                    |  45 ++++
 sdk/go/arvados/fs_collection_test.go               |   3 +-
 sdk/go/arvados/fs_project_test.go                  |   7 +-
 sdk/go/arvados/fs_site_test.go                     |  36 ++-
 sdk/go/arvadostest/fixtures.go                     |   1 -
 sdk/go/arvadostest/stub.go                         |  22 ++
 sdk/go/health/aggregator.go                        |  71 +++---
 sdk/go/health/aggregator_test.go                   | 144 ++++++-----
 sdk/pam/arvados_pam/__init__.py                    |   2 +-
 sdk/python/tests/run_test_server.py                |  40 ++--
 .../api/app/controllers/application_controller.rb  |  17 +-
 .../arvados/v1/collections_controller.rb           |  12 +
 .../arvados/v1/container_requests_controller.rb    |  18 ++
 .../controllers/arvados/v1/groups_controller.rb    |   9 +
 services/api/app/models/arvados_model.rb           |  53 -----
 services/api/app/models/user.rb                    |   2 +-
 services/api/config/arvados_config.rb              |   7 +
 .../20190322174136_add_file_info_to_collection.rb  |  52 +---
 services/api/lib/record_filters.rb                 |   8 +
 services/api/lib/tasks/symbols.rake                | 109 +++++++++
 .../populate-file-info-columns-in-collections.rb   |  97 ++++++++
 services/api/test/fixtures/links.yml               |   9 +
 .../arvados/v1/collections_controller_test.rb      |  22 +-
 .../arvados/v1/groups_controller_test.rb           |  17 ++
 .../api/test/integration/collections_api_test.rb   |  98 ++++++++
 ...eep_munge_test.rb => container_request_test.rb} |  28 +--
 services/api/test/unit/arvados_model_test.rb       |  11 -
 services/crunch-run/copier_test.go                 |   6 +-
 services/health/main.go                            |  69 +-----
 services/keep-web/cache_test.go                    |  12 +-
 services/keep-web/cadaver_test.go                  |   4 +-
 services/keep-web/handler_test.go                  |   6 +-
 services/keep-web/server_test.go                   |   6 +-
 .../lib/arvbox/docker/service/certificate/run      |   3 +-
 92 files changed, 2212 insertions(+), 1064 deletions(-)
 copy sdk/cwl/arvados_cwl/{arv-cwl-schema.yml => arv-cwl-schema-v1.0.yml} (100%)
 rename sdk/cwl/arvados_cwl/{arv-cwl-schema.yml => arv-cwl-schema-v1.1.yml} (80%)
 create mode 100644 sdk/go/arvados/duration_test.go
 mode change 100755 => 100644 services/api/db/migrate/20190322174136_add_file_info_to_collection.rb
 create mode 100644 services/api/lib/tasks/symbols.rake
 create mode 100755 services/api/script/populate-file-info-columns-in-collections.rb
 copy services/api/test/integration/{noop_deep_munge_test.rb => container_request_test.rb} (62%)

       via  333b241e8ef7b1aca7aea85952424586c1f25299 (commit)
       via  442a871e7f3476938d0ebb3adbe3b9a7742f03ad (commit)
       via  a061ac1788c67e7f0107a80c63005af328306afa (commit)
       via  a94f8d99a72d817d998d338607b8941aa4a450ff (commit)
       via  502005c3002c9ee9f07b36ac4a5aa370aa056c50 (commit)
       via  b15cc4afed604255dfee435aa8c1663c46895860 (commit)
       via  b93dc244f39ea9b8a4552804cd24d251658531e3 (commit)
       via  85577ffe94f97defab4efa8cdcab9252da98f4c6 (commit)
       via  de3ced158ccf579efbe9bfe0e23e03eb9417daeb (commit)
       via  e9a3a68fd1c238cd2a6e72df73141462dfe41a85 (commit)
       via  2c8706a4039f10274666b1cd879527d2e18fa338 (commit)
       via  57eb9ae04ace45f70d2e0ceaeda3457062074b95 (commit)
       via  69807aebd1d73a10280d28e99a6d4f5c719175f4 (commit)
       via  22722aab8f5aaf33d75975738d7e4f9c46150722 (commit)
       via  d289f9642981adc8b332a03caf31fe2a93fd313f (commit)
       via  4c63c6827062e71bd538a118603a77014c2636fe (commit)
       via  1fd7b7089dd0027d36e46c2e1fbb44aee4cc1e66 (commit)
       via  18ae48a2e9858fdbbe96d7fb0141397310c6044f (commit)
       via  a0b36ed86d499b53c442a0050d694d7a3ce35ed5 (commit)
       via  b3d5254ce24ca82904b13d61012b2d8d676a30d8 (commit)
       via  921537f5a37f03cdcd1f00abe25914306f83e956 (commit)
       via  0d5c86670e4ac37e4caceafabd9d6c65d2a89265 (commit)
       via  9052027ce0c8e3f3a338b4b1541bf4119185c327 (commit)
       via  2b2482b42492de157229b900a85e9da589c5ab67 (commit)
       via  9bb2369da7abe777e559e43a1fb5b3e293e9def1 (commit)
       via  33c298ad7c00c336cd628e04b6478d725c9acf62 (commit)
       via  5ea0a240eb08a4d43d5f7670a694f0158f0bac36 (commit)
       via  6c78b28f9f54664babc57a4b4372c502065ed5d1 (commit)
       via  fdadf2969c54edc7314ca50a629f3912998087b4 (commit)
       via  903b27b2f4b8b00c11525ff6c2f4eb383709d074 (commit)
       via  d56b21609ddd2e2e096f5c30e991d24aa213f7f4 (commit)
       via  1a18a29729f91dd23f89387f5277c91607376fd9 (commit)
       via  65c515131a8243fd30c32a609b6b37a1fb4d8fc2 (commit)
       via  7f68130d098483c5169add6f0454e62fa2d7befa (commit)
       via  6f17bfcae56d0f6032e1cf4087ba7c2e7b092424 (commit)
       via  c792e4991e1d77620d61efaa2600a93d75227f06 (commit)
       via  87118da0b789b47dbafff821b50ed0f921ee490c (commit)
       via  6e73eff3926a2e7345333edd02531e8e6fbe15ef (commit)
       via  82fff312b0249ae6757bdffc59c985303998748a (commit)
       via  5155ef0eaae5a3cdef3d8c3490d138dfcbeaa736 (commit)
       via  7109ea1b2a49bc7fdbdbfd2302eb2457750ce5cd (commit)
       via  78c908ca43839aa38bb45ef9a9959e1005e39494 (commit)
       via  97d368d1f14a17b0c4d847a22b51444b577f4bab (commit)
       via  8fc29fafb91cf64ce4ededbdd85ef9507c51f216 (commit)
       via  5c46278622fff6b7db0d605a0170674626aadc64 (commit)
       via  9e27319d4ec960e6fac43322b885e8aa355651f9 (commit)
       via  f27aa12c4dd863e1c4a8c0c61cba365c99bdc5e7 (commit)
       via  e824e159b213262403771ca4060ac03a7d558b55 (commit)
       via  eb52e0cd0b7e6e7c479fec820b3c19566984c79c (commit)
       via  472090e584f8ce68c97e082aba08c79f2a242848 (commit)
       via  6cd211af76807e01bdf0c7cd41cbd5002f32e822 (commit)
       via  60560d144b7abf7ff98eb12ca3a591211df19ce9 (commit)
       via  725ff809bfef3214ca9117b768711c8136ed4cc3 (commit)
       via  14db4dcdc2b0b7e5fbc81d62cf581dea5ccc07f4 (commit)
       via  74b22016e6213628510414c96a7b7cd04c432378 (commit)
       via  e3f324c979fe45803e2bd42aa8f6d715ea23edb5 (commit)
       via  65836a37f88d103c2660c002beaa9e9faaa2ac8c (commit)
       via  d6358ef9fc0d8474827830a7ea0a451832e1fbec (commit)
       via  db1cbf4f40a83c4af347be9737d7bca7ccd772ab (commit)
       via  15c688d1c4b41232536d0a275dd5c0fdb8879a00 (commit)
       via  8ee2632316f61a63f5af52e84e1538e26850005e (commit)
       via  b3d57ff3ccf9c612a11fcf53a451a0f61a362da6 (commit)
       via  a26a249eed0299c56e6583a4fae2b9f6dc16bf7f (commit)
       via  48a3b3a3c28a6590fdf3d2b750192706cb751fae (commit)
       via  1167d410254ff8babfec9f2fdaae1958b368a1b9 (commit)
       via  c43d9e862d65065c05ee1ef4e6f2ba7d7ec28ed9 (commit)
       via  bfe31b5db42a7c66b49ebcd519e90d590cafe825 (commit)
       via  56555817311d4cadf261cd3aa380361690e6fe65 (commit)
       via  35852356dd9bb2e29e8aebb208e063d9fe924316 (commit)
       via  c042cd8120be2c54f54ee2a6041adbc30e141190 (commit)
       via  420b31d5f181d320e6f770cc3c63f2ae66908c88 (commit)
       via  1746985ec50d72cad304640f1ea39e2a9dff07bf (commit)
       via  21b517dfc95984e812b4b9c4243edfb0dbf5754a (commit)
       via  a3b40d4546cb18744d6052ffb47f5f81773ac261 (commit)
       via  c4e2ca60d9f572a7cbf194dcd4f15d26d8fa49b5 (commit)
       via  675eb1e789edcb2b05e818943e9f8c333952f107 (commit)
       via  9e265731cf581ffb3650fd9db1aa0347650e2128 (commit)
       via  3954f59491891999e117fe1b56d073d628775e5e (commit)
       via  8a3e48d792f1b9f3ba12cefee4c0cdb50d85c847 (commit)
       via  09fcc3cf5ba690aa75c36dfef911c730f48f05ab (commit)
       via  ac0dc6c57a2b4f736b6faf62421de56a3355db04 (commit)
      from  9d4c7ff603f22844dc80c7f38c938a678273c9c1 (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 333b241e8ef7b1aca7aea85952424586c1f25299
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Mon Jun 10 10:09:27 2019 -0400

    15106: Adds trigram search to the api
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/services/api/lib/record_filters.rb b/services/api/lib/record_filters.rb
index 831e357b4..7b0d48b05 100644
--- a/services/api/lib/record_filters.rb
+++ b/services/api/lib/record_filters.rb
@@ -44,6 +44,14 @@ module RecordFilters
 
       cond_out = []
 
+      if attrs_in == 'any' && operator.casecmp('ilike') && operand.match('^[%].*[%]$')
+        # Trigram index search
+        cond_out << model_class.full_text_trgm + " ilike ?"
+        param_out << operand
+        # Skip the generic per-column operator loop below
+        attrs = []
+      end
+
       if operator == '@@'
         # Full-text search
         if attrs_in != 'any'

commit 442a871e7f3476938d0ebb3adbe3b9a7742f03ad
Merge: 9d4c7ff60 a061ac178
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Mon Jun 10 10:07:59 2019 -0400

    Merge branch 'master' into 15106-trgm-text-search
    
    refs #15106
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list