1
=== modified file 'lib/canonical/launchpad/pagetests/webservice/datamodel.txt'
2
--- lib/canonical/launchpad/pagetests/webservice/datamodel.txt	2010-08-19 14:38:10 +0000
3
+++ lib/canonical/launchpad/pagetests/webservice/datamodel.txt	2010-08-26 12:53:02 +0000
4
@@ -7,29 +7,39 @@
5
7
end-to-end tests of code paths that, on the surface, look like they're
7
end-to-end tests of code paths that, on the surface, look like they're
6
8
already tested in lazr.restful.
8
already tested in lazr.restful.
7
9
9
9
10
  >>> def get_collection(version, start=0, size=2):
10
  >>> def get_collection(version="devel", start=0, size=2):
10
11
  ...     collection = webservice.get(
11
  ...     collection = webservice.get(
11
12
  ...         ("/people?ws.op=find&text=s&ws.start=%s&ws.size=%s" %
12
  ...         ("/people?ws.op=find&text=s&ws.start=%s&ws.size=%s" %
12
13
  ...          (start, size)),
13
  ...          (start, size)),
13
14
  ...         api_version=version)
14
  ...         api_version=version)
14
15
  ...     return collection.jsonBody()
15
  ...     return collection.jsonBody()
15
16
16
34
17
Even if an entire collection fits on one page (so that the total size
17
35
18
of the collection is obvious), 'total_size_link' will be served
18
Normally, the total size of a collection is not served along with the
36
19
instead of 'total_size'. (It would be nice to fix this.)
19
collection; it's available by following the total_size_link.
37
20
20
38
21
  >>> collection = get_collection("devel", size=100)
21
  >>> collection = get_collection()
39
22
  >>> print sorted(collection.keys())
22
  >>> print sorted(collection.keys())
40
23
  [u'entries', u'start', u'total_size_link']
23
  [u'entries', u'next_collection_link', u'start', u'total_size_link']
41
24
  >>> print webservice.get(collection['total_size_link']).jsonBody()
24
  >>> print webservice.get(collection['total_size_link']).jsonBody()
42
25
  9
25
  9
43
26
26
44
27
Even if the last page of the collection is fetched (so that the total
27
If an entire collection fits on one page (making the size of the
45
28
size of the collection is semi-obvious), 'total_size_link' will be
28
collection obvious), 'total_size' is served instead of
46
29
served instead of 'total_size'. (It would be nice to fix this.)
29
'total_size_link'.
47
30
30
48
31
  >>> collection = get_collection("devel", start=8)
31
  >>> collection = get_collection(size=100)
49
32
  >>> print sorted(collection.keys())
32
  >>> print sorted(collection.keys())
50
33
  [u'entries', u'prev_collection_link', u'start', u'total_size_link']
33
  [u'entries', u'start', u'total_size']
51
34
  >>> print webservice.get(collection['total_size_link']).jsonBody()
34
  >>> print collection['total_size']
52
35
  9
53
36
54
37
If the last page of the collection is fetched (making the total size
55
38
of the collection semi-obvious), 'total_size' is served instead of
56
39
'total_size_link'.
57
40
58
41
  >>> collection = get_collection(start=8)
59
42
  >>> print sorted(collection.keys())
60
43
  [u'entries', u'prev_collection_link', u'start', u'total_size']
61
44
  >>> print collection['total_size']
62
35
  9
45
  9
63
36
46
64
=== modified file 'lib/canonical/launchpad/webapp/batching.py'
65
--- lib/canonical/launchpad/webapp/batching.py	2010-08-20 20:31:18 +0000
66
+++ lib/canonical/launchpad/webapp/batching.py	2010-08-26 12:53:02 +0000
67
@@ -4,11 +4,13 @@
68
4
__metaclass__ = type
4
__metaclass__ = type
69
5
5
70
6
import lazr.batchnavigator
6
import lazr.batchnavigator
71
7
from storm import Undef
72
7
# and ISQLObjectResultSet
8
# and ISQLObjectResultSet
73
8
from storm.zope.interfaces import IResultSet
9
from storm.zope.interfaces import IResultSet
74
9
from zope.component import adapts
10
from zope.component import adapts
75
10
from zope.interface import implements
11
from zope.interface import implements
76
11
from zope.interface.common.sequence import IFiniteSequence
12
from zope.interface.common.sequence import IFiniteSequence
77
13
from zope.security.proxy import removeSecurityProxy
78
12
14
79
13
from canonical.config import config
15
from canonical.config import config
80
14
from canonical.launchpad.webapp.interfaces import ITableBatchNavigator
16
from canonical.launchpad.webapp.interfaces import ITableBatchNavigator
81
@@ -30,6 +32,24 @@
82
30
        return iter(self.context)
