[ARVADOS] updated: 79aca915815d298d2c20546108284627ee6cb84b
git at public.curoverse.com
git at public.curoverse.com
Mon Feb 9 17:47:39 EST 2015
Summary of changes:
.../app/controllers/projects_controller.rb | 4 +-
.../workbench/app/controllers/search_controller.rb | 3 +-
doc/api/methods/collections.html.textile.liquid | 2 +-
doc/api/methods/groups.html.textile.liquid | 9 +--
doc/images/keyfeatures/chooseinputs.png | Bin 76641 -> 67586 bytes
doc/images/keyfeatures/collectionpage.png | Bin 84533 -> 68735 bytes
doc/images/keyfeatures/dashboard2.png | Bin 44396 -> 39651 bytes
doc/images/keyfeatures/graph.png | Bin 49127 -> 37727 bytes
doc/images/keyfeatures/log.png | Bin 135214 -> 94845 bytes
doc/images/keyfeatures/provenance.png | Bin 67060 -> 53567 bytes
doc/images/keyfeatures/rerun.png | Bin 73314 -> 56872 bytes
doc/images/keyfeatures/running2.png | Bin 56959 -> 40453 bytes
doc/images/keyfeatures/shared.png | Bin 62395 -> 46090 bytes
doc/images/keyfeatures/webupload.png | Bin 88061 -> 70592 bytes
doc/images/quickstart/1.png | Bin 47239 -> 36164 bytes
doc/images/quickstart/2.png | Bin 74431 -> 58616 bytes
doc/images/quickstart/3.png | Bin 80668 -> 68576 bytes
doc/images/quickstart/4.png | Bin 66686 -> 45334 bytes
doc/images/quickstart/5.png | Bin 83038 -> 66066 bytes
doc/images/quickstart/6.png | Bin 98604 -> 83813 bytes
doc/images/quickstart/7.png | Bin 77820 -> 60031 bytes
sdk/python/gittaggers.py | 20 ++++++
sdk/python/setup.py | 31 +++------
.../api/app/controllers/application_controller.rb | 19 ++++--
.../arvados/v1/collections_controller.rb | 7 +-
.../controllers/arvados/v1/groups_controller.rb | 76 +++++++--------------
.../app/controllers/arvados/v1/users_controller.rb | 2 +-
services/api/app/models/arvados_model.rb | 6 ++
services/api/lib/record_filters.rb | 9 ++-
.../api/test/functional/arvados/v1/filters_test.rb | 4 +-
.../arvados/v1/groups_controller_test.rb | 17 ++++-
.../api/test/integration/collections_api_test.rb | 13 ++--
services/api/test/integration/groups_test.rb | 15 ++--
services/api/test/unit/arvados_model_test.rb | 22 ++++++
services/fuse/gittaggers.py | 1 +
services/fuse/setup.py | 31 +++------
services/fuse/tests/test_mount.py | 16 +++--
services/{fuse => nodemanager}/MANIFEST.in | 0
services/nodemanager/gittaggers.py | 1 +
services/nodemanager/setup.py | 32 +++------
40 files changed, 173 insertions(+), 167 deletions(-)
create mode 100644 sdk/python/gittaggers.py
create mode 120000 services/fuse/gittaggers.py
copy services/{fuse => nodemanager}/MANIFEST.in (100%)
create mode 120000 services/nodemanager/gittaggers.py
via 79aca915815d298d2c20546108284627ee6cb84b (commit)
via b21b81e6623d025da4d93cbf09d523e63d2e07b0 (commit)
via fb4921f56d1c13a86add2e59205ec32fa1f6efe4 (commit)
via 1d4a39ab3e97c031683ada9f6c98e4c7365fa414 (commit)
via f6ab9be0046a6f8d760259c1a0eba8ab7c636903 (commit)
via 231242b6378abda494f2c684995519a259cfe174 (commit)
via 1963df31ffb7e95b72e53a0ec5c891f539b6dadb (commit)
via b59b310e23b588c4007af84741d4b94bc9f595f1 (commit)
via d6ec5672045b29aeaf983a78c5487ae354ccb20d (commit)
via 757212484d9da8bb8d8852bfb6870433d2b4fa97 (commit)
via f85132f1a018179b7127c199932c1f0f3e3f76d5 (commit)
via 2e9f5f1aa841972d1c6d3ff0828d774f60c28307 (commit)
via 71c05eec3e9c8e6f37f14760b04584a8d4c4372c (commit)
via f32690a4a18f85909c0a04de83ecf7819f127df8 (commit)
via df507d6cdebca220ac19dbbc5c16d18498cb852c (commit)
via f8067dd18b72705f3317e85745e87cffc9e25313 (commit)
via 348801d41f0bd06582675223f07a7ef7f36ac887 (commit)
from 4982008e820ed48f362226c61540c18305c6acd6 (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 79aca915815d298d2c20546108284627ee6cb84b
Merge: b21b81e fb4921f
Author: Radhika Chippada <radhika at curoverse.com>
Date: Mon Feb 9 17:47:19 2015 -0500
Merge branch 'master' into 4523-full-text-search
commit b21b81e6623d025da4d93cbf09d523e63d2e07b0
Author: Radhika Chippada <radhika at curoverse.com>
Date: Mon Feb 9 17:45:47 2015 -0500
4523: update tests to include :* in the filters sent rather than expect server to append it.
diff --git a/services/api/test/integration/collections_api_test.rb b/services/api/test/integration/collections_api_test.rb
index 983885d..b44c4be 100644
--- a/services/api/test/integration/collections_api_test.rb
+++ b/services/api/test/integration/collections_api_test.rb
@@ -218,14 +218,15 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
created = json_response
# search using the filename
- search_using_full_text_search 'subdir2', 1
- search_using_full_text_search 'subdir2/subdir', 1
+ search_using_full_text_search 'subdir2', 0
+ search_using_full_text_search 'subdir2:*', 1
search_using_full_text_search 'subdir2/subdir3/subdir4', 1
- search_using_full_text_search 'file4', 1
- search_using_full_text_search 'file4_in_subdir', 1
- search_using_full_text_search 'subdir2 file4', 1 # look for prefixes subdir2 and file4
- search_using_full_text_search 'subdir2 ile4', 0
+ search_using_full_text_search 'file4:*', 1
+ search_using_full_text_search 'file4_in_subdir4.txt', 1
+ search_using_full_text_search 'subdir2 file4:*', 0 # first word is incomplete
+ search_using_full_text_search 'subdir2/subdir3/subdir4 file4:*', 1
search_using_full_text_search 'subdir2/subdir3/subdir4 file4_in_subdir4.txt', 1
+ search_using_full_text_search 'ile4', 0 # not a prefix match
end
def search_using_full_text_search search_filter, expected_items
diff --git a/services/api/test/integration/groups_test.rb b/services/api/test/integration/groups_test.rb
index 7ede5be..5ceb99b 100644
--- a/services/api/test/integration/groups_test.rb
+++ b/services/api/test/integration/groups_test.rb
@@ -40,10 +40,14 @@ class GroupsTest < ActionDispatch::IntegrationTest
end
[
- ['Collection_', true], # collections and pipelines templates
- ['hash', true], # pipeline templates
- ['fa7aeb5140e2848d39b', true], # script_parameter of pipeline instances
- ['no-such-thing', false], # script_parameter of pipeline instances
+ ['Collection_', true], # collections and pipelines templates
+ ['hash', true], # pipeline templates
+ ['fa7aeb5140e2848d39b', false], # script_parameter of pipeline instances
+ ['fa7aeb5140e2848d39b:*', true], # script_parameter of pipeline instances
+ ['project pipeline', true], # finds "Completed pipeline in A Project"
+ ['project pipeli:*', true], # finds "Completed pipeline in A Project"
+ ['proje pipeli:*', false], # first word is incomplete, so no prefix match
+ ['no-such-thing', false], # script_parameter of pipeline instances
].each do |search_filter, expect_results|
test "full text search of group-owned objects for #{search_filter}" do
get "/arvados/v1/groups/contents", {
@@ -69,6 +73,5 @@ class GroupsTest < ActionDispatch::IntegrationTest
:filters => [['name', '@@', 'Private']].to_json
}, auth(:active)
assert_response 422
- end
-
+ end
end
commit 757212484d9da8bb8d8852bfb6870433d2b4fa97
Author: Radhika Chippada <radhika at curoverse.com>
Date: Mon Feb 9 15:23:00 2015 -0500
4523: update full text search record_filter to not append :* for prefix matching; instead expect client to append it as needed.
diff --git a/services/api/lib/record_filters.rb b/services/api/lib/record_filters.rb
index 3786a70..c009bf5 100644
--- a/services/api/lib/record_filters.rb
+++ b/services/api/lib/record_filters.rb
@@ -42,13 +42,16 @@ module RecordFilters
if attrs_in != 'any'
raise ArgumentError.new("Full text search on individual columns is not supported")
end
+ if operand.is_a? Array
+ raise ArgumentError.new("Full text search not supported for array operands")
+ end
+
# Skip the generic per-column operator loop below
attrs = []
# Use to_tsquery since plainto_tsquery does not support prefix
- # search. Instead split operand, add ':*' to each word and
- # join the words with ' & '
+ # search. And, split operand and join the words with ' & '
cond_out << model_class.full_text_tsvector+" @@ to_tsquery(?)"
- param_out << operand.split.each {|s| s.concat(':*')}.join(' & ')
+ param_out << operand.split.join(' & ')
end
attrs.each do |attr|
if !model_class.searchable_columns(operator).index attr.to_s
diff --git a/services/api/test/functional/arvados/v1/filters_test.rb b/services/api/test/functional/arvados/v1/filters_test.rb
index fda857c..604f421 100644
--- a/services/api/test/functional/arvados/v1/filters_test.rb
+++ b/services/api/test/functional/arvados/v1/filters_test.rb
@@ -51,7 +51,7 @@ class Arvados::V1::FiltersTest < ActionController::TestCase
get :index, {
filters: [['any', '@@', ['abc', 'def']]],
}
- assert_response :success
- # (Doesn't matter so much which results are returned.)
+ assert_response 422
+ assert_match /not supported/, json_response['errors'].join(' ')
end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list