Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
b4d28123
Commit
b4d28123
authored
Aug 01, 2010
by
Hanno Schlichting
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include query time reporting for the sort step
parent
0dc031aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
29 deletions
+40
-29
src/Products/ZCatalog/Catalog.py
src/Products/ZCatalog/Catalog.py
+36
-29
src/Products/ZCatalog/plan.py
src/Products/ZCatalog/plan.py
+4
-0
No files found.
src/Products/ZCatalog/Catalog.py
View file @
b4d28123
...
...
@@ -543,8 +543,6 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
else
:
cr
.
stop_split
(
i
,
None
)
cr
.
stop
()
if
rs
is
None
:
# None of the indexes found anything to do with the query
# We take this to mean that the query was empty (an empty filter)
...
...
@@ -556,10 +554,12 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
DeprecationWarning
,
stacklevel
=
3
)
if
sort_index
is
None
:
re
turn
LazyMap
(
self
.
instantiate
,
self
.
data
.
items
(),
len
(
self
))
re
sult
=
LazyMap
(
self
.
instantiate
,
self
.
data
.
items
(),
len
(
self
))
else
:
return
self
.
sortResults
(
cr
.
start_split
(
'sort_on'
)
result
=
self
.
sortResults
(
self
.
data
,
sort_index
,
reverse
,
limit
,
merge
)
cr
.
stop_split
(
'sort_on'
,
None
)
elif
rs
:
# We got some results from the indexes.
# Sort and convert to sequences.
...
...
@@ -576,44 +576,51 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
# note that data_record_normalized_score_ cannot be
# calculated and will always be 1 in this case
getitem
=
self
.
__getitem__
re
turn
[(
score
,
(
1
,
score
,
rid
),
getitem
)
re
sult
=
[(
score
,
(
1
,
score
,
rid
),
getitem
)
for
rid
,
score
in
rs
.
items
()]
rs
=
rs
.
byValue
(
0
)
# sort it by score
max
=
float
(
rs
[
0
][
0
])
# Here we define our getter function inline so that
# we can conveniently store the max value as a default arg
# and make the normalized score computation lazy
def
getScoredResult
(
item
,
max
=
max
,
self
=
self
):
"""
Returns instances of self._v_brains, or whatever is passed
into self.useBrains.
"""
score
,
key
=
item
r
=
self
.
_v_result_class
(
self
.
data
[
key
])
\
.
__of__
(
aq_parent
(
self
))
r
.
data_record_id_
=
key
r
.
data_record_score_
=
score
r
.
data_record_normalized_score_
=
int
(
100.
*
score
/
max
)
return
r
return
LazyMap
(
getScoredResult
,
rs
,
len
(
rs
))
else
:
cr
.
start_split
(
'sort_on'
)
rs
=
rs
.
byValue
(
0
)
# sort it by score
max
=
float
(
rs
[
0
][
0
])
# Here we define our getter function inline so that
# we can conveniently store the max value as a default arg
# and make the normalized score computation lazy
def
getScoredResult
(
item
,
max
=
max
,
self
=
self
):
"""
Returns instances of self._v_brains, or whatever is
passed into self.useBrains.
"""
score
,
key
=
item
r
=
self
.
_v_result_class
(
self
.
data
[
key
])
\
.
__of__
(
aq_parent
(
self
))
r
.
data_record_id_
=
key
r
.
data_record_score_
=
score
r
.
data_record_normalized_score_
=
int
(
100.
*
score
/
max
)
return
r
result
=
LazyMap
(
getScoredResult
,
rs
,
len
(
rs
))
cr
.
stop_split
(
'sort_on'
,
None
)
elif
sort_index
is
None
and
not
hasattr
(
rs
,
'values'
):
# no scores
if
hasattr
(
rs
,
'keys'
):
rs
=
rs
.
keys
()
re
turn
LazyMap
(
self
.
__getitem__
,
rs
,
len
(
rs
))
re
sult
=
LazyMap
(
self
.
__getitem__
,
rs
,
len
(
rs
))
else
:
# sort. If there are scores, then this block is not
# reached, therefore 'sort-on' does not happen in the
# context of a text index query. This should probably
# sort by relevance first, then the 'sort-on' attribute.
return
self
.
sortResults
(
rs
,
sort_index
,
reverse
,
limit
,
merge
)
cr
.
start_split
(
'sort_on'
)
result
=
self
.
sortResults
(
rs
,
sort_index
,
reverse
,
limit
,
merge
)
cr
.
stop_split
(
'sort_on'
,
None
)
else
:
# Empty result set
return
LazyCat
([])
result
=
LazyCat
([])
cr
.
stop
()
return
result
def
sortResults
(
self
,
rs
,
sort_index
,
reverse
=
0
,
limit
=
None
,
merge
=
1
):
# Sort a result set using a sort index. Return a lazy
...
...
src/Products/ZCatalog/plan.py
View file @
b4d28123
...
...
@@ -234,6 +234,10 @@ class CatalogPlan(object):
self
.
res
.
append
(
IndexMeasurement
(
name
=
name
,
duration
=
current
-
start_time
,
num
=
length
))
if
name
==
'sort_on'
:
# sort_on isn't an index. We only do time reporting on it
return
# remember index's hits, search time and calls
benchmark
=
self
.
benchmark
if
name
not
in
benchmark
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment