[ARVADOS] updated: 9e433e06ab2a11fbaaf73c5082c2a64eff596856

Git user git at public.curoverse.com
Thu Aug 31 15:53:38 EDT 2017


Summary of changes:
 services/api/test/functional/arvados/v1/filters_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

  discards  d5bdc7be359a2780ef47186452054dfbe071237a (commit)
       via  9e433e06ab2a11fbaaf73c5082c2a64eff596856 (commit)
       via  69c602335d8f5e01064bf8a87298a33955e7246a (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (d5bdc7be359a2780ef47186452054dfbe071237a)
            \
             N -- N -- N (9e433e06ab2a11fbaaf73c5082c2a64eff596856)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 9e433e06ab2a11fbaaf73c5082c2a64eff596856
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Aug 30 16:49:44 2017 -0400

    12194: Use plainto_tsquery() for full-text search.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/lib/record_filters.rb b/services/api/lib/record_filters.rb
index eb8d09b..677c8f0 100644
--- a/services/api/lib/record_filters.rb
+++ b/services/api/lib/record_filters.rb
@@ -52,10 +52,9 @@ module RecordFilters
 
         # Skip the generic per-column operator loop below
         attrs = []
-        # Use to_tsquery since plainto_tsquery does not support prefix
-        # search. And, split operand and join the words with ' & '
-        cond_out << model_class.full_text_tsvector+" @@ to_tsquery(?)"
-        param_out << operand.split.join(' & ')
+        # plainto_tsquery() interprets "foo:bar baz" as "'foo:bar' & 'baz'".
+        cond_out << model_class.full_text_tsvector+" @@ plainto_tsquery(?)"
+        param_out << operand
       end
       attrs.each do |attr|
         if !model_class.searchable_columns(operator).index attr.to_s

commit 69c602335d8f5e01064bf8a87298a33955e7246a
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Aug 31 13:35:24 2017 -0400

    12194: Test colons in fulltext search.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/test/functional/arvados/v1/filters_test.rb b/services/api/test/functional/arvados/v1/filters_test.rb
index 2c7427c..c0183f1 100644
--- a/services/api/test/functional/arvados/v1/filters_test.rb
+++ b/services/api/test/functional/arvados/v1/filters_test.rb
@@ -43,7 +43,7 @@ class Arvados::V1::FiltersTest < ActionController::TestCase
     @controller = Arvados::V1::CollectionsController.new
     authorize_with :active
     get :index, {
-      filters: [['any', '@@', 'a|b"c']],
+      filters: [['any', '@@', 'a|b::"c:']],
     }
     assert_response :success
     # (Doesn't matter so much which results are returned.)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list