4634.71.1
by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True). |
1 |
# Copyright (C) 2007, 2008, 2009 Canonical Ltd
|
2592.1.4
by Robert Collins
Create a GraphIndexBuilder. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2592.1.4
by Robert Collins
Create a GraphIndexBuilder. |
16 |
|
17 |
"""Indexing facilities."""
|
|
18 |
||
2592.1.38
by Robert Collins
Create an InMemoryGraphIndex for temporary indexing. |
19 |
__all__ = [ |
20 |
'CombinedGraphIndex', |
|
21 |
'GraphIndex', |
|
22 |
'GraphIndexBuilder', |
|
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
23 |
'GraphIndexPrefixAdapter', |
2592.1.38
by Robert Collins
Create an InMemoryGraphIndex for temporary indexing. |
24 |
'InMemoryGraphIndex', |
25 |
]
|
|
2592.1.32
by Robert Collins
Add __all__ to index. |
26 |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
27 |
from bisect import bisect_right |
2592.1.4
by Robert Collins
Create a GraphIndexBuilder. |
28 |
from cStringIO import StringIO |
2592.1.12
by Robert Collins
Handle basic node adds. |
29 |
import re |
3789.1.3
by John Arbash Meinel
CombinedGraphIndex can now reload when calling key_count(). |
30 |
import sys |
2592.1.4
by Robert Collins
Create a GraphIndexBuilder. |
31 |
|
2624.2.15
by Robert Collins
Add useful -Dindex flag. |
32 |
from bzrlib.lazy_import import lazy_import |
33 |
lazy_import(globals(), """ |
|
2745.1.2
by Robert Collins
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly. |
34 |
from bzrlib import trace
|
2890.2.7
by Robert Collins
* Pack indices are now partially parsed for specific key lookup using a |
35 |
from bzrlib.bisect_multi import bisect_multi_bytes
|
2979.2.2
by Robert Collins
Per-file graph heads detection during commit for pack repositories. |
36 |
from bzrlib.revision import NULL_REVISION
|
2745.1.2
by Robert Collins
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly. |
37 |
from bzrlib.trace import mutter
|
2624.2.15
by Robert Collins
Add useful -Dindex flag. |
38 |
""") |
3099.3.3
by John Arbash Meinel
Deprecate get_parents() in favor of get_parent_map() |
39 |
from bzrlib import ( |
40 |
debug, |
|
41 |
errors, |
|
42 |
)
|
|
4679.8.3
by John Arbash Meinel
Expose bzrlib.static_tuple.StaticTuple as a thunk |
43 |
from bzrlib.static_tuple import StaticTuple |
2592.1.4
by Robert Collins
Create a GraphIndexBuilder. |
44 |
|
2979.1.1
by Robert Collins
Use the GraphIndex header to answer key_count queries rather than parsing the entire index unnecessarily. |
45 |
_HEADER_READV = (0, 200) |
2624.2.8
by Robert Collins
Explicitly mark the number of keys elements in use in GraphIndex files. |
46 |
_OPTION_KEY_ELEMENTS = "key_elements=" |
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
47 |
_OPTION_LEN = "len=" |
2592.1.6
by Robert Collins
Record the number of node reference lists a particular index has. |
48 |
_OPTION_NODE_REFS = "node_ref_lists=" |
2592.1.4
by Robert Collins
Create a GraphIndexBuilder. |
49 |
_SIGNATURE = "Bazaar Graph Index 1\n" |
50 |
||
51 |
||
2592.1.14
by Robert Collins
Detect bad reference key values. |
52 |
_whitespace_re = re.compile('[\t\n\x0b\x0c\r\x00 ]') |
2592.1.12
by Robert Collins
Handle basic node adds. |
53 |
_newline_null_re = re.compile('[\n\0]') |
54 |
||
55 |
||
3830.3.12
by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks |
56 |
def _has_key_from_parent_map(self, key): |
57 |
"""Check if this index has one key.
|
|
58 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
59 |
If it's possible to check for multiple keys at once through
|
3830.3.12
by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks |
60 |
calling get_parent_map that should be faster.
|
61 |
"""
|
|
62 |
return (key in self.get_parent_map([key])) |
|
63 |
||
3830.3.20
by John Arbash Meinel
Minor PEP8 and copyright updates. |
64 |
|
3830.3.12
by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks |
65 |
def _missing_keys_from_parent_map(self, keys): |
66 |
return set(keys) - set(self.get_parent_map(keys)) |
|
67 |
||
68 |
||
2592.1.4
by Robert Collins
Create a GraphIndexBuilder. |
69 |
class GraphIndexBuilder(object): |
2592.1.18
by Robert Collins
Add space to mark absent nodes. |
70 |
"""A builder that can build a GraphIndex.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
71 |
|
2592.1.18
by Robert Collins
Add space to mark absent nodes. |
72 |
The resulting graph has the structure:
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
73 |
|
2592.1.18
by Robert Collins
Add space to mark absent nodes. |
74 |
_SIGNATURE OPTIONS NODES NEWLINE
|
75 |
_SIGNATURE := 'Bazaar Graph Index 1' NEWLINE
|
|
76 |
OPTIONS := 'node_ref_lists=' DIGITS NEWLINE
|
|
77 |
NODES := NODE*
|
|
78 |
NODE := KEY NULL ABSENT? NULL REFERENCES NULL VALUE NEWLINE
|
|
79 |
KEY := Not-whitespace-utf8
|
|
80 |
ABSENT := 'a'
|
|
2592.1.19
by Robert Collins
Node references are tab separated. |
81 |
REFERENCES := REFERENCE_LIST (TAB REFERENCE_LIST){node_ref_lists - 1}
|
82 |
REFERENCE_LIST := (REFERENCE (CR REFERENCE)*)?
|
|
83 |
REFERENCE := DIGITS ; digits is the byte offset in the index of the
|
|
84 |
; referenced key.
|
|
2592.1.18
by Robert Collins
Add space to mark absent nodes. |
85 |
VALUE := no-newline-no-null-bytes
|
86 |
"""
|
|
2592.1.4
by Robert Collins
Create a GraphIndexBuilder. |
87 |
|
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
88 |
def __init__(self, reference_lists=0, key_elements=1): |
2592.1.6
by Robert Collins
Record the number of node reference lists a particular index has. |
89 |
"""Create a GraphIndex builder.
|
90 |
||
91 |
:param reference_lists: The number of node references lists for each
|
|
92 |
entry.
|
|
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
93 |
:param key_elements: The number of bytestrings in each key.
|
2592.1.6
by Robert Collins
Record the number of node reference lists a particular index has. |
94 |
"""
|
95 |
self.reference_lists = reference_lists |
|
3644.2.1
by John Arbash Meinel
Change the IndexBuilders to not generate the nodes_by_key unless needed. |
96 |
# A dict of {key: (absent, ref_lists, value)}
|
2592.1.15
by Robert Collins
Detect duplicate key insertion. |
97 |
self._nodes = {} |
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
98 |
# Keys that are referenced but not actually present in this index
|
99 |
self._absent_keys = set() |
|
3644.2.1
by John Arbash Meinel
Change the IndexBuilders to not generate the nodes_by_key unless needed. |
100 |
self._nodes_by_key = None |
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
101 |
self._key_length = key_elements |
3777.5.3
by John Arbash Meinel
Add Builder.set_optimize(for_size=True) for GraphIndexBuilder and BTreeBuilder. |
102 |
self._optimize_for_size = False |
4168.3.6
by John Arbash Meinel
Add 'combine_backing_indices' as a flag for GraphIndex.set_optimize(). |
103 |
self._combine_backing_indices = True |
2624.2.5
by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings. |
104 |
|
105 |
def _check_key(self, key): |
|
106 |
"""Raise BadIndexKey if key is not a valid key for this index."""
|
|
4679.7.1
by John Arbash Meinel
Merge the 2.1-static-tuple-no-use branch, but restore the |
107 |
if type(key) not in (tuple, StaticTuple): |
2624.2.5
by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings. |
108 |
raise errors.BadIndexKey(key) |
109 |
if self._key_length != len(key): |
|
110 |
raise errors.BadIndexKey(key) |
|
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
111 |
for element in key: |
112 |
if not element or _whitespace_re.search(element) is not None: |
|
113 |
raise errors.BadIndexKey(element) |
|
2592.1.12
by Robert Collins
Handle basic node adds. |
114 |
|
3830.3.5
by Martin Pool
GraphIndexBuilder shouldn't know references are for compression so rename |
115 |
def _external_references(self): |
116 |
"""Return references that are not present in this index.
|
|
3830.3.4
by Martin Pool
Move _external_compression_references onto the GraphIndexBuilder, and check them for inventories too |
117 |
"""
|
118 |
keys = set() |
|
119 |
refs = set() |
|
3830.3.19
by John Arbash Meinel
Small update to GraphIndexBuilder._external_references |
120 |
# TODO: JAM 2008-11-21 This makes an assumption about how the reference
|
121 |
# lists are used. It is currently correct for pack-0.92 through
|
|
122 |
# 1.9, which use the node references (3rd column) second
|
|
123 |
# reference list as the compression parent. Perhaps this should
|
|
124 |
# be moved into something higher up the stack, since it
|
|
125 |
# makes assumptions about how the index is used.
|
|
126 |
if self.reference_lists > 1: |
|
127 |
for node in self.iter_all_entries(): |
|
128 |
keys.add(node[1]) |
|
129 |
refs.update(node[3][1]) |
|
130 |
return refs - keys |
|
131 |
else: |
|
132 |
# If reference_lists == 0 there can be no external references, and
|
|
133 |
# if reference_lists == 1, then there isn't a place to store the
|
|
134 |
# compression parent
|
|
135 |
return set() |
|
3830.3.4
by Martin Pool
Move _external_compression_references onto the GraphIndexBuilder, and check them for inventories too |
136 |
|
3644.2.4
by John Arbash Meinel
Change GraphIndex to also have a _get_nodes_by_key |
137 |
def _get_nodes_by_key(self): |
138 |
if self._nodes_by_key is None: |
|
139 |
nodes_by_key = {} |
|
140 |
if self.reference_lists: |
|
141 |
for key, (absent, references, value) in self._nodes.iteritems(): |
|
142 |
if absent: |
|
143 |
continue
|
|
144 |
key_dict = nodes_by_key |
|
145 |
for subkey in key[:-1]: |
|
146 |
key_dict = key_dict.setdefault(subkey, {}) |
|
147 |
key_dict[key[-1]] = key, value, references |
|
148 |
else: |
|
149 |
for key, (absent, references, value) in self._nodes.iteritems(): |
|
150 |
if absent: |
|
151 |
continue
|
|
152 |
key_dict = nodes_by_key |
|
153 |
for subkey in key[:-1]: |
|
154 |
key_dict = key_dict.setdefault(subkey, {}) |
|
155 |
key_dict[key[-1]] = key, value |
|
156 |
self._nodes_by_key = nodes_by_key |
|
157 |
return self._nodes_by_key |
|
158 |
||
3644.2.3
by John Arbash Meinel
Do a bit more work to get all the tests to pass. |
159 |
def _update_nodes_by_key(self, key, value, node_refs): |
160 |
"""Update the _nodes_by_key dict with a new key.
|
|
161 |
||
162 |
For a key of (foo, bar, baz) create
|
|
163 |
_nodes_by_key[foo][bar][baz] = key_value
|
|
164 |
"""
|
|
165 |
if self._nodes_by_key is None: |
|
166 |
return
|
|
167 |
key_dict = self._nodes_by_key |
|
168 |
if self.reference_lists: |
|
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
169 |
key_value = StaticTuple(key, value, node_refs) |
3644.2.3
by John Arbash Meinel
Do a bit more work to get all the tests to pass. |
170 |
else: |
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
171 |
key_value = StaticTuple(key, value) |
3644.2.3
by John Arbash Meinel
Do a bit more work to get all the tests to pass. |
172 |
for subkey in key[:-1]: |
173 |
key_dict = key_dict.setdefault(subkey, {}) |
|
174 |
key_dict[key[-1]] = key_value |
|
175 |
||
3644.2.9
by John Arbash Meinel
Refactor some code. |
176 |
def _check_key_ref_value(self, key, references, value): |
177 |
"""Check that 'key' and 'references' are all valid.
|
|
2592.1.12
by Robert Collins
Handle basic node adds. |
178 |
|
3644.2.9
by John Arbash Meinel
Refactor some code. |
179 |
:param key: A key tuple. Must conform to the key interface (be a tuple,
|
180 |
be of the right length, not have any whitespace or nulls in any key
|
|
181 |
element.)
|
|
182 |
:param references: An iterable of reference lists. Something like
|
|
183 |
[[(ref, key)], [(ref, key), (other, key)]]
|
|
184 |
:param value: The value associate with this key. Must not contain
|
|
185 |
newlines or null characters.
|
|
186 |
:return: (node_refs, absent_references)
|
|
187 |
node_refs basically a packed form of 'references' where all
|
|
188 |
iterables are tuples
|
|
189 |
absent_references reference keys that are not in self._nodes.
|
|
190 |
This may contain duplicates if the same key is
|
|
191 |
referenced in multiple lists.
|
|
2592.1.12
by Robert Collins
Handle basic node adds. |
192 |
"""
|
4789.28.1
by John Arbash Meinel
Use StaticTuple as part of the builder process. |
193 |
as_st = StaticTuple.from_sequence |
2624.2.5
by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings. |
194 |
self._check_key(key) |
2592.1.12
by Robert Collins
Handle basic node adds. |
195 |
if _newline_null_re.search(value) is not None: |
196 |
raise errors.BadIndexValue(value) |
|
2592.1.13
by Robert Collins
Handle mismatched numbers of reference lists. |
197 |
if len(references) != self.reference_lists: |
198 |
raise errors.BadIndexValue(references) |
|
2592.1.38
by Robert Collins
Create an InMemoryGraphIndex for temporary indexing. |
199 |
node_refs = [] |
3644.2.9
by John Arbash Meinel
Refactor some code. |
200 |
absent_references = [] |
2592.1.14
by Robert Collins
Detect bad reference key values. |
201 |
for reference_list in references: |
202 |
for reference in reference_list: |
|
3644.2.9
by John Arbash Meinel
Refactor some code. |
203 |
# If reference *is* in self._nodes, then we know it has already
|
204 |
# been checked.
|
|
2592.1.25
by Robert Collins
Fix and tune node offset calculation. |
205 |
if reference not in self._nodes: |
3644.2.9
by John Arbash Meinel
Refactor some code. |
206 |
self._check_key(reference) |
207 |
absent_references.append(reference) |
|
4789.28.1
by John Arbash Meinel
Use StaticTuple as part of the builder process. |
208 |
node_refs.append(as_st(reference_list)) |
209 |
return as_st(node_refs), absent_references |
|
3644.2.9
by John Arbash Meinel
Refactor some code. |
210 |
|
211 |
def add_node(self, key, value, references=()): |
|
212 |
"""Add a node to the index.
|
|
213 |
||
214 |
:param key: The key. keys are non-empty tuples containing
|
|
215 |
as many whitespace-free utf8 bytestrings as the key length
|
|
216 |
defined for this index.
|
|
217 |
:param references: An iterable of iterables of keys. Each is a
|
|
218 |
reference to another key.
|
|
219 |
:param value: The value to associate with the key. It may be any
|
|
220 |
bytes as long as it does not contain \0 or \n.
|
|
221 |
"""
|
|
222 |
(node_refs, |
|
223 |
absent_references) = self._check_key_ref_value(key, references, value) |
|
224 |
if key in self._nodes and self._nodes[key][0] != 'a': |
|
2592.1.15
by Robert Collins
Detect duplicate key insertion. |
225 |
raise errors.BadIndexDuplicateKey(key, self) |
3644.2.9
by John Arbash Meinel
Refactor some code. |
226 |
for reference in absent_references: |
227 |
# There may be duplicates, but I don't think it is worth worrying
|
|
228 |
# about
|
|
229 |
self._nodes[reference] = ('a', (), '') |
|
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
230 |
self._absent_keys.update(absent_references) |
231 |
self._absent_keys.discard(key) |
|
3644.2.3
by John Arbash Meinel
Do a bit more work to get all the tests to pass. |
232 |
self._nodes[key] = ('', node_refs, value) |
3644.2.9
by John Arbash Meinel
Refactor some code. |
233 |
if self._nodes_by_key is not None and self._key_length > 1: |
3644.2.3
by John Arbash Meinel
Do a bit more work to get all the tests to pass. |
234 |
self._update_nodes_by_key(key, value, node_refs) |
2592.1.6
by Robert Collins
Record the number of node reference lists a particular index has. |
235 |
|
4744.2.7
by John Arbash Meinel
Add .clear_cache() members to GraphIndexBuilder and BTreeBuilder. |
236 |
def clear_cache(self): |
237 |
"""See GraphIndex.clear_cache()
|
|
238 |
||
239 |
This is a no-op, but we need the api to conform to a generic 'Index'
|
|
240 |
abstraction.
|
|
241 |
"""
|
|
242 |
||
2592.1.4
by Robert Collins
Create a GraphIndexBuilder. |
243 |
def finish(self): |
2592.1.6
by Robert Collins
Record the number of node reference lists a particular index has. |
244 |
lines = [_SIGNATURE] |
245 |
lines.append(_OPTION_NODE_REFS + str(self.reference_lists) + '\n') |
|
2624.2.8
by Robert Collins
Explicitly mark the number of keys elements in use in GraphIndex files. |
246 |
lines.append(_OPTION_KEY_ELEMENTS + str(self._key_length) + '\n') |
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
247 |
key_count = len(self._nodes) - len(self._absent_keys) |
248 |
lines.append(_OPTION_LEN + str(key_count) + '\n') |
|
2624.2.11
by Robert Collins
Review comments. |
249 |
prefix_length = sum(len(x) for x in lines) |
2592.1.22
by Robert Collins
Node references are byte offsets. |
250 |
# references are byte offsets. To avoid having to do nasty
|
3644.2.9
by John Arbash Meinel
Refactor some code. |
251 |
# polynomial work to resolve offsets (references to later in the
|
2592.1.22
by Robert Collins
Node references are byte offsets. |
252 |
# file cannot be determined until all the inbetween references have
|
253 |
# been calculated too) we pad the offsets with 0's to make them be
|
|
254 |
# of consistent length. Using binary offsets would break the trivial
|
|
255 |
# file parsing.
|
|
256 |
# to calculate the width of zero's needed we do three passes:
|
|
257 |
# one to gather all the non-reference data and the number of references.
|
|
258 |
# one to pad all the data with reference-length and determine entry
|
|
259 |
# addresses.
|
|
260 |
# One to serialise.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
261 |
|
2592.1.40
by Robert Collins
Reverse index ordering - we do not have date prefixed revids. |
262 |
# forward sorted by key. In future we may consider topological sorting,
|
263 |
# at the cost of table scans for direct lookup, or a second index for
|
|
264 |
# direct lookup
|
|
265 |
nodes = sorted(self._nodes.items()) |
|
2592.1.42
by Robert Collins
Check the index length is as expected, when we have done preprocessing. |
266 |
# if we do not prepass, we don't know how long it will be up front.
|
267 |
expected_bytes = None |
|
2592.1.25
by Robert Collins
Fix and tune node offset calculation. |
268 |
# we only need to pre-pass if we have reference lists at all.
|
269 |
if self.reference_lists: |
|
2592.1.41
by Robert Collins
Remove duplication in the index serialisation logic with John's suggestion. |
270 |
key_offset_info = [] |
2592.1.25
by Robert Collins
Fix and tune node offset calculation. |
271 |
non_ref_bytes = prefix_length |
272 |
total_references = 0 |
|
273 |
# TODO use simple multiplication for the constants in this loop.
|
|
274 |
for key, (absent, references, value) in nodes: |
|
2592.1.41
by Robert Collins
Remove duplication in the index serialisation logic with John's suggestion. |
275 |
# record the offset known *so far* for this key:
|
276 |
# the non reference bytes to date, and the total references to
|
|
277 |
# date - saves reaccumulating on the second pass
|
|
278 |
key_offset_info.append((key, non_ref_bytes, total_references)) |
|
2592.1.25
by Robert Collins
Fix and tune node offset calculation. |
279 |
# key is literal, value is literal, there are 3 null's, 1 NL
|
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
280 |
# key is variable length tuple, \x00 between elements
|
2624.2.5
by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings. |
281 |
non_ref_bytes += sum(len(element) for element in key) |
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
282 |
if self._key_length > 1: |
283 |
non_ref_bytes += self._key_length - 1 |
|
2624.2.5
by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings. |
284 |
# value is literal bytes, there are 3 null's, 1 NL.
|
285 |
non_ref_bytes += len(value) + 3 + 1 |
|
2592.1.25
by Robert Collins
Fix and tune node offset calculation. |
286 |
# one byte for absent if set.
|
287 |
if absent: |
|
288 |
non_ref_bytes += 1 |
|
2592.1.36
by Robert Collins
Bugfix incorrect offset generation when an absent record is before a referenced record. |
289 |
elif self.reference_lists: |
2592.1.25
by Robert Collins
Fix and tune node offset calculation. |
290 |
# (ref_lists -1) tabs
|
291 |
non_ref_bytes += self.reference_lists - 1 |
|
292 |
# (ref-1 cr's per ref_list)
|
|
293 |
for ref_list in references: |
|
294 |
# how many references across the whole file?
|
|
295 |
total_references += len(ref_list) |
|
296 |
# accrue reference separators
|
|
297 |
if ref_list: |
|
298 |
non_ref_bytes += len(ref_list) - 1 |
|
299 |
# how many digits are needed to represent the total byte count?
|
|
300 |
digits = 1 |
|
2592.1.22
by Robert Collins
Node references are byte offsets. |
301 |
possible_total_bytes = non_ref_bytes + total_references*digits |
2592.1.25
by Robert Collins
Fix and tune node offset calculation. |
302 |
while 10 ** digits < possible_total_bytes: |
303 |
digits += 1 |
|
304 |
possible_total_bytes = non_ref_bytes + total_references*digits |
|
2592.1.42
by Robert Collins
Check the index length is as expected, when we have done preprocessing. |
305 |
expected_bytes = possible_total_bytes + 1 # terminating newline |
2592.1.25
by Robert Collins
Fix and tune node offset calculation. |
306 |
# resolve key addresses.
|
307 |
key_addresses = {} |
|
2592.1.41
by Robert Collins
Remove duplication in the index serialisation logic with John's suggestion. |
308 |
for key, non_ref_bytes, total_references in key_offset_info: |
309 |
key_addresses[key] = non_ref_bytes + total_references*digits |
|
2592.1.25
by Robert Collins
Fix and tune node offset calculation. |
310 |
# serialise
|
311 |
format_string = '%%0%sd' % digits |
|
312 |
for key, (absent, references, value) in nodes: |
|
2592.1.19
by Robert Collins
Node references are tab separated. |
313 |
flattened_references = [] |
314 |
for ref_list in references: |
|
2592.1.22
by Robert Collins
Node references are byte offsets. |
315 |
ref_addresses = [] |
316 |
for reference in ref_list: |
|
317 |
ref_addresses.append(format_string % key_addresses[reference]) |
|
318 |
flattened_references.append('\r'.join(ref_addresses)) |
|
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
319 |
string_key = '\x00'.join(key) |
2624.2.11
by Robert Collins
Review comments. |
320 |
lines.append("%s\x00%s\x00%s\x00%s\n" % (string_key, absent, |
2592.1.19
by Robert Collins
Node references are tab separated. |
321 |
'\t'.join(flattened_references), value)) |
2592.1.6
by Robert Collins
Record the number of node reference lists a particular index has. |
322 |
lines.append('\n') |
2592.1.42
by Robert Collins
Check the index length is as expected, when we have done preprocessing. |
323 |
result = StringIO(''.join(lines)) |
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
324 |
if expected_bytes and len(result.getvalue()) != expected_bytes: |
325 |
raise errors.BzrError('Failed index creation. Internal error:' |
|
326 |
' mismatched output length and expected length: %d %d' % |
|
327 |
(len(result.getvalue()), expected_bytes)) |
|
3498.1.1
by James Westby
Don't join the lines of the index twice. |
328 |
return result |
2592.1.5
by Robert Collins
Trivial index reading. |
329 |
|
4168.3.6
by John Arbash Meinel
Add 'combine_backing_indices' as a flag for GraphIndex.set_optimize(). |
330 |
def set_optimize(self, for_size=None, combine_backing_indices=None): |
3777.5.3
by John Arbash Meinel
Add Builder.set_optimize(for_size=True) for GraphIndexBuilder and BTreeBuilder. |
331 |
"""Change how the builder tries to optimize the result.
|
332 |
||
333 |
:param for_size: Tell the builder to try and make the index as small as
|
|
334 |
possible.
|
|
4168.3.6
by John Arbash Meinel
Add 'combine_backing_indices' as a flag for GraphIndex.set_optimize(). |
335 |
:param combine_backing_indices: If the builder spills to disk to save
|
336 |
memory, should the on-disk indices be combined. Set to True if you
|
|
337 |
are going to be probing the index, but to False if you are not. (If
|
|
338 |
you are not querying, then the time spent combining is wasted.)
|
|
3777.5.3
by John Arbash Meinel
Add Builder.set_optimize(for_size=True) for GraphIndexBuilder and BTreeBuilder. |
339 |
:return: None
|
340 |
"""
|
|
341 |
# GraphIndexBuilder itself doesn't pay attention to the flag yet, but
|
|
342 |
# other builders do.
|
|
4168.3.6
by John Arbash Meinel
Add 'combine_backing_indices' as a flag for GraphIndex.set_optimize(). |
343 |
if for_size is not None: |
344 |
self._optimize_for_size = for_size |
|
345 |
if combine_backing_indices is not None: |
|
346 |
self._combine_backing_indices = combine_backing_indices |
|
3777.5.3
by John Arbash Meinel
Add Builder.set_optimize(for_size=True) for GraphIndexBuilder and BTreeBuilder. |
347 |
|
4593.5.37
by John Arbash Meinel
Finish implementation tests. |
348 |
def find_ancestry(self, keys, ref_list_num): |
349 |
"""See CombinedGraphIndex.find_ancestry()"""
|
|
350 |
pending = set(keys) |
|
351 |
parent_map = {} |
|
352 |
missing_keys = set() |
|
353 |
while pending: |
|
354 |
next_pending = set() |
|
355 |
for _, key, value, ref_lists in self.iter_entries(pending): |
|
356 |
parent_keys = ref_lists[ref_list_num] |
|
357 |
parent_map[key] = parent_keys |
|
358 |
next_pending.update([p for p in parent_keys if p not in |
|
359 |
parent_map]) |
|
360 |
missing_keys.update(pending.difference(parent_map)) |
|
361 |
pending = next_pending |
|
362 |
return parent_map, missing_keys |
|
363 |
||
2592.1.5
by Robert Collins
Trivial index reading. |
364 |
|
365 |
class GraphIndex(object): |
|
366 |
"""An index for data with embedded graphs.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
367 |
|
2592.1.10
by Robert Collins
Make validate detect node reference parsing errors. |
368 |
The index maps keys to a list of key reference lists, and a value.
|
369 |
Each node has the same number of key reference lists. Each key reference
|
|
370 |
list can be empty or an arbitrary length. The value is an opaque NULL
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
371 |
terminated string without any newlines. The storage of the index is
|
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
372 |
hidden in the interface: keys and key references are always tuples of
|
373 |
bytestrings, never the internal representation (e.g. dictionary offsets).
|
|
2592.1.30
by Robert Collins
Absent entries are not yeilded. |
374 |
|
375 |
It is presumed that the index will not be mutated - it is static data.
|
|
2592.1.34
by Robert Collins
Cleanup docs. |
376 |
|
2592.1.44
by Robert Collins
Remove some unneeded index iteration by checking if we have found all keys, and grammar improvements from Aaron's review. |
377 |
Successive iter_all_entries calls will read the entire index each time.
|
378 |
Additionally, iter_entries calls will read the index linearly until the
|
|
379 |
desired keys are found. XXX: This must be fixed before the index is
|
|
2592.1.34
by Robert Collins
Cleanup docs. |
380 |
suitable for production use. :XXX
|
2592.1.5
by Robert Collins
Trivial index reading. |
381 |
"""
|
382 |
||
4634.71.1
by John Arbash Meinel
Work around bug #402623 by allowing BTreeGraphIndex(...,unlimited_cache=True). |
383 |
def __init__(self, transport, name, size, unlimited_cache=False): |
2592.1.5
by Robert Collins
Trivial index reading. |
384 |
"""Open an index called name on transport.
|
385 |
||
386 |
:param transport: A bzrlib.transport.Transport.
|
|
387 |
:param name: A path to provide to transport API calls.
|
|
2890.2.1
by Robert Collins
* ``bzrlib.index.GraphIndex`` now requires a size parameter to the |
388 |
:param size: The size of the index in bytes. This is used for bisection
|
389 |
logic to perform partial index reads. While the size could be
|
|
390 |
obtained by statting the file this introduced an additional round
|
|
2890.2.8
by Robert Collins
Make the size of the index optionally None for the pack-names index. |
391 |
trip as well as requiring stat'able transports, both of which are
|
392 |
avoided by having it supplied. If size is None, then bisection
|
|
393 |
support will be disabled and accessing the index will just stream
|
|
394 |
all the data.
|
|
2592.1.5
by Robert Collins
Trivial index reading. |
395 |
"""
|
396 |
self._transport = transport |
|
397 |
self._name = name |
|
2890.2.16
by Robert Collins
Review feedback. |
398 |
# Becomes a dict of key:(value, reference-list-byte-locations) used by
|
399 |
# the bisection interface to store parsed but not resolved keys.
|
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
400 |
self._bisect_nodes = None |
2890.2.16
by Robert Collins
Review feedback. |
401 |
# Becomes a dict of key:(value, reference-list-keys) which are ready to
|
402 |
# be returned directly to callers.
|
|
2624.2.2
by Robert Collins
Temporary performance hack for GraphIndex : load the entire index once and only once into ram. |
403 |
self._nodes = None |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
404 |
# a sorted list of slice-addresses for the parsed bytes of the file.
|
405 |
# e.g. (0,1) would mean that byte 0 is parsed.
|
|
2890.2.2
by Robert Collins
Opening an index creates a map for the parsed bytes. |
406 |
self._parsed_byte_map = [] |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
407 |
# a sorted list of keys matching each slice address for parsed bytes
|
408 |
# e.g. (None, 'foo@bar') would mean that the first byte contained no
|
|
409 |
# key, and the end byte of the slice is the of the data for 'foo@bar'
|
|
410 |
self._parsed_key_map = [] |
|
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
411 |
self._key_count = None |
2624.2.2
by Robert Collins
Temporary performance hack for GraphIndex : load the entire index once and only once into ram. |
412 |
self._keys_by_offset = None |
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
413 |
self._nodes_by_key = None |
2890.2.1
by Robert Collins
* ``bzrlib.index.GraphIndex`` now requires a size parameter to the |
414 |
self._size = size |
3665.3.3
by John Arbash Meinel
If we read more than 50% of the whole index, |
415 |
# The number of bytes we've read so far in trying to process this file
|
416 |
self._bytes_read = 0 |
|
2624.2.2
by Robert Collins
Temporary performance hack for GraphIndex : load the entire index once and only once into ram. |
417 |
|
2592.3.176
by Robert Collins
Various pack refactorings. |
418 |
def __eq__(self, other): |
2592.3.215
by Robert Collins
Review feedback. |
419 |
"""Equal when self and other were created with the same parameters."""
|
2592.3.176
by Robert Collins
Various pack refactorings. |
420 |
return ( |
421 |
type(self) == type(other) and |
|
422 |
self._transport == other._transport and |
|
423 |
self._name == other._name and |
|
424 |
self._size == other._size) |
|
425 |
||
426 |
def __ne__(self, other): |
|
427 |
return not self.__eq__(other) |
|
428 |
||
3517.4.13
by Martin Pool
Add repr methods |
429 |
def __repr__(self): |
430 |
return "%s(%r)" % (self.__class__.__name__, |
|
431 |
self._transport.abspath(self._name)) |
|
432 |
||
3665.3.1
by John Arbash Meinel
Updates to GraphIndex processing. |
433 |
def _buffer_all(self, stream=None): |
2624.2.2
by Robert Collins
Temporary performance hack for GraphIndex : load the entire index once and only once into ram. |
434 |
"""Buffer all the index data.
|
435 |
||
436 |
Mutates self._nodes and self.keys_by_offset.
|
|
2592.1.5
by Robert Collins
Trivial index reading. |
437 |
"""
|
3665.3.1
by John Arbash Meinel
Updates to GraphIndex processing. |
438 |
if self._nodes is not None: |
439 |
# We already did this
|
|
440 |
return
|
|
2624.2.15
by Robert Collins
Add useful -Dindex flag. |
441 |
if 'index' in debug.debug_flags: |
442 |
mutter('Reading entire index %s', self._transport.abspath(self._name)) |
|
3665.3.1
by John Arbash Meinel
Updates to GraphIndex processing. |
443 |
if stream is None: |
444 |
stream = self._transport.get(self._name) |
|
2592.1.27
by Robert Collins
Test missing end lines with non-empty indices. |
445 |
self._read_prefix(stream) |
2890.2.17
by Robert Collins
Split _parse_segment out into a _parse_lines helper, reducing duplication with full index parsing. |
446 |
self._expected_elements = 3 + self._key_length |
2592.1.27
by Robert Collins
Test missing end lines with non-empty indices. |
447 |
line_count = 0 |
2624.2.2
by Robert Collins
Temporary performance hack for GraphIndex : load the entire index once and only once into ram. |
448 |
# raw data keyed by offset
|
449 |
self._keys_by_offset = {} |
|
450 |
# ready-to-return key:value or key:value, node_ref_lists
|
|
451 |
self._nodes = {} |
|
3711.3.13
by John Arbash Meinel
Shave off another 5s by not building 'node_by_key' |
452 |
self._nodes_by_key = None |
2592.1.27
by Robert Collins
Test missing end lines with non-empty indices. |
453 |
trailers = 0 |
454 |
pos = stream.tell() |
|
2890.2.17
by Robert Collins
Split _parse_segment out into a _parse_lines helper, reducing duplication with full index parsing. |
455 |
lines = stream.read().split('\n') |
456 |
del lines[-1] |
|
457 |
_, _, _, trailers = self._parse_lines(lines, pos) |
|
2624.2.2
by Robert Collins
Temporary performance hack for GraphIndex : load the entire index once and only once into ram. |
458 |
for key, absent, references, value in self._keys_by_offset.itervalues(): |
2592.1.30
by Robert Collins
Absent entries are not yeilded. |
459 |
if absent: |
460 |
continue
|
|
2592.1.28
by Robert Collins
Basic two pass iter_all_entries. |
461 |
# resolve references:
|
462 |
if self.node_ref_lists: |
|
2890.2.17
by Robert Collins
Split _parse_segment out into a _parse_lines helper, reducing duplication with full index parsing. |
463 |
node_value = (value, self._resolve_references(references)) |
2592.1.28
by Robert Collins
Basic two pass iter_all_entries. |
464 |
else: |
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
465 |
node_value = value |
466 |
self._nodes[key] = node_value |
|
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
467 |
# cache the keys for quick set intersections
|
2592.1.27
by Robert Collins
Test missing end lines with non-empty indices. |
468 |
if trailers != 1: |
469 |
# there must be one line - the empty trailer line.
|
|
470 |
raise errors.BadIndexData(self) |
|
471 |
||
4744.2.6
by John Arbash Meinel
Start exposing an GraphIndex.clear_cache() member. |
472 |
def clear_cache(self): |
473 |
"""Clear out any cached/memoized values.
|
|
474 |
||
475 |
This can be called at any time, but generally it is used when we have
|
|
476 |
extracted some information, but don't expect to be requesting any more
|
|
477 |
from this index.
|
|
478 |
"""
|
|
479 |
||
4011.5.11
by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api. |
480 |
def external_references(self, ref_list_num): |
4011.5.2
by Andrew Bennetts
Add more tests, improve existing tests, add GraphIndex._external_references() |
481 |
"""Return references that are not present in this index.
|
482 |
"""
|
|
483 |
self._buffer_all() |
|
4011.5.3
by Andrew Bennetts
Implement and test external_references on GraphIndex and BTreeGraphIndex. |
484 |
if ref_list_num + 1 > self.node_ref_lists: |
485 |
raise ValueError('No ref list %d, index has %d ref lists' |
|
486 |
% (ref_list_num, self.node_ref_lists)) |
|
4011.5.2
by Andrew Bennetts
Add more tests, improve existing tests, add GraphIndex._external_references() |
487 |
refs = set() |
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
488 |
nodes = self._nodes |
489 |
for key, (value, ref_lists) in nodes.iteritems(): |
|
4011.5.2
by Andrew Bennetts
Add more tests, improve existing tests, add GraphIndex._external_references() |
490 |
ref_list = ref_lists[ref_list_num] |
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
491 |
refs.update([ref for ref in ref_list if ref not in nodes]) |
492 |
return refs |
|
4011.5.2
by Andrew Bennetts
Add more tests, improve existing tests, add GraphIndex._external_references() |
493 |
|
3711.3.21
by John Arbash Meinel
Fix GraphIndex to properly generate _nodes_by_keys on demand. |
494 |
def _get_nodes_by_key(self): |
495 |
if self._nodes_by_key is None: |
|
496 |
nodes_by_key = {} |
|
497 |
if self.node_ref_lists: |
|
498 |
for key, (value, references) in self._nodes.iteritems(): |
|
499 |
key_dict = nodes_by_key |
|
500 |
for subkey in key[:-1]: |
|
501 |
key_dict = key_dict.setdefault(subkey, {}) |
|
502 |
key_dict[key[-1]] = key, value, references |
|
503 |
else: |
|
504 |
for key, value in self._nodes.iteritems(): |
|
505 |
key_dict = nodes_by_key |
|
506 |
for subkey in key[:-1]: |
|
507 |
key_dict = key_dict.setdefault(subkey, {}) |
|
508 |
key_dict[key[-1]] = key, value |
|
509 |
self._nodes_by_key = nodes_by_key |
|
510 |
return self._nodes_by_key |
|
511 |
||
2624.2.2
by Robert Collins
Temporary performance hack for GraphIndex : load the entire index once and only once into ram. |
512 |
def iter_all_entries(self): |
513 |
"""Iterate over all keys within the index.
|
|
514 |
||
2592.5.1
by Martin Pool
Fix docstrings for Index.iter_entries etc |
515 |
:return: An iterable of (index, key, value) or (index, key, value, reference_lists).
|
2624.2.2
by Robert Collins
Temporary performance hack for GraphIndex : load the entire index once and only once into ram. |
516 |
The former tuple is used when there are no reference lists in the
|
517 |
index, making the API compatible with simple key:value index types.
|
|
518 |
There is no defined order for the result iteration - it will be in
|
|
519 |
the most efficient order for the index.
|
|
520 |
"""
|
|
2745.1.1
by Robert Collins
Add a number of -Devil checkpoints. |
521 |
if 'evil' in debug.debug_flags: |
2592.3.112
by Robert Collins
Various fixups found dogfooding. |
522 |
trace.mutter_callsite(3, |
2745.1.2
by Robert Collins
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly. |
523 |
"iter_all_entries scales with size of history.") |
2624.2.2
by Robert Collins
Temporary performance hack for GraphIndex : load the entire index once and only once into ram. |
524 |
if self._nodes is None: |
525 |
self._buffer_all() |
|
526 |
if self.node_ref_lists: |
|
527 |
for key, (value, node_ref_lists) in self._nodes.iteritems(): |
|
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
528 |
yield self, key, value, node_ref_lists |
2624.2.2
by Robert Collins
Temporary performance hack for GraphIndex : load the entire index once and only once into ram. |
529 |
else: |
530 |
for key, value in self._nodes.iteritems(): |
|
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
531 |
yield self, key, value |
2624.2.2
by Robert Collins
Temporary performance hack for GraphIndex : load the entire index once and only once into ram. |
532 |
|
2592.1.27
by Robert Collins
Test missing end lines with non-empty indices. |
533 |
def _read_prefix(self, stream): |
534 |
signature = stream.read(len(self._signature())) |
|
535 |
if not signature == self._signature(): |
|
536 |
raise errors.BadIndexFormatSignature(self._name, GraphIndex) |
|
537 |
options_line = stream.readline() |
|
538 |
if not options_line.startswith(_OPTION_NODE_REFS): |
|
539 |
raise errors.BadIndexOptions(self) |
|
540 |
try: |
|
541 |
self.node_ref_lists = int(options_line[len(_OPTION_NODE_REFS):-1]) |
|
542 |
except ValueError: |
|
543 |
raise errors.BadIndexOptions(self) |
|
2624.2.8
by Robert Collins
Explicitly mark the number of keys elements in use in GraphIndex files. |
544 |
options_line = stream.readline() |
545 |
if not options_line.startswith(_OPTION_KEY_ELEMENTS): |
|
546 |
raise errors.BadIndexOptions(self) |
|
547 |
try: |
|
548 |
self._key_length = int(options_line[len(_OPTION_KEY_ELEMENTS):-1]) |
|
549 |
except ValueError: |
|
550 |
raise errors.BadIndexOptions(self) |
|
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
551 |
options_line = stream.readline() |
552 |
if not options_line.startswith(_OPTION_LEN): |
|
553 |
raise errors.BadIndexOptions(self) |
|
554 |
try: |
|
555 |
self._key_count = int(options_line[len(_OPTION_LEN):-1]) |
|
556 |
except ValueError: |
|
557 |
raise errors.BadIndexOptions(self) |
|
2592.1.5
by Robert Collins
Trivial index reading. |
558 |
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
559 |
def _resolve_references(self, references): |
2890.2.16
by Robert Collins
Review feedback. |
560 |
"""Return the resolved key references for references.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
561 |
|
2890.2.16
by Robert Collins
Review feedback. |
562 |
References are resolved by looking up the location of the key in the
|
563 |
_keys_by_offset map and substituting the key name, preserving ordering.
|
|
564 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
565 |
:param references: An iterable of iterables of key locations. e.g.
|
2890.2.16
by Robert Collins
Review feedback. |
566 |
[[123, 456], [123]]
|
567 |
:return: A tuple of tuples of keys.
|
|
568 |
"""
|
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
569 |
node_refs = [] |
570 |
for ref_list in references: |
|
571 |
node_refs.append(tuple([self._keys_by_offset[ref][0] for ref in ref_list])) |
|
572 |
return tuple(node_refs) |
|
573 |
||
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
574 |
def _find_index(self, range_map, key): |
575 |
"""Helper for the _parsed_*_index calls.
|
|
576 |
||
577 |
Given a range map - [(start, end), ...], finds the index of the range
|
|
578 |
in the map for key if it is in the map, and if it is not there, the
|
|
579 |
immediately preceeding range in the map.
|
|
580 |
"""
|
|
581 |
result = bisect_right(range_map, key) - 1 |
|
582 |
if result + 1 < len(range_map): |
|
583 |
# check the border condition, it may be in result + 1
|
|
584 |
if range_map[result + 1][0] == key[0]: |
|
585 |
return result + 1 |
|
586 |
return result |
|
587 |
||
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
588 |
def _parsed_byte_index(self, offset): |
589 |
"""Return the index of the entry immediately before offset.
|
|
590 |
||
591 |
e.g. if the parsed map has regions 0,10 and 11,12 parsed, meaning that
|
|
592 |
there is one unparsed byte (the 11th, addressed as[10]). then:
|
|
593 |
asking for 0 will return 0
|
|
594 |
asking for 10 will return 0
|
|
595 |
asking for 11 will return 1
|
|
596 |
asking for 12 will return 1
|
|
597 |
"""
|
|
598 |
key = (offset, 0) |
|
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
599 |
return self._find_index(self._parsed_byte_map, key) |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
600 |
|
601 |
def _parsed_key_index(self, key): |
|
602 |
"""Return the index of the entry immediately before key.
|
|
603 |
||
604 |
e.g. if the parsed map has regions (None, 'a') and ('b','c') parsed,
|
|
605 |
meaning that keys from None to 'a' inclusive, and 'b' to 'c' inclusive
|
|
606 |
have been parsed, then:
|
|
607 |
asking for '' will return 0
|
|
608 |
asking for 'a' will return 0
|
|
609 |
asking for 'b' will return 1
|
|
610 |
asking for 'e' will return 1
|
|
611 |
"""
|
|
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
612 |
search_key = (key, None) |
613 |
return self._find_index(self._parsed_key_map, search_key) |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
614 |
|
615 |
def _is_parsed(self, offset): |
|
616 |
"""Returns True if offset has been parsed."""
|
|
617 |
index = self._parsed_byte_index(offset) |
|
618 |
if index == len(self._parsed_byte_map): |
|
619 |
return offset < self._parsed_byte_map[index - 1][1] |
|
620 |
start, end = self._parsed_byte_map[index] |
|
621 |
return offset >= start and offset < end |
|
622 |
||
2890.2.7
by Robert Collins
* Pack indices are now partially parsed for specific key lookup using a |
623 |
def _iter_entries_from_total_buffer(self, keys): |
624 |
"""Iterate over keys when the entire index is parsed."""
|
|
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
625 |
# Note: See the note in BTreeBuilder.iter_entries for why we don't use
|
626 |
# .intersection() here
|
|
627 |
nodes = self._nodes |
|
628 |
keys = [key for key in keys if key in nodes] |
|
2624.2.3
by Robert Collins
Make GraphIndex.iter_entries do hash lookups rather than table scans. |
629 |
if self.node_ref_lists: |
630 |
for key in keys: |
|
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
631 |
value, node_refs = nodes[key] |
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
632 |
yield self, key, value, node_refs |
2624.2.3
by Robert Collins
Make GraphIndex.iter_entries do hash lookups rather than table scans. |
633 |
else: |
634 |
for key in keys: |
|
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
635 |
yield self, key, nodes[key] |
2592.1.7
by Robert Collins
A validate that goes boom. |
636 |
|
2890.2.7
by Robert Collins
* Pack indices are now partially parsed for specific key lookup using a |
637 |
def iter_entries(self, keys): |
638 |
"""Iterate over keys within the index.
|
|
639 |
||
640 |
:param keys: An iterable providing the keys to be retrieved.
|
|
641 |
:return: An iterable as per iter_all_entries, but restricted to the
|
|
642 |
keys supplied. No additional keys will be returned, and every
|
|
643 |
key supplied that is in the index will be returned.
|
|
644 |
"""
|
|
645 |
keys = set(keys) |
|
646 |
if not keys: |
|
647 |
return [] |
|
2890.2.8
by Robert Collins
Make the size of the index optionally None for the pack-names index. |
648 |
if self._size is None and self._nodes is None: |
649 |
self._buffer_all() |
|
3665.3.3
by John Arbash Meinel
If we read more than 50% of the whole index, |
650 |
|
3606.6.1
by Robert Collins
Cherry-pick Robert's index buffering. |
651 |
# We fit about 20 keys per minimum-read (4K), so if we are looking for
|
652 |
# more than 1/20th of the index its likely (assuming homogenous key
|
|
653 |
# spread) that we'll read the entire index. If we're going to do that,
|
|
654 |
# buffer the whole thing. A better analysis might take key spread into
|
|
655 |
# account - but B+Tree indices are better anyway.
|
|
656 |
# We could look at all data read, and use a threshold there, which will
|
|
657 |
# trigger on ancestry walks, but that is not yet fully mapped out.
|
|
658 |
if self._nodes is None and len(keys) * 20 > self.key_count(): |
|
659 |
self._buffer_all() |
|
2890.2.7
by Robert Collins
* Pack indices are now partially parsed for specific key lookup using a |
660 |
if self._nodes is not None: |
661 |
return self._iter_entries_from_total_buffer(keys) |
|
662 |
else: |
|
663 |
return (result[1] for result in bisect_multi_bytes( |
|
2890.2.18
by Robert Collins
Review feedback. |
664 |
self._lookup_keys_via_location, self._size, keys)) |
2890.2.7
by Robert Collins
* Pack indices are now partially parsed for specific key lookup using a |
665 |
|
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
666 |
def iter_entries_prefix(self, keys): |
667 |
"""Iterate over keys within the index using prefix matching.
|
|
668 |
||
669 |
Prefix matching is applied within the tuple of a key, not to within
|
|
670 |
the bytestring of each key element. e.g. if you have the keys ('foo',
|
|
671 |
'bar'), ('foobar', 'gam') and do a prefix search for ('foo', None) then
|
|
672 |
only the former key is returned.
|
|
673 |
||
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
674 |
WARNING: Note that this method currently causes a full index parse
|
675 |
unconditionally (which is reasonably appropriate as it is a means for
|
|
676 |
thunking many small indices into one larger one and still supplies
|
|
677 |
iter_all_entries at the thunk layer).
|
|
678 |
||
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
679 |
:param keys: An iterable providing the key prefixes to be retrieved.
|
680 |
Each key prefix takes the form of a tuple the length of a key, but
|
|
681 |
with the last N elements 'None' rather than a regular bytestring.
|
|
682 |
The first element cannot be 'None'.
|
|
683 |
:return: An iterable as per iter_all_entries, but restricted to the
|
|
684 |
keys with a matching prefix to those supplied. No additional keys
|
|
685 |
will be returned, and every match that is in the index will be
|
|
686 |
returned.
|
|
687 |
"""
|
|
688 |
keys = set(keys) |
|
689 |
if not keys: |
|
690 |
return
|
|
691 |
# load data - also finds key lengths
|
|
692 |
if self._nodes is None: |
|
693 |
self._buffer_all() |
|
694 |
if self._key_length == 1: |
|
695 |
for key in keys: |
|
696 |
# sanity check
|
|
697 |
if key[0] is None: |
|
698 |
raise errors.BadIndexKey(key) |
|
699 |
if len(key) != self._key_length: |
|
700 |
raise errors.BadIndexKey(key) |
|
701 |
if self.node_ref_lists: |
|
702 |
value, node_refs = self._nodes[key] |
|
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
703 |
yield self, key, value, node_refs |
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
704 |
else: |
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
705 |
yield self, key, self._nodes[key] |
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
706 |
return
|
3711.3.21
by John Arbash Meinel
Fix GraphIndex to properly generate _nodes_by_keys on demand. |
707 |
nodes_by_key = self._get_nodes_by_key() |
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
708 |
for key in keys: |
709 |
# sanity check
|
|
710 |
if key[0] is None: |
|
711 |
raise errors.BadIndexKey(key) |
|
712 |
if len(key) != self._key_length: |
|
713 |
raise errors.BadIndexKey(key) |
|
714 |
# find what it refers to:
|
|
3711.3.21
by John Arbash Meinel
Fix GraphIndex to properly generate _nodes_by_keys on demand. |
715 |
key_dict = nodes_by_key |
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
716 |
elements = list(key) |
2624.2.11
by Robert Collins
Review comments. |
717 |
# find the subdict whose contents should be returned.
|
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
718 |
try: |
719 |
while len(elements) and elements[0] is not None: |
|
720 |
key_dict = key_dict[elements[0]] |
|
721 |
elements.pop(0) |
|
722 |
except KeyError: |
|
723 |
# a non-existant lookup.
|
|
724 |
continue
|
|
725 |
if len(elements): |
|
726 |
dicts = [key_dict] |
|
727 |
while dicts: |
|
728 |
key_dict = dicts.pop(-1) |
|
729 |
# can't be empty or would not exist
|
|
730 |
item, value = key_dict.iteritems().next() |
|
731 |
if type(value) == dict: |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
732 |
# push keys
|
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
733 |
dicts.extend(key_dict.itervalues()) |
734 |
else: |
|
735 |
# yield keys
|
|
736 |
for value in key_dict.itervalues(): |
|
2624.2.11
by Robert Collins
Review comments. |
737 |
# each value is the key:value:node refs tuple
|
738 |
# ready to yield.
|
|
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
739 |
yield (self, ) + value |
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
740 |
else: |
2624.2.11
by Robert Collins
Review comments. |
741 |
# the last thing looked up was a terminal element
|
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
742 |
yield (self, ) + key_dict |
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
743 |
|
4593.4.12
by John Arbash Meinel
Name the specific index api _find_ancestors, and the public CombinedGraphIndex api find_ancestry() |
744 |
def _find_ancestors(self, keys, ref_list_num, parent_map, missing_keys): |
745 |
"""See BTreeIndex._find_ancestors."""
|
|
4593.4.7
by John Arbash Meinel
Basic implementation of a conforming interface for GraphIndex. |
746 |
# The api can be implemented as a trivial overlay on top of
|
747 |
# iter_entries, it is not an efficient implementation, but it at least
|
|
748 |
# gets the job done.
|
|
749 |
found_keys = set() |
|
750 |
search_keys = set() |
|
751 |
for index, key, value, refs in self.iter_entries(keys): |
|
752 |
parent_keys = refs[ref_list_num] |
|
753 |
found_keys.add(key) |
|
754 |
parent_map[key] = parent_keys |
|
755 |
search_keys.update(parent_keys) |
|
756 |
# Figure out what, if anything, was missing
|
|
757 |
missing_keys.update(set(keys).difference(found_keys)) |
|
758 |
search_keys = search_keys.difference(parent_map) |
|
759 |
return search_keys |
|
760 |
||
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
761 |
def key_count(self): |
762 |
"""Return an estimate of the number of keys in this index.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
763 |
|
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
764 |
For GraphIndex the estimate is exact.
|
765 |
"""
|
|
766 |
if self._key_count is None: |
|
2979.1.1
by Robert Collins
Use the GraphIndex header to answer key_count queries rather than parsing the entire index unnecessarily. |
767 |
self._read_and_parse([_HEADER_READV]) |
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
768 |
return self._key_count |
769 |
||
2890.2.18
by Robert Collins
Review feedback. |
770 |
def _lookup_keys_via_location(self, location_keys): |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
771 |
"""Public interface for implementing bisection.
|
772 |
||
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
773 |
If _buffer_all has been called, then all the data for the index is in
|
774 |
memory, and this method should not be called, as it uses a separate
|
|
775 |
cache because it cannot pre-resolve all indices, which buffer_all does
|
|
776 |
for performance.
|
|
777 |
||
2890.2.16
by Robert Collins
Review feedback. |
778 |
:param location_keys: A list of location(byte offset), key tuples.
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
779 |
:return: A list of (location_key, result) tuples as expected by
|
780 |
bzrlib.bisect_multi.bisect_multi_bytes.
|
|
781 |
"""
|
|
782 |
# Possible improvements:
|
|
783 |
# - only bisect lookup each key once
|
|
784 |
# - sort the keys first, and use that to reduce the bisection window
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
785 |
# -----
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
786 |
# this progresses in three parts:
|
787 |
# read data
|
|
788 |
# parse it
|
|
789 |
# attempt to answer the question from the now in memory data.
|
|
790 |
# build the readv request
|
|
791 |
# for each location, ask for 800 bytes - much more than rows we've seen
|
|
792 |
# anywhere.
|
|
793 |
readv_ranges = [] |
|
794 |
for location, key in location_keys: |
|
795 |
# can we answer from cache?
|
|
2911.3.1
by Robert Collins
(robertc) Improve index bisection lookup performance looking for keys in the parsed dict before doing bisection searches in the parsed ranges. (Robert Collins). |
796 |
if self._bisect_nodes and key in self._bisect_nodes: |
797 |
# We have the key parsed.
|
|
798 |
continue
|
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
799 |
index = self._parsed_key_index(key) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
800 |
if (len(self._parsed_key_map) and |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
801 |
self._parsed_key_map[index][0] <= key and |
2911.3.1
by Robert Collins
(robertc) Improve index bisection lookup performance looking for keys in the parsed dict before doing bisection searches in the parsed ranges. (Robert Collins). |
802 |
(self._parsed_key_map[index][1] >= key or |
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
803 |
# end of the file has been parsed
|
804 |
self._parsed_byte_map[index][1] == self._size)): |
|
2911.3.1
by Robert Collins
(robertc) Improve index bisection lookup performance looking for keys in the parsed dict before doing bisection searches in the parsed ranges. (Robert Collins). |
805 |
# the key has been parsed, so no lookup is needed even if its
|
806 |
# not present.
|
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
807 |
continue
|
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
808 |
# - if we have examined this part of the file already - yes
|
809 |
index = self._parsed_byte_index(location) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
810 |
if (len(self._parsed_byte_map) and |
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
811 |
self._parsed_byte_map[index][0] <= location and |
812 |
self._parsed_byte_map[index][1] > location): |
|
813 |
# the byte region has been parsed, so no read is needed.
|
|
814 |
continue
|
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
815 |
length = 800 |
816 |
if location + length > self._size: |
|
817 |
length = self._size - location |
|
818 |
# todo, trim out parsed locations.
|
|
819 |
if length > 0: |
|
820 |
readv_ranges.append((location, length)) |
|
821 |
# read the header if needed
|
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
822 |
if self._bisect_nodes is None: |
2979.1.1
by Robert Collins
Use the GraphIndex header to answer key_count queries rather than parsing the entire index unnecessarily. |
823 |
readv_ranges.append(_HEADER_READV) |
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
824 |
self._read_and_parse(readv_ranges) |
3665.3.1
by John Arbash Meinel
Updates to GraphIndex processing. |
825 |
result = [] |
826 |
if self._nodes is not None: |
|
827 |
# _read_and_parse triggered a _buffer_all because we requested the
|
|
828 |
# whole data range
|
|
829 |
for location, key in location_keys: |
|
830 |
if key not in self._nodes: # not present |
|
831 |
result.append(((location, key), False)) |
|
832 |
elif self.node_ref_lists: |
|
833 |
value, refs = self._nodes[key] |
|
834 |
result.append(((location, key), |
|
835 |
(self, key, value, refs))) |
|
836 |
else: |
|
837 |
result.append(((location, key), |
|
838 |
(self, key, self._nodes[key]))) |
|
839 |
return result |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
840 |
# generate results:
|
841 |
# - figure out <, >, missing, present
|
|
842 |
# - result present references so we can return them.
|
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
843 |
# keys that we cannot answer until we resolve references
|
844 |
pending_references = [] |
|
845 |
pending_locations = set() |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
846 |
for location, key in location_keys: |
847 |
# can we answer from cache?
|
|
2911.3.1
by Robert Collins
(robertc) Improve index bisection lookup performance looking for keys in the parsed dict before doing bisection searches in the parsed ranges. (Robert Collins). |
848 |
if key in self._bisect_nodes: |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
849 |
# the key has been parsed, so no lookup is needed
|
2911.3.1
by Robert Collins
(robertc) Improve index bisection lookup performance looking for keys in the parsed dict before doing bisection searches in the parsed ranges. (Robert Collins). |
850 |
if self.node_ref_lists: |
851 |
# the references may not have been all parsed.
|
|
852 |
value, refs = self._bisect_nodes[key] |
|
853 |
wanted_locations = [] |
|
854 |
for ref_list in refs: |
|
855 |
for ref in ref_list: |
|
856 |
if ref not in self._keys_by_offset: |
|
857 |
wanted_locations.append(ref) |
|
858 |
if wanted_locations: |
|
859 |
pending_locations.update(wanted_locations) |
|
860 |
pending_references.append((location, key)) |
|
861 |
continue
|
|
862 |
result.append(((location, key), (self, key, |
|
863 |
value, self._resolve_references(refs)))) |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
864 |
else: |
2911.3.1
by Robert Collins
(robertc) Improve index bisection lookup performance looking for keys in the parsed dict before doing bisection searches in the parsed ranges. (Robert Collins). |
865 |
result.append(((location, key), |
866 |
(self, key, self._bisect_nodes[key]))) |
|
867 |
continue
|
|
868 |
else: |
|
869 |
# has the region the key should be in, been parsed?
|
|
870 |
index = self._parsed_key_index(key) |
|
871 |
if (self._parsed_key_map[index][0] <= key and |
|
872 |
(self._parsed_key_map[index][1] >= key or |
|
873 |
# end of the file has been parsed
|
|
874 |
self._parsed_byte_map[index][1] == self._size)): |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
875 |
result.append(((location, key), False)) |
2911.3.1
by Robert Collins
(robertc) Improve index bisection lookup performance looking for keys in the parsed dict before doing bisection searches in the parsed ranges. (Robert Collins). |
876 |
continue
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
877 |
# no, is the key above or below the probed location:
|
878 |
# get the range of the probed & parsed location
|
|
879 |
index = self._parsed_byte_index(location) |
|
880 |
# if the key is below the start of the range, its below
|
|
881 |
if key < self._parsed_key_map[index][0]: |
|
882 |
direction = -1 |
|
883 |
else: |
|
884 |
direction = +1 |
|
885 |
result.append(((location, key), direction)) |
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
886 |
readv_ranges = [] |
887 |
# lookup data to resolve references
|
|
888 |
for location in pending_locations: |
|
889 |
length = 800 |
|
890 |
if location + length > self._size: |
|
891 |
length = self._size - location |
|
892 |
# TODO: trim out parsed locations (e.g. if the 800 is into the
|
|
2890.2.16
by Robert Collins
Review feedback. |
893 |
# parsed region trim it, and dont use the adjust_for_latency
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
894 |
# facility)
|
895 |
if length > 0: |
|
896 |
readv_ranges.append((location, length)) |
|
897 |
self._read_and_parse(readv_ranges) |
|
3665.3.5
by John Arbash Meinel
Move the point at which we 'buffer_all' if we've read >50% of the index. |
898 |
if self._nodes is not None: |
899 |
# The _read_and_parse triggered a _buffer_all, grab the data and
|
|
900 |
# return it
|
|
901 |
for location, key in pending_references: |
|
902 |
value, refs = self._nodes[key] |
|
903 |
result.append(((location, key), (self, key, value, refs))) |
|
904 |
return result |
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
905 |
for location, key in pending_references: |
906 |
# answer key references we had to look-up-late.
|
|
907 |
value, refs = self._bisect_nodes[key] |
|
908 |
result.append(((location, key), (self, key, |
|
909 |
value, self._resolve_references(refs)))) |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
910 |
return result |
911 |
||
912 |
def _parse_header_from_bytes(self, bytes): |
|
913 |
"""Parse the header from a region of bytes.
|
|
914 |
||
915 |
:param bytes: The data to parse.
|
|
916 |
:return: An offset, data tuple such as readv yields, for the unparsed
|
|
917 |
data. (which may length 0).
|
|
918 |
"""
|
|
919 |
signature = bytes[0:len(self._signature())] |
|
920 |
if not signature == self._signature(): |
|
921 |
raise errors.BadIndexFormatSignature(self._name, GraphIndex) |
|
922 |
lines = bytes[len(self._signature()):].splitlines() |
|
923 |
options_line = lines[0] |
|
924 |
if not options_line.startswith(_OPTION_NODE_REFS): |
|
925 |
raise errors.BadIndexOptions(self) |
|
926 |
try: |
|
927 |
self.node_ref_lists = int(options_line[len(_OPTION_NODE_REFS):]) |
|
928 |
except ValueError: |
|
929 |
raise errors.BadIndexOptions(self) |
|
930 |
options_line = lines[1] |
|
931 |
if not options_line.startswith(_OPTION_KEY_ELEMENTS): |
|
932 |
raise errors.BadIndexOptions(self) |
|
933 |
try: |
|
934 |
self._key_length = int(options_line[len(_OPTION_KEY_ELEMENTS):]) |
|
935 |
except ValueError: |
|
936 |
raise errors.BadIndexOptions(self) |
|
937 |
options_line = lines[2] |
|
938 |
if not options_line.startswith(_OPTION_LEN): |
|
939 |
raise errors.BadIndexOptions(self) |
|
940 |
try: |
|
941 |
self._key_count = int(options_line[len(_OPTION_LEN):]) |
|
942 |
except ValueError: |
|
943 |
raise errors.BadIndexOptions(self) |
|
944 |
# calculate the bytes we have processed
|
|
945 |
header_end = (len(signature) + len(lines[0]) + len(lines[1]) + |
|
946 |
len(lines[2]) + 3) |
|
947 |
self._parsed_bytes(0, None, header_end, None) |
|
948 |
# setup parsing state
|
|
949 |
self._expected_elements = 3 + self._key_length |
|
950 |
# raw data keyed by offset
|
|
951 |
self._keys_by_offset = {} |
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
952 |
# keys with the value and node references
|
953 |
self._bisect_nodes = {} |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
954 |
return header_end, bytes[header_end:] |
955 |
||
956 |
def _parse_region(self, offset, data): |
|
957 |
"""Parse node data returned from a readv operation.
|
|
958 |
||
959 |
:param offset: The byte offset the data starts at.
|
|
960 |
:param data: The data to parse.
|
|
961 |
"""
|
|
962 |
# trim the data.
|
|
963 |
# end first:
|
|
964 |
end = offset + len(data) |
|
2890.2.15
by Robert Collins
Corner case when parsing repeated sections - the bottom section of a region may not be parsed, so we need to manually advance past that. |
965 |
high_parsed = offset |
2890.2.14
by Robert Collins
Parse more than one segment of data from a single readv response if needed. |
966 |
while True: |
967 |
# Trivial test - if the current index's end is within the
|
|
968 |
# low-matching parsed range, we're done.
|
|
2890.2.15
by Robert Collins
Corner case when parsing repeated sections - the bottom section of a region may not be parsed, so we need to manually advance past that. |
969 |
index = self._parsed_byte_index(high_parsed) |
2890.2.14
by Robert Collins
Parse more than one segment of data from a single readv response if needed. |
970 |
if end < self._parsed_byte_map[index][1]: |
971 |
return
|
|
2890.2.15
by Robert Collins
Corner case when parsing repeated sections - the bottom section of a region may not be parsed, so we need to manually advance past that. |
972 |
# print "[%d:%d]" % (offset, end), \
|
973 |
# self._parsed_byte_map[index:index + 2]
|
|
974 |
high_parsed, last_segment = self._parse_segment( |
|
975 |
offset, data, end, index) |
|
976 |
if last_segment: |
|
2890.2.14
by Robert Collins
Parse more than one segment of data from a single readv response if needed. |
977 |
return
|
978 |
||
979 |
def _parse_segment(self, offset, data, end, index): |
|
980 |
"""Parse one segment of data.
|
|
981 |
||
982 |
:param offset: Where 'data' begins in the file.
|
|
983 |
:param data: Some data to parse a segment of.
|
|
984 |
:param end: Where data ends
|
|
985 |
:param index: The current index into the parsed bytes map.
|
|
986 |
:return: True if the parsed segment is the last possible one in the
|
|
987 |
range of data.
|
|
2890.2.15
by Robert Collins
Corner case when parsing repeated sections - the bottom section of a region may not be parsed, so we need to manually advance past that. |
988 |
:return: high_parsed_byte, last_segment.
|
989 |
high_parsed_byte is the location of the highest parsed byte in this
|
|
990 |
segment, last_segment is True if the parsed segment is the last
|
|
991 |
possible one in the data block.
|
|
2890.2.14
by Robert Collins
Parse more than one segment of data from a single readv response if needed. |
992 |
"""
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
993 |
# default is to use all data
|
994 |
trim_end = None |
|
995 |
# accomodate overlap with data before this.
|
|
996 |
if offset < self._parsed_byte_map[index][1]: |
|
997 |
# overlaps the lower parsed region
|
|
998 |
# skip the parsed data
|
|
999 |
trim_start = self._parsed_byte_map[index][1] - offset |
|
1000 |
# don't trim the start for \n
|
|
1001 |
start_adjacent = True |
|
1002 |
elif offset == self._parsed_byte_map[index][1]: |
|
1003 |
# abuts the lower parsed region
|
|
1004 |
# use all data
|
|
1005 |
trim_start = None |
|
1006 |
# do not trim anything
|
|
1007 |
start_adjacent = True |
|
1008 |
else: |
|
1009 |
# does not overlap the lower parsed region
|
|
1010 |
# use all data
|
|
1011 |
trim_start = None |
|
1012 |
# but trim the leading \n
|
|
1013 |
start_adjacent = False |
|
1014 |
if end == self._size: |
|
1015 |
# lines up to the end of all data:
|
|
1016 |
# use it all
|
|
1017 |
trim_end = None |
|
1018 |
# do not strip to the last \n
|
|
1019 |
end_adjacent = True |
|
2890.2.14
by Robert Collins
Parse more than one segment of data from a single readv response if needed. |
1020 |
last_segment = True |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1021 |
elif index + 1 == len(self._parsed_byte_map): |
1022 |
# at the end of the parsed data
|
|
1023 |
# use it all
|
|
1024 |
trim_end = None |
|
1025 |
# but strip to the last \n
|
|
1026 |
end_adjacent = False |
|
2890.2.14
by Robert Collins
Parse more than one segment of data from a single readv response if needed. |
1027 |
last_segment = True |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1028 |
elif end == self._parsed_byte_map[index + 1][0]: |
1029 |
# buts up against the next parsed region
|
|
1030 |
# use it all
|
|
1031 |
trim_end = None |
|
1032 |
# do not strip to the last \n
|
|
1033 |
end_adjacent = True |
|
2890.2.14
by Robert Collins
Parse more than one segment of data from a single readv response if needed. |
1034 |
last_segment = True |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1035 |
elif end > self._parsed_byte_map[index + 1][0]: |
1036 |
# overlaps into the next parsed region
|
|
1037 |
# only consider the unparsed data
|
|
1038 |
trim_end = self._parsed_byte_map[index + 1][0] - offset |
|
1039 |
# do not strip to the last \n as we know its an entire record
|
|
1040 |
end_adjacent = True |
|
2890.2.14
by Robert Collins
Parse more than one segment of data from a single readv response if needed. |
1041 |
last_segment = end < self._parsed_byte_map[index + 1][1] |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1042 |
else: |
1043 |
# does not overlap into the next region
|
|
1044 |
# use it all
|
|
1045 |
trim_end = None |
|
1046 |
# but strip to the last \n
|
|
1047 |
end_adjacent = False |
|
2890.2.14
by Robert Collins
Parse more than one segment of data from a single readv response if needed. |
1048 |
last_segment = True |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1049 |
# now find bytes to discard if needed
|
1050 |
if not start_adjacent: |
|
1051 |
# work around python bug in rfind
|
|
1052 |
if trim_start is None: |
|
1053 |
trim_start = data.find('\n') + 1 |
|
1054 |
else: |
|
1055 |
trim_start = data.find('\n', trim_start) + 1 |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1056 |
if not (trim_start != 0): |
1057 |
raise AssertionError('no \n was present') |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1058 |
# print 'removing start', offset, trim_start, repr(data[:trim_start])
|
1059 |
if not end_adjacent: |
|
1060 |
# work around python bug in rfind
|
|
1061 |
if trim_end is None: |
|
1062 |
trim_end = data.rfind('\n') + 1 |
|
1063 |
else: |
|
1064 |
trim_end = data.rfind('\n', None, trim_end) + 1 |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1065 |
if not (trim_end != 0): |
1066 |
raise AssertionError('no \n was present') |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1067 |
# print 'removing end', offset, trim_end, repr(data[trim_end:])
|
1068 |
# adjust offset and data to the parseable data.
|
|
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
1069 |
trimmed_data = data[trim_start:trim_end] |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1070 |
if not (trimmed_data): |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1071 |
raise AssertionError('read unneeded data [%d:%d] from [%d:%d]' |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1072 |
% (trim_start, trim_end, offset, offset + len(data))) |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1073 |
if trim_start: |
1074 |
offset += trim_start |
|
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
1075 |
# print "parsing", repr(trimmed_data)
|
2890.2.10
by Robert Collins
Add test coverage to ensure \r's are not mangled by bisection parsing. |
1076 |
# splitlines mangles the \r delimiters.. don't use it.
|
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
1077 |
lines = trimmed_data.split('\n') |
2890.2.9
by Robert Collins
Don't use splitlines for index data parsing, we embed \r. |
1078 |
del lines[-1] |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1079 |
pos = offset |
2890.2.17
by Robert Collins
Split _parse_segment out into a _parse_lines helper, reducing duplication with full index parsing. |
1080 |
first_key, last_key, nodes, _ = self._parse_lines(lines, pos) |
1081 |
for key, value in nodes: |
|
1082 |
self._bisect_nodes[key] = value |
|
1083 |
self._parsed_bytes(offset, first_key, |
|
1084 |
offset + len(trimmed_data), last_key) |
|
1085 |
return offset + len(trimmed_data), last_segment |
|
1086 |
||
1087 |
def _parse_lines(self, lines, pos): |
|
1088 |
key = None |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1089 |
first_key = None |
2890.2.17
by Robert Collins
Split _parse_segment out into a _parse_lines helper, reducing duplication with full index parsing. |
1090 |
trailers = 0 |
1091 |
nodes = [] |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1092 |
for line in lines: |
1093 |
if line == '': |
|
1094 |
# must be at the end
|
|
2890.2.17
by Robert Collins
Split _parse_segment out into a _parse_lines helper, reducing duplication with full index parsing. |
1095 |
if self._size: |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1096 |
if not (self._size == pos + 1): |
1097 |
raise AssertionError("%s %s" % (self._size, pos)) |
|
2890.2.17
by Robert Collins
Split _parse_segment out into a _parse_lines helper, reducing duplication with full index parsing. |
1098 |
trailers += 1 |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1099 |
continue
|
1100 |
elements = line.split('\0') |
|
1101 |
if len(elements) != self._expected_elements: |
|
1102 |
raise errors.BadIndexData(self) |
|
3530.3.3
by Robert Collins
Credit and explanation for interning. |
1103 |
# keys are tuples. Each element is a string that may occur many
|
1104 |
# times, so we intern them to save space. AB, RC, 200807
|
|
3711.3.13
by John Arbash Meinel
Shave off another 5s by not building 'node_by_key' |
1105 |
key = tuple([intern(element) for element in elements[:self._key_length]]) |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1106 |
if first_key is None: |
1107 |
first_key = key |
|
1108 |
absent, references, value = elements[-3:] |
|
1109 |
ref_lists = [] |
|
1110 |
for ref_string in references.split('\t'): |
|
1111 |
ref_lists.append(tuple([ |
|
1112 |
int(ref) for ref in ref_string.split('\r') if ref |
|
1113 |
]))
|
|
1114 |
ref_lists = tuple(ref_lists) |
|
1115 |
self._keys_by_offset[pos] = (key, absent, ref_lists, value) |
|
1116 |
pos += len(line) + 1 # +1 for the \n |
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
1117 |
if absent: |
1118 |
continue
|
|
1119 |
if self.node_ref_lists: |
|
1120 |
node_value = (value, ref_lists) |
|
1121 |
else: |
|
1122 |
node_value = value |
|
2890.2.17
by Robert Collins
Split _parse_segment out into a _parse_lines helper, reducing duplication with full index parsing. |
1123 |
nodes.append((key, node_value)) |
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
1124 |
# print "parsed ", key
|
2890.2.17
by Robert Collins
Split _parse_segment out into a _parse_lines helper, reducing duplication with full index parsing. |
1125 |
return first_key, key, nodes, trailers |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1126 |
|
1127 |
def _parsed_bytes(self, start, start_key, end, end_key): |
|
1128 |
"""Mark the bytes from start to end as parsed.
|
|
1129 |
||
1130 |
Calling self._parsed_bytes(1,2) will mark one byte (the one at offset
|
|
1131 |
1) as parsed.
|
|
1132 |
||
1133 |
:param start: The start of the parsed region.
|
|
1134 |
:param end: The end of the parsed region.
|
|
1135 |
"""
|
|
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
1136 |
index = self._parsed_byte_index(start) |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1137 |
new_value = (start, end) |
1138 |
new_key = (start_key, end_key) |
|
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
1139 |
if index == -1: |
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1140 |
# first range parsed is always the beginning.
|
1141 |
self._parsed_byte_map.insert(index, new_value) |
|
1142 |
self._parsed_key_map.insert(index, new_key) |
|
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
1143 |
return
|
1144 |
# four cases:
|
|
1145 |
# new region
|
|
1146 |
# extend lower region
|
|
1147 |
# extend higher region
|
|
1148 |
# combine two regions
|
|
1149 |
if (index + 1 < len(self._parsed_byte_map) and |
|
1150 |
self._parsed_byte_map[index][1] == start and |
|
1151 |
self._parsed_byte_map[index + 1][0] == end): |
|
1152 |
# combine two regions
|
|
1153 |
self._parsed_byte_map[index] = (self._parsed_byte_map[index][0], |
|
1154 |
self._parsed_byte_map[index + 1][1]) |
|
1155 |
self._parsed_key_map[index] = (self._parsed_key_map[index][0], |
|
1156 |
self._parsed_key_map[index + 1][1]) |
|
2890.2.12
by Robert Collins
More index tweaks. |
1157 |
del self._parsed_byte_map[index + 1] |
1158 |
del self._parsed_key_map[index + 1] |
|
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
1159 |
elif self._parsed_byte_map[index][1] == start: |
1160 |
# extend the lower entry
|
|
1161 |
self._parsed_byte_map[index] = ( |
|
1162 |
self._parsed_byte_map[index][0], end) |
|
1163 |
self._parsed_key_map[index] = ( |
|
1164 |
self._parsed_key_map[index][0], end_key) |
|
1165 |
elif (index + 1 < len(self._parsed_byte_map) and |
|
1166 |
self._parsed_byte_map[index + 1][0] == end): |
|
1167 |
# extend the higher entry
|
|
1168 |
self._parsed_byte_map[index + 1] = ( |
|
1169 |
start, self._parsed_byte_map[index + 1][1]) |
|
1170 |
self._parsed_key_map[index + 1] = ( |
|
1171 |
start_key, self._parsed_key_map[index + 1][1]) |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1172 |
else: |
2890.2.11
by Robert Collins
Bisection improvements after integrating with packs. |
1173 |
# new entry
|
1174 |
self._parsed_byte_map.insert(index + 1, new_value) |
|
1175 |
self._parsed_key_map.insert(index + 1, new_key) |
|
2890.2.5
by Robert Collins
Create a content lookup function for bisection in GraphIndex. |
1176 |
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
1177 |
def _read_and_parse(self, readv_ranges): |
4775.1.1
by Martin Pool
Remove several 'the the' typos |
1178 |
"""Read the ranges and parse the resulting data.
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
1179 |
|
1180 |
:param readv_ranges: A prepared readv range list.
|
|
1181 |
"""
|
|
3665.3.5
by John Arbash Meinel
Move the point at which we 'buffer_all' if we've read >50% of the index. |
1182 |
if not readv_ranges: |
1183 |
return
|
|
1184 |
if self._nodes is None and self._bytes_read * 2 >= self._size: |
|
1185 |
# We've already read more than 50% of the file and we are about to
|
|
1186 |
# request more data, just _buffer_all() and be done
|
|
1187 |
self._buffer_all() |
|
1188 |
return
|
|
1189 |
||
1190 |
readv_data = self._transport.readv(self._name, readv_ranges, True, |
|
1191 |
self._size) |
|
1192 |
# parse
|
|
1193 |
for offset, data in readv_data: |
|
1194 |
self._bytes_read += len(data) |
|
1195 |
if offset == 0 and len(data) == self._size: |
|
1196 |
# We read the whole range, most likely because the
|
|
1197 |
# Transport upcast our readv ranges into one long request
|
|
1198 |
# for enough total data to grab the whole index.
|
|
1199 |
self._buffer_all(StringIO(data)) |
|
1200 |
return
|
|
1201 |
if self._bisect_nodes is None: |
|
1202 |
# this must be the start
|
|
1203 |
if not (offset == 0): |
|
1204 |
raise AssertionError() |
|
1205 |
offset, data = self._parse_header_from_bytes(data) |
|
1206 |
# print readv_ranges, "[%d:%d]" % (offset, offset + len(data))
|
|
1207 |
self._parse_region(offset, data) |
|
2890.2.6
by Robert Collins
Add support for key references to the index lookup_keys_via_location bisection interface. |
1208 |
|
2592.1.8
by Robert Collins
Empty files should validate ok. |
1209 |
def _signature(self): |
1210 |
"""The file signature for this index type."""
|
|
1211 |
return _SIGNATURE |
|
1212 |
||
2592.1.7
by Robert Collins
A validate that goes boom. |
1213 |
def validate(self): |
1214 |
"""Validate that everything in the index can be accessed."""
|
|
2592.1.27
by Robert Collins
Test missing end lines with non-empty indices. |
1215 |
# iter_all validates completely at the moment, so just do that.
|
1216 |
for node in self.iter_all_entries(): |
|
1217 |
pass
|
|
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1218 |
|
1219 |
||
1220 |
class CombinedGraphIndex(object): |
|
1221 |
"""A GraphIndex made up from smaller GraphIndices.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1222 |
|
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1223 |
The backing indices must implement GraphIndex, and are presumed to be
|
1224 |
static data.
|
|
2592.1.45
by Robert Collins
Tweak documentation as per Aaron's review. |
1225 |
|
1226 |
Queries against the combined index will be made against the first index,
|
|
1227 |
and then the second and so on. The order of index's can thus influence
|
|
1228 |
performance significantly. For example, if one index is on local disk and a
|
|
1229 |
second on a remote server, the local disk index should be before the other
|
|
1230 |
in the index list.
|
|
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1231 |
"""
|
1232 |
||
3789.1.3
by John Arbash Meinel
CombinedGraphIndex can now reload when calling key_count(). |
1233 |
def __init__(self, indices, reload_func=None): |
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1234 |
"""Create a CombinedGraphIndex backed by indices.
|
1235 |
||
2592.1.45
by Robert Collins
Tweak documentation as per Aaron's review. |
1236 |
:param indices: An ordered list of indices to query for data.
|
3789.1.3
by John Arbash Meinel
CombinedGraphIndex can now reload when calling key_count(). |
1237 |
:param reload_func: A function to call if we find we are missing an
|
1238 |
index. Should have the form reload_func() => True/False to indicate
|
|
1239 |
if reloading actually changed anything.
|
|
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1240 |
"""
|
1241 |
self._indices = indices |
|
3789.1.3
by John Arbash Meinel
CombinedGraphIndex can now reload when calling key_count(). |
1242 |
self._reload_func = reload_func |
2592.1.37
by Robert Collins
Add CombinedGraphIndex.insert_index. |
1243 |
|
2592.5.4
by Martin Pool
Add CombinedGraphIndex repr |
1244 |
def __repr__(self): |
1245 |
return "%s(%s)" % ( |
|
1246 |
self.__class__.__name__, |
|
1247 |
', '.join(map(repr, self._indices))) |
|
1248 |
||
4744.2.6
by John Arbash Meinel
Start exposing an GraphIndex.clear_cache() member. |
1249 |
def clear_cache(self): |
1250 |
"""See GraphIndex.clear_cache()"""
|
|
1251 |
for index in self._indices: |
|
1252 |
index.clear_cache() |
|
1253 |
||
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
1254 |
def get_parent_map(self, keys): |
4379.3.3
by Gary van der Merwe
Rename and add doc string for StackedParentsProvider. |
1255 |
"""See graph.StackedParentsProvider.get_parent_map"""
|
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
1256 |
search_keys = set(keys) |
1257 |
if NULL_REVISION in search_keys: |
|
1258 |
search_keys.discard(NULL_REVISION) |
|
1259 |
found_parents = {NULL_REVISION:[]} |
|
1260 |
else: |
|
1261 |
found_parents = {} |
|
2979.2.2
by Robert Collins
Per-file graph heads detection during commit for pack repositories. |
1262 |
for index, key, value, refs in self.iter_entries(search_keys): |
1263 |
parents = refs[0] |
|
1264 |
if not parents: |
|
1265 |
parents = (NULL_REVISION,) |
|
1266 |
found_parents[key] = parents |
|
3099.3.1
by John Arbash Meinel
Implement get_parent_map for ParentProviders |
1267 |
return found_parents |
2979.2.2
by Robert Collins
Per-file graph heads detection during commit for pack repositories. |
1268 |
|
3830.3.12
by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks |
1269 |
has_key = _has_key_from_parent_map |
3830.3.9
by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests |
1270 |
|
2592.1.37
by Robert Collins
Add CombinedGraphIndex.insert_index. |
1271 |
def insert_index(self, pos, index): |
1272 |
"""Insert a new index in the list of indices to query.
|
|
1273 |
||
1274 |
:param pos: The position to insert the index.
|
|
1275 |
:param index: The index to insert.
|
|
1276 |
"""
|
|
1277 |
self._indices.insert(pos, index) |
|
1278 |
||
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1279 |
def iter_all_entries(self): |
1280 |
"""Iterate over all keys within the index
|
|
1281 |
||
2592.1.44
by Robert Collins
Remove some unneeded index iteration by checking if we have found all keys, and grammar improvements from Aaron's review. |
1282 |
Duplicate keys across child indices are presumed to have the same
|
1283 |
value and are only reported once.
|
|
1284 |
||
2592.5.1
by Martin Pool
Fix docstrings for Index.iter_entries etc |
1285 |
:return: An iterable of (index, key, reference_lists, value).
|
1286 |
There is no defined order for the result iteration - it will be in
|
|
1287 |
the most efficient order for the index.
|
|
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1288 |
"""
|
1289 |
seen_keys = set() |
|
3789.1.5
by John Arbash Meinel
CombinedGraphIndex.iter_all_entries() can now reload when needed. |
1290 |
while True: |
1291 |
try: |
|
1292 |
for index in self._indices: |
|
1293 |
for node in index.iter_all_entries(): |
|
1294 |
if node[1] not in seen_keys: |
|
1295 |
yield node |
|
1296 |
seen_keys.add(node[1]) |
|
1297 |
return
|
|
1298 |
except errors.NoSuchFile: |
|
1299 |
self._reload_or_raise() |
|
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1300 |
|
1301 |
def iter_entries(self, keys): |
|
1302 |
"""Iterate over keys within the index.
|
|
1303 |
||
2592.1.44
by Robert Collins
Remove some unneeded index iteration by checking if we have found all keys, and grammar improvements from Aaron's review. |
1304 |
Duplicate keys across child indices are presumed to have the same
|
1305 |
value and are only reported once.
|
|
1306 |
||
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1307 |
:param keys: An iterable providing the keys to be retrieved.
|
2592.5.1
by Martin Pool
Fix docstrings for Index.iter_entries etc |
1308 |
:return: An iterable of (index, key, reference_lists, value). There is no
|
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1309 |
defined order for the result iteration - it will be in the most
|
1310 |
efficient order for the index.
|
|
1311 |
"""
|
|
1312 |
keys = set(keys) |
|
3789.1.4
by John Arbash Meinel
CombinedGraphIndex.iter_entries() is now able to reload on request. |
1313 |
while True: |
1314 |
try: |
|
1315 |
for index in self._indices: |
|
1316 |
if not keys: |
|
1317 |
return
|
|
1318 |
for node in index.iter_entries(keys): |
|
1319 |
keys.remove(node[1]) |
|
1320 |
yield node |
|
2592.1.44
by Robert Collins
Remove some unneeded index iteration by checking if we have found all keys, and grammar improvements from Aaron's review. |
1321 |
return
|
3789.1.4
by John Arbash Meinel
CombinedGraphIndex.iter_entries() is now able to reload on request. |
1322 |
except errors.NoSuchFile: |
1323 |
self._reload_or_raise() |
|
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1324 |
|
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
1325 |
def iter_entries_prefix(self, keys): |
1326 |
"""Iterate over keys within the index using prefix matching.
|
|
1327 |
||
1328 |
Duplicate keys across child indices are presumed to have the same
|
|
1329 |
value and are only reported once.
|
|
1330 |
||
1331 |
Prefix matching is applied within the tuple of a key, not to within
|
|
1332 |
the bytestring of each key element. e.g. if you have the keys ('foo',
|
|
1333 |
'bar'), ('foobar', 'gam') and do a prefix search for ('foo', None) then
|
|
1334 |
only the former key is returned.
|
|
1335 |
||
1336 |
:param keys: An iterable providing the key prefixes to be retrieved.
|
|
1337 |
Each key prefix takes the form of a tuple the length of a key, but
|
|
1338 |
with the last N elements 'None' rather than a regular bytestring.
|
|
1339 |
The first element cannot be 'None'.
|
|
1340 |
:return: An iterable as per iter_all_entries, but restricted to the
|
|
1341 |
keys with a matching prefix to those supplied. No additional keys
|
|
1342 |
will be returned, and every match that is in the index will be
|
|
1343 |
returned.
|
|
1344 |
"""
|
|
1345 |
keys = set(keys) |
|
1346 |
if not keys: |
|
1347 |
return
|
|
1348 |
seen_keys = set() |
|
3789.1.6
by John Arbash Meinel
CombinedGraphIndex.iter_entries_prefix can now reload when needed. |
1349 |
while True: |
1350 |
try: |
|
1351 |
for index in self._indices: |
|
1352 |
for node in index.iter_entries_prefix(keys): |
|
1353 |
if node[1] in seen_keys: |
|
1354 |
continue
|
|
1355 |
seen_keys.add(node[1]) |
|
1356 |
yield node |
|
1357 |
return
|
|
1358 |
except errors.NoSuchFile: |
|
1359 |
self._reload_or_raise() |
|
2624.2.9
by Robert Collins
Introduce multiple component keys, which is what is needed to combine multiple knit indices into one. |
1360 |
|
4593.4.12
by John Arbash Meinel
Name the specific index api _find_ancestors, and the public CombinedGraphIndex api find_ancestry() |
1361 |
def find_ancestry(self, keys, ref_list_num): |
4593.4.8
by John Arbash Meinel
Implement CombinedGraphIndex.get_ancestry() |
1362 |
"""Find the complete ancestry for the given set of keys.
|
1363 |
||
4593.4.12
by John Arbash Meinel
Name the specific index api _find_ancestors, and the public CombinedGraphIndex api find_ancestry() |
1364 |
Note that this is a whole-ancestry request, so it should be used
|
1365 |
sparingly.
|
|
1366 |
||
4593.4.8
by John Arbash Meinel
Implement CombinedGraphIndex.get_ancestry() |
1367 |
:param keys: An iterable of keys to look for
|
4593.4.12
by John Arbash Meinel
Name the specific index api _find_ancestors, and the public CombinedGraphIndex api find_ancestry() |
1368 |
:param ref_list_num: The reference list which references the parents
|
1369 |
we care about.
|
|
4593.4.8
by John Arbash Meinel
Implement CombinedGraphIndex.get_ancestry() |
1370 |
:return: (parent_map, missing_keys)
|
1371 |
"""
|
|
1372 |
missing_keys = set() |
|
1373 |
parent_map = {} |
|
1374 |
keys_to_lookup = set(keys) |
|
4593.4.9
by John Arbash Meinel
Add some debugging statements for now. |
1375 |
generation = 0 |
4593.4.8
by John Arbash Meinel
Implement CombinedGraphIndex.get_ancestry() |
1376 |
while keys_to_lookup: |
1377 |
# keys that *all* indexes claim are missing, stop searching them
|
|
4593.4.9
by John Arbash Meinel
Add some debugging statements for now. |
1378 |
generation += 1 |
4593.4.8
by John Arbash Meinel
Implement CombinedGraphIndex.get_ancestry() |
1379 |
all_index_missing = None |
4593.4.9
by John Arbash Meinel
Add some debugging statements for now. |
1380 |
# print 'gen\tidx\tsub\tn_keys\tn_pmap\tn_miss'
|
1381 |
# print '%4d\t\t\t%4d\t%5d\t%5d' % (generation, len(keys_to_lookup),
|
|
1382 |
# len(parent_map),
|
|
1383 |
# len(missing_keys))
|
|
1384 |
for index_idx, index in enumerate(self._indices): |
|
1385 |
# TODO: we should probably be doing something with
|
|
1386 |
# 'missing_keys' since we've already determined that
|
|
1387 |
# those revisions have not been found anywhere
|
|
4593.4.8
by John Arbash Meinel
Implement CombinedGraphIndex.get_ancestry() |
1388 |
index_missing_keys = set() |
1389 |
# Find all of the ancestry we can from this index
|
|
1390 |
# keep looking until the search_keys set is empty, which means
|
|
1391 |
# things we didn't find should be in index_missing_keys
|
|
1392 |
search_keys = keys_to_lookup |
|
4593.4.9
by John Arbash Meinel
Add some debugging statements for now. |
1393 |
sub_generation = 0 |
1394 |
# print ' \t%2d\t\t%4d\t%5d\t%5d' % (
|
|
1395 |
# index_idx, len(search_keys),
|
|
1396 |
# len(parent_map), len(index_missing_keys))
|
|
4593.4.8
by John Arbash Meinel
Implement CombinedGraphIndex.get_ancestry() |
1397 |
while search_keys: |
4593.4.9
by John Arbash Meinel
Add some debugging statements for now. |
1398 |
sub_generation += 1 |
1399 |
# TODO: ref_list_num should really be a parameter, since
|
|
1400 |
# CombinedGraphIndex does not know what the ref lists
|
|
1401 |
# mean.
|
|
4593.4.12
by John Arbash Meinel
Name the specific index api _find_ancestors, and the public CombinedGraphIndex api find_ancestry() |
1402 |
search_keys = index._find_ancestors(search_keys, |
1403 |
ref_list_num, parent_map, index_missing_keys) |
|
4593.4.9
by John Arbash Meinel
Add some debugging statements for now. |
1404 |
# print ' \t \t%2d\t%4d\t%5d\t%5d' % (
|
1405 |
# sub_generation, len(search_keys),
|
|
1406 |
# len(parent_map), len(index_missing_keys))
|
|
4593.4.8
by John Arbash Meinel
Implement CombinedGraphIndex.get_ancestry() |
1407 |
# Now set whatever was missing to be searched in the next index
|
1408 |
keys_to_lookup = index_missing_keys |
|
1409 |
if all_index_missing is None: |
|
1410 |
all_index_missing = set(index_missing_keys) |
|
1411 |
else: |
|
1412 |
all_index_missing.intersection_update(index_missing_keys) |
|
1413 |
if not keys_to_lookup: |
|
1414 |
break
|
|
1415 |
if all_index_missing is None: |
|
1416 |
# There were no indexes, so all search keys are 'missing'
|
|
1417 |
missing_keys.update(keys_to_lookup) |
|
1418 |
keys_to_lookup = None |
|
1419 |
else: |
|
1420 |
missing_keys.update(all_index_missing) |
|
1421 |
keys_to_lookup.difference_update(all_index_missing) |
|
1422 |
return parent_map, missing_keys |
|
1423 |
||
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
1424 |
def key_count(self): |
1425 |
"""Return an estimate of the number of keys in this index.
|
|
3789.1.3
by John Arbash Meinel
CombinedGraphIndex can now reload when calling key_count(). |
1426 |
|
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
1427 |
For CombinedGraphIndex this is approximated by the sum of the keys of
|
1428 |
the child indices. As child indices may have duplicate keys this can
|
|
1429 |
have a maximum error of the number of child indices * largest number of
|
|
1430 |
keys in any index.
|
|
1431 |
"""
|
|
3789.1.4
by John Arbash Meinel
CombinedGraphIndex.iter_entries() is now able to reload on request. |
1432 |
while True: |
3789.1.3
by John Arbash Meinel
CombinedGraphIndex can now reload when calling key_count(). |
1433 |
try: |
1434 |
return sum((index.key_count() for index in self._indices), 0) |
|
1435 |
except errors.NoSuchFile: |
|
3789.1.4
by John Arbash Meinel
CombinedGraphIndex.iter_entries() is now able to reload on request. |
1436 |
self._reload_or_raise() |
1437 |
||
3830.3.12
by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks |
1438 |
missing_keys = _missing_keys_from_parent_map |
1439 |
||
3789.1.4
by John Arbash Meinel
CombinedGraphIndex.iter_entries() is now able to reload on request. |
1440 |
def _reload_or_raise(self): |
1441 |
"""We just got a NoSuchFile exception.
|
|
1442 |
||
1443 |
Try to reload the indices, if it fails, just raise the current
|
|
1444 |
exception.
|
|
1445 |
"""
|
|
1446 |
if self._reload_func is None: |
|
1447 |
raise
|
|
1448 |
exc_type, exc_value, exc_traceback = sys.exc_info() |
|
3789.1.10
by John Arbash Meinel
Review comments from Martin. |
1449 |
trace.mutter('Trying to reload after getting exception: %s', |
1450 |
exc_value) |
|
3789.1.4
by John Arbash Meinel
CombinedGraphIndex.iter_entries() is now able to reload on request. |
1451 |
if not self._reload_func(): |
1452 |
# We tried to reload, but nothing changed, so we fail anyway
|
|
3789.1.10
by John Arbash Meinel
Review comments from Martin. |
1453 |
trace.mutter('_reload_func indicated nothing has changed.' |
1454 |
' Raising original exception.') |
|
3789.1.4
by John Arbash Meinel
CombinedGraphIndex.iter_entries() is now able to reload on request. |
1455 |
raise exc_type, exc_value, exc_traceback |
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
1456 |
|
2592.1.31
by Robert Collins
Build a combined graph index to use multiple indices at once. |
1457 |
def validate(self): |
1458 |
"""Validate that everything in the index can be accessed."""
|
|
3789.1.7
by John Arbash Meinel
CombinedGraphIndex.validate() will now reload. |
1459 |
while True: |
1460 |
try: |
|
1461 |
for index in self._indices: |
|
1462 |
index.validate() |
|
1463 |
return
|
|
1464 |
except errors.NoSuchFile: |
|
1465 |
self._reload_or_raise() |
|
2592.1.38
by Robert Collins
Create an InMemoryGraphIndex for temporary indexing. |
1466 |
|
1467 |
||
1468 |
class InMemoryGraphIndex(GraphIndexBuilder): |
|
1469 |
"""A GraphIndex which operates entirely out of memory and is mutable.
|
|
1470 |
||
1471 |
This is designed to allow the accumulation of GraphIndex entries during a
|
|
1472 |
single write operation, where the accumulated entries need to be immediately
|
|
1473 |
available - for example via a CombinedGraphIndex.
|
|
1474 |
"""
|
|
1475 |
||
1476 |
def add_nodes(self, nodes): |
|
1477 |
"""Add nodes to the index.
|
|
1478 |
||
1479 |
:param nodes: An iterable of (key, node_refs, value) entries to add.
|
|
1480 |
"""
|
|
2592.3.39
by Robert Collins
Fugly version to remove signatures.kndx |
1481 |
if self.reference_lists: |
1482 |
for (key, value, node_refs) in nodes: |
|
1483 |
self.add_node(key, value, node_refs) |
|
1484 |
else: |
|
1485 |
for (key, value) in nodes: |
|
1486 |
self.add_node(key, value) |
|
2592.1.38
by Robert Collins
Create an InMemoryGraphIndex for temporary indexing. |
1487 |
|
1488 |
def iter_all_entries(self): |
|
1489 |
"""Iterate over all keys within the index
|
|
1490 |
||
2592.5.1
by Martin Pool
Fix docstrings for Index.iter_entries etc |
1491 |
:return: An iterable of (index, key, reference_lists, value). There is no
|
2592.1.38
by Robert Collins
Create an InMemoryGraphIndex for temporary indexing. |
1492 |
defined order for the result iteration - it will be in the most
|
1493 |
efficient order for the index (in this case dictionary hash order).
|
|
1494 |
"""
|
|
2745.1.1
by Robert Collins
Add a number of -Devil checkpoints. |
1495 |
if 'evil' in debug.debug_flags: |
2592.3.112
by Robert Collins
Various fixups found dogfooding. |
1496 |
trace.mutter_callsite(3, |
2745.1.2
by Robert Collins
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly. |
1497 |
"iter_all_entries scales with size of history.") |
2592.1.46
by Robert Collins
Make GraphIndex accept nodes as key, value, references, so that the method |
1498 |
if self.reference_lists: |
1499 |
for key, (absent, references, value) in self._nodes.iteritems(): |
|
1500 |
if not absent: |
|
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
1501 |
yield self, key, value, references |
2592.1.46
by Robert Collins
Make GraphIndex accept nodes as key, value, references, so that the method |
1502 |
else: |
1503 |
for key, (absent, references, value) in self._nodes.iteritems(): |
|
1504 |
if not absent: |
|
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
1505 |
yield self, key, value |
2592.1.38
by Robert Collins
Create an InMemoryGraphIndex for temporary indexing. |
1506 |
|
1507 |
def iter_entries(self, keys): |
|
1508 |
"""Iterate over keys within the index.
|
|
1509 |
||
1510 |
:param keys: An iterable providing the keys to be retrieved.
|
|
2979.2.4
by Robert Collins
Docstring fixes from review. |
1511 |
:return: An iterable of (index, key, value, reference_lists). There is no
|
2592.1.38
by Robert Collins
Create an InMemoryGraphIndex for temporary indexing. |
1512 |
defined order for the result iteration - it will be in the most
|
1513 |
efficient order for the index (keys iteration order in this case).
|
|
1514 |
"""
|
|
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
1515 |
# Note: See BTreeBuilder.iter_entries for an explanation of why we
|
1516 |
# aren't using set().intersection() here
|
|
1517 |
nodes = self._nodes |
|
1518 |
keys = [key for key in keys if key in nodes] |
|
2592.1.46
by Robert Collins
Make GraphIndex accept nodes as key, value, references, so that the method |
1519 |
if self.reference_lists: |
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
1520 |
for key in keys: |
1521 |
node = nodes[key] |
|
2592.1.46
by Robert Collins
Make GraphIndex accept nodes as key, value, references, so that the method |
1522 |
if not node[0]: |
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
1523 |
yield self, key, node[2], node[1] |
2592.1.46
by Robert Collins
Make GraphIndex accept nodes as key, value, references, so that the method |
1524 |
else: |
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
1525 |
for key in keys: |
1526 |
node = nodes[key] |
|
2592.1.46
by Robert Collins
Make GraphIndex accept nodes as key, value, references, so that the method |
1527 |
if not node[0]: |
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
1528 |
yield self, key, node[2] |
2592.1.38
by Robert Collins
Create an InMemoryGraphIndex for temporary indexing. |
1529 |
|
2624.2.10
by Robert Collins
Also add iter_key_prefix support to InMemoryGraphIndex. |
1530 |
def iter_entries_prefix(self, keys): |
1531 |
"""Iterate over keys within the index using prefix matching.
|
|
1532 |
||
1533 |
Prefix matching is applied within the tuple of a key, not to within
|
|
1534 |
the bytestring of each key element. e.g. if you have the keys ('foo',
|
|
1535 |
'bar'), ('foobar', 'gam') and do a prefix search for ('foo', None) then
|
|
1536 |
only the former key is returned.
|
|
1537 |
||
1538 |
:param keys: An iterable providing the key prefixes to be retrieved.
|
|
1539 |
Each key prefix takes the form of a tuple the length of a key, but
|
|
1540 |
with the last N elements 'None' rather than a regular bytestring.
|
|
1541 |
The first element cannot be 'None'.
|
|
1542 |
:return: An iterable as per iter_all_entries, but restricted to the
|
|
1543 |
keys with a matching prefix to those supplied. No additional keys
|
|
1544 |
will be returned, and every match that is in the index will be
|
|
1545 |
returned.
|
|
1546 |
"""
|
|
1547 |
# XXX: To much duplication with the GraphIndex class; consider finding
|
|
1548 |
# a good place to pull out the actual common logic.
|
|
1549 |
keys = set(keys) |
|
1550 |
if not keys: |
|
1551 |
return
|
|
1552 |
if self._key_length == 1: |
|
1553 |
for key in keys: |
|
1554 |
# sanity check
|
|
1555 |
if key[0] is None: |
|
1556 |
raise errors.BadIndexKey(key) |
|
1557 |
if len(key) != self._key_length: |
|
1558 |
raise errors.BadIndexKey(key) |
|
1559 |
node = self._nodes[key] |
|
1560 |
if node[0]: |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1561 |
continue
|
2624.2.10
by Robert Collins
Also add iter_key_prefix support to InMemoryGraphIndex. |
1562 |
if self.reference_lists: |
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
1563 |
yield self, key, node[2], node[1] |
2624.2.10
by Robert Collins
Also add iter_key_prefix support to InMemoryGraphIndex. |
1564 |
else: |
2624.2.17
by Robert Collins
Review feedback. |
1565 |
yield self, key, node[2] |
2624.2.10
by Robert Collins
Also add iter_key_prefix support to InMemoryGraphIndex. |
1566 |
return
|
3644.2.4
by John Arbash Meinel
Change GraphIndex to also have a _get_nodes_by_key |
1567 |
nodes_by_key = self._get_nodes_by_key() |
2624.2.10
by Robert Collins
Also add iter_key_prefix support to InMemoryGraphIndex. |
1568 |
for key in keys: |
1569 |
# sanity check
|
|
1570 |
if key[0] is None: |
|
1571 |
raise errors.BadIndexKey(key) |
|
1572 |
if len(key) != self._key_length: |
|
1573 |
raise errors.BadIndexKey(key) |
|
1574 |
# find what it refers to:
|
|
3644.2.4
by John Arbash Meinel
Change GraphIndex to also have a _get_nodes_by_key |
1575 |
key_dict = nodes_by_key |
2624.2.10
by Robert Collins
Also add iter_key_prefix support to InMemoryGraphIndex. |
1576 |
elements = list(key) |
1577 |
# find the subdict to return
|
|
1578 |
try: |
|
1579 |
while len(elements) and elements[0] is not None: |
|
1580 |
key_dict = key_dict[elements[0]] |
|
1581 |
elements.pop(0) |
|
1582 |
except KeyError: |
|
1583 |
# a non-existant lookup.
|
|
1584 |
continue
|
|
1585 |
if len(elements): |
|
1586 |
dicts = [key_dict] |
|
1587 |
while dicts: |
|
1588 |
key_dict = dicts.pop(-1) |
|
1589 |
# can't be empty or would not exist
|
|
1590 |
item, value = key_dict.iteritems().next() |
|
1591 |
if type(value) == dict: |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1592 |
# push keys
|
2624.2.10
by Robert Collins
Also add iter_key_prefix support to InMemoryGraphIndex. |
1593 |
dicts.extend(key_dict.itervalues()) |
1594 |
else: |
|
1595 |
# yield keys
|
|
1596 |
for value in key_dict.itervalues(): |
|
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
1597 |
yield (self, ) + value |
2624.2.10
by Robert Collins
Also add iter_key_prefix support to InMemoryGraphIndex. |
1598 |
else: |
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
1599 |
yield (self, ) + key_dict |
2624.2.10
by Robert Collins
Also add iter_key_prefix support to InMemoryGraphIndex. |
1600 |
|
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
1601 |
def key_count(self): |
1602 |
"""Return an estimate of the number of keys in this index.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1603 |
|
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
1604 |
For InMemoryGraphIndex the estimate is exact.
|
1605 |
"""
|
|
4789.28.2
by John Arbash Meinel
Get rid of the GraphIndexBuilder/BTreeBuilder._keys attribute. |
1606 |
return len(self._nodes) - len(self._absent_keys) |
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
1607 |
|
2592.1.38
by Robert Collins
Create an InMemoryGraphIndex for temporary indexing. |
1608 |
def validate(self): |
1609 |
"""In memory index's have no known corruption at the moment."""
|
|
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1610 |
|
1611 |
||
1612 |
class GraphIndexPrefixAdapter(object): |
|
1613 |
"""An adapter between GraphIndex with different key lengths.
|
|
1614 |
||
1615 |
Queries against this will emit queries against the adapted Graph with the
|
|
1616 |
prefix added, queries for all items use iter_entries_prefix. The returned
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1617 |
nodes will have their keys and node references adjusted to remove the
|
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1618 |
prefix. Finally, an add_nodes_callback can be supplied - when called the
|
1619 |
nodes and references being added will have prefix prepended.
|
|
1620 |
"""
|
|
1621 |
||
2624.2.17
by Robert Collins
Review feedback. |
1622 |
def __init__(self, adapted, prefix, missing_key_length, |
1623 |
add_nodes_callback=None): |
|
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1624 |
"""Construct an adapter against adapted with prefix."""
|
1625 |
self.adapted = adapted |
|
2624.2.19
by Robert Collins
Why we should always test before committing. |
1626 |
self.prefix_key = prefix + (None,)*missing_key_length |
2624.2.17
by Robert Collins
Review feedback. |
1627 |
self.prefix = prefix |
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1628 |
self.prefix_len = len(prefix) |
1629 |
self.add_nodes_callback = add_nodes_callback |
|
1630 |
||
2624.2.13
by Robert Collins
Implement add_node/add_nodes to the GraphIndexPrefixAdapter. |
1631 |
def add_nodes(self, nodes): |
1632 |
"""Add nodes to the index.
|
|
1633 |
||
1634 |
:param nodes: An iterable of (key, node_refs, value) entries to add.
|
|
1635 |
"""
|
|
1636 |
# save nodes in case its an iterator
|
|
1637 |
nodes = tuple(nodes) |
|
1638 |
translated_nodes = [] |
|
1639 |
try: |
|
2624.2.17
by Robert Collins
Review feedback. |
1640 |
# Add prefix_key to each reference node_refs is a tuple of tuples,
|
1641 |
# so split it apart, and add prefix_key to the internal reference
|
|
2624.2.13
by Robert Collins
Implement add_node/add_nodes to the GraphIndexPrefixAdapter. |
1642 |
for (key, value, node_refs) in nodes: |
1643 |
adjusted_references = ( |
|
2624.2.17
by Robert Collins
Review feedback. |
1644 |
tuple(tuple(self.prefix + ref_node for ref_node in ref_list) |
2624.2.13
by Robert Collins
Implement add_node/add_nodes to the GraphIndexPrefixAdapter. |
1645 |
for ref_list in node_refs)) |
2624.2.17
by Robert Collins
Review feedback. |
1646 |
translated_nodes.append((self.prefix + key, value, |
2624.2.13
by Robert Collins
Implement add_node/add_nodes to the GraphIndexPrefixAdapter. |
1647 |
adjusted_references)) |
1648 |
except ValueError: |
|
1649 |
# XXX: TODO add an explicit interface for getting the reference list
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1650 |
# status, to handle this bit of user-friendliness in the API more
|
2624.2.13
by Robert Collins
Implement add_node/add_nodes to the GraphIndexPrefixAdapter. |
1651 |
# explicitly.
|
1652 |
for (key, value) in nodes: |
|
2624.2.17
by Robert Collins
Review feedback. |
1653 |
translated_nodes.append((self.prefix + key, value)) |
2624.2.13
by Robert Collins
Implement add_node/add_nodes to the GraphIndexPrefixAdapter. |
1654 |
self.add_nodes_callback(translated_nodes) |
1655 |
||
1656 |
def add_node(self, key, value, references=()): |
|
1657 |
"""Add a node to the index.
|
|
1658 |
||
1659 |
:param key: The key. keys are non-empty tuples containing
|
|
1660 |
as many whitespace-free utf8 bytestrings as the key length
|
|
1661 |
defined for this index.
|
|
1662 |
:param references: An iterable of iterables of keys. Each is a
|
|
1663 |
reference to another key.
|
|
1664 |
:param value: The value to associate with the key. It may be any
|
|
1665 |
bytes as long as it does not contain \0 or \n.
|
|
1666 |
"""
|
|
1667 |
self.add_nodes(((key, value, references), )) |
|
1668 |
||
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1669 |
def _strip_prefix(self, an_iter): |
1670 |
"""Strip prefix data from nodes and return it."""
|
|
1671 |
for node in an_iter: |
|
1672 |
# cross checks
|
|
2624.2.17
by Robert Collins
Review feedback. |
1673 |
if node[1][:self.prefix_len] != self.prefix: |
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1674 |
raise errors.BadIndexData(self) |
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
1675 |
for ref_list in node[3]: |
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1676 |
for ref_node in ref_list: |
2624.2.17
by Robert Collins
Review feedback. |
1677 |
if ref_node[:self.prefix_len] != self.prefix: |
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1678 |
raise errors.BadIndexData(self) |
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
1679 |
yield node[0], node[1][self.prefix_len:], node[2], ( |
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1680 |
tuple(tuple(ref_node[self.prefix_len:] for ref_node in ref_list) |
2624.2.14
by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data. |
1681 |
for ref_list in node[3])) |
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1682 |
|
1683 |
def iter_all_entries(self): |
|
1684 |
"""Iterate over all keys within the index
|
|
1685 |
||
1686 |
iter_all_entries is implemented against the adapted index using
|
|
1687 |
iter_entries_prefix.
|
|
1688 |
||
2592.5.1
by Martin Pool
Fix docstrings for Index.iter_entries etc |
1689 |
:return: An iterable of (index, key, reference_lists, value). There is no
|
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1690 |
defined order for the result iteration - it will be in the most
|
1691 |
efficient order for the index (in this case dictionary hash order).
|
|
1692 |
"""
|
|
2624.2.19
by Robert Collins
Why we should always test before committing. |
1693 |
return self._strip_prefix(self.adapted.iter_entries_prefix([self.prefix_key])) |
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1694 |
|
1695 |
def iter_entries(self, keys): |
|
1696 |
"""Iterate over keys within the index.
|
|
1697 |
||
1698 |
:param keys: An iterable providing the keys to be retrieved.
|
|
2979.2.4
by Robert Collins
Docstring fixes from review. |
1699 |
:return: An iterable of (index, key, value, reference_lists). There is no
|
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1700 |
defined order for the result iteration - it will be in the most
|
1701 |
efficient order for the index (keys iteration order in this case).
|
|
1702 |
"""
|
|
1703 |
return self._strip_prefix(self.adapted.iter_entries( |
|
2624.2.17
by Robert Collins
Review feedback. |
1704 |
self.prefix + key for key in keys)) |
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1705 |
|
1706 |
def iter_entries_prefix(self, keys): |
|
1707 |
"""Iterate over keys within the index using prefix matching.
|
|
1708 |
||
1709 |
Prefix matching is applied within the tuple of a key, not to within
|
|
1710 |
the bytestring of each key element. e.g. if you have the keys ('foo',
|
|
1711 |
'bar'), ('foobar', 'gam') and do a prefix search for ('foo', None) then
|
|
1712 |
only the former key is returned.
|
|
1713 |
||
1714 |
:param keys: An iterable providing the key prefixes to be retrieved.
|
|
1715 |
Each key prefix takes the form of a tuple the length of a key, but
|
|
1716 |
with the last N elements 'None' rather than a regular bytestring.
|
|
1717 |
The first element cannot be 'None'.
|
|
1718 |
:return: An iterable as per iter_all_entries, but restricted to the
|
|
1719 |
keys with a matching prefix to those supplied. No additional keys
|
|
1720 |
will be returned, and every match that is in the index will be
|
|
1721 |
returned.
|
|
1722 |
"""
|
|
1723 |
return self._strip_prefix(self.adapted.iter_entries_prefix( |
|
2624.2.17
by Robert Collins
Review feedback. |
1724 |
self.prefix + key for key in keys)) |
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1725 |
|
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
1726 |
def key_count(self): |
1727 |
"""Return an estimate of the number of keys in this index.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1728 |
|
2624.2.16
by Robert Collins
Add a key_count method to GraphIndex and friends, allowing optimisation of length calculations by the index. |
1729 |
For GraphIndexPrefixAdapter this is relatively expensive - key
|
1730 |
iteration with the prefix is done.
|
|
1731 |
"""
|
|
1732 |
return len(list(self.iter_all_entries())) |
|
1733 |
||
2624.2.12
by Robert Collins
Create an adapter between indices with differing key lengths. |
1734 |
def validate(self): |
1735 |
"""Call the adapted's validate."""
|
|
1736 |
self.adapted.validate() |