32
        return iter(self.context)
83
31
33
84
32
    def __len__(self):
34
    def __len__(self):
85
35
        # XXX 2010-08-24 leonardr bug=620508
86
36
        #
87
37
        # Slicing a ResultSet object returns a copy with ._limit and
88
38
        # ._offset set appropriately. The original object's ._limit
89
39
        # and ._offset are not affected. However, the original and
90
40
        # the copy share a _select object, which means the original
91
41
        # object's ._select.limit and ._select.offset are shared with
92
42
        # the copy.
93
43
        #
94
44
        # This breaks Storm--count() is not supported on a ResultSet
95
45
        # that has a limit or offset set. This code sets
96
46
        # ._select.limit and ._select.offset to the appropriate values
97
47
        # before running the count() query, just as __getitem__ sets
98
48
        # those values before running its query.
99
49
        resultset = removeSecurityProxy(self.context)
100
50
        if hasattr(resultset, '_select'):
101
51
            resultset._select.limit = Undef
102
52
            resultset._select.offset = Undef
103
33
        return self.context.count()
53
        return self.context.count()
104
34
54
105
35
55
106
36
56
107
=== modified file 'versions.cfg'
108
--- versions.cfg	2010-08-25 18:51:51 +0000
109
+++ versions.cfg	2010-08-26 12:53:02 +0000
110
@@ -24,14 +24,14 @@
111
24
grokcore.component = 1.6
24
grokcore.component = 1.6
112
25
httplib2 = 0.6.0
25
httplib2 = 0.6.0
113
26
ipython = 0.9.1
26
ipython = 0.9.1
115
27
launchpadlib = 1.6.4
27
launchpadlib = 1.6.5
116
28
lazr.authentication = 0.1.1
28
lazr.authentication = 0.1.1
117
29
lazr.batchnavigator = 1.2.2
29
lazr.batchnavigator = 1.2.2
118
30
lazr.config = 1.1.3
30
lazr.config = 1.1.3
119
31
lazr.delegates = 1.2.0
31
lazr.delegates = 1.2.0
120
32
lazr.enum = 1.1.2
32
lazr.enum = 1.1.2
121
33
lazr.lifecycle = 1.1
33
lazr.lifecycle = 1.1
123
34
lazr.restful = 0.11.1
34
lazr.restful = 0.11.3
124
35
lazr.restfulclient = 0.10.0
35
lazr.restfulclient = 0.10.0
125
36
lazr.smtptest = 1.1
36
lazr.smtptest = 1.1
126
37
lazr.testing = 0.1.1
37
lazr.testing = 0.1.1
Status:	Merged
Approved by:	Aaron Bentley on 2010-08-23
Approved revision:	no longer in the source branch.
Merged at revision:	9705
Proposed branch:	lp:~leonardr/launchpad/optimized-length-2
Merge into:	lp:launchpad/db-devel
Diff against target:	126 lines (+51/-21) 3 files modified lib/canonical/launchpad/pagetests/webservice/datamodel.txt (+29/-19) lib/canonical/launchpad/webapp/batching.py (+20/-0) versions.cfg (+2/-2)
To merge this branch:	bzr merge lp:~leonardr/launchpad/optimized-length-2
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Nelson (community)	code		Approve on 2010-08-26
Graham Binns (community)	code		Approve on 2010-08-24
Aaron Bentley (community)		2010-08-23	Approve on 2010-08-23
Review via email: mp+33417@code.launchpad.net