Launchpad itself

Merge lp:~lifeless/launchpad/bug-716774 into lp:launchpad

  1. bug-716774
  2. Merge into devel
Proposed by Robert Collins
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 12582
Proposed branch: lp:~lifeless/launchpad/bug-716774
Merge into: lp:launchpad
Diff against target: 71 lines (+3/-15)
2 files modified
lib/lp/bugs/model/bugtask.py (+2/-5)
lib/lp/bugs/tests/test_bugtask_search.py (+1/-10)
To merge this branch: bzr merge lp:~lifeless/launchpad/bug-716774
Reviewer Review Type Date Requested Status
Tim Penhey (community) code Approve
William Grant code* Approve
Review via email: mp+52966@code.launchpad.net

Commit message

[r=thumper,wgrant][bug=716774] Stop querying on BugTask.fti - it has no useful things for fti searching.

Description of the change

Stop querying on BugTask.fti - it pessimises bug searches search a deprecated column and the targetname cache (which we need substring searching on anyway - we don't usefully find things in it with fti AFAICT)

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code*)
Revision history for this message
Tim Penhey (thumper) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/model/bugtask.py'
2--- lib/lp/bugs/model/bugtask.py 2011-03-09 23:10:10 +0000
3+++ lib/lp/bugs/model/bugtask.py 2011-03-11 03:13:58 +0000
4@@ -2260,8 +2260,7 @@
5 # instead.
6 params.orderby = [
7 SQLConstant("-rank(Bug.fti, ftq(%s))" % searchtext_quoted),
8- SQLConstant(
9- "-rank(BugTask.fti, ftq(%s))" % searchtext_quoted)]
10+ ]
11
12 comment_clause = """BugTask.id IN (
13 SELECT BugTask.id
14@@ -2272,7 +2271,6 @@
15 AND MessageChunk.fti @@ ftq(%s))""" % searchtext_quoted
16 text_search_clauses = [
17 "Bug.fti @@ ftq(%s)" % searchtext_quoted,
18- "BugTask.fti @@ ftq(%s)" % searchtext_quoted,
19 ]
20 no_targetnamesearch = bool(features.getFeatureFlag(
21 'malone.disable_targetnamesearch'))
22@@ -2458,8 +2456,7 @@
23 return DecoratedResultSet(resultset, result_decorator=decorator,
24 pre_iter_hook=pre_iter_hook)
25
26- bugtask_fti = SQL('BugTask.fti')
27- inner_resultrow = (BugTask, bugtask_fti)
28+ inner_resultrow = (BugTask,)
29 origin = self.buildOrigin(join_tables, [], clauseTables)
30 resultset = store.using(*origin).find(inner_resultrow, query)
31
32
33=== modified file 'lib/lp/bugs/tests/test_bugtask_search.py'
34--- lib/lp/bugs/tests/test_bugtask_search.py 2011-03-03 05:18:26 +0000
35+++ lib/lp/bugs/tests/test_bugtask_search.py 2011-03-11 03:13:58 +0000
36@@ -265,12 +265,11 @@
37 self.assertSearchFinds(params, self.bugtasks[:2])
38
39 def setUpFullTextSearchTests(self):
40- # Set text fields indexed by Bug.fti, BugTask.fti or
41+ # Set text fields indexed by Bug.fti, or
42 # MessageChunk.fti to values we can search for.
43 for bugtask, number in zip(self.bugtasks, ('one', 'two', 'three')):
44 commenter = self.bugtasks[0].bug.owner
45 with person_logged_in(commenter):
46- bugtask.statusexplanation = 'status explanation %s' % number
47 bugtask.bug.title = 'bug title %s' % number
48 bugtask.bug.newMessage(
49 owner=commenter, content='comment %s' % number)
50@@ -281,10 +280,6 @@
51 params = self.getBugTaskSearchParams(
52 user=None, searchtext='one title')
53 self.assertSearchFinds(params, self.bugtasks[:1])
54- # ... by BugTask.fti ...
55- params = self.getBugTaskSearchParams(
56- user=None, searchtext='two explanation')
57- self.assertSearchFinds(params, self.bugtasks[1:2])
58 # ...and by MessageChunk.fti
59 params = self.getBugTaskSearchParams(
60 user=None, searchtext='three comment')
61@@ -296,10 +291,6 @@
62 params = self.getBugTaskSearchParams(
63 user=None, fast_searchtext='one title')
64 self.assertSearchFinds(params, self.bugtasks[:1])
65- # ... but not text indexed by BugTask.fti ...
66- params = self.getBugTaskSearchParams(
67- user=None, fast_searchtext='two explanation')
68- self.assertSearchFinds(params, [])
69 # ..or by MessageChunk.fti
70 params = self.getBugTaskSearchParams(
71 user=None, fast_searchtext='three comment')