152
139
texts/deltas (via (fileid, revisionid) tuples).
153
140
:param signature_index: A GraphIndex for determining what signatures are
154
141
present in the Pack and accessing the locations of their texts.
155
:param chk_index: A GraphIndex for accessing content by CHK, if the
158
143
self.revision_index = revision_index
159
144
self.inventory_index = inventory_index
160
145
self.text_index = text_index
161
146
self.signature_index = signature_index
162
self.chk_index = chk_index
164
148
def access_tuple(self):
165
149
"""Return a tuple (transport, name) for the pack content."""
166
150
return self.pack_transport, self.file_name()
168
def _check_references(self):
169
"""Make sure our external references are present.
171
Packs are allowed to have deltas whose base is not in the pack, but it
172
must be present somewhere in this collection. It is not allowed to
173
have deltas based on a fallback repository.
174
(See <https://bugs.launchpad.net/bzr/+bug/288751>)
177
for (index_name, external_refs, index) in [
179
self._get_external_refs(self.text_index),
180
self._pack_collection.text_index.combined_index),
182
self._get_external_refs(self.inventory_index),
183
self._pack_collection.inventory_index.combined_index),
185
missing = external_refs.difference(
186
k for (idx, k, v, r) in
187
index.iter_entries(external_refs))
189
missing_items[index_name] = sorted(list(missing))
191
from pprint import pformat
192
raise errors.BzrCheckError(
193
"Newly created pack file %r has delta references to "
194
"items not in its repository:\n%s"
195
% (self, pformat(missing_items)))
197
152
def file_name(self):
198
153
"""Get the file name for the pack on disk."""
199
154
return self.name + '.pack'
225
172
"""The text index is the name + .tix."""
226
173
return self.index_name('text', name)
228
def _replace_index_with_readonly(self, index_type):
229
unlimited_cache = False
230
if index_type == 'chk':
231
unlimited_cache = True
232
setattr(self, index_type + '_index',
233
self.index_class(self.index_transport,
234
self.index_name(index_type, self.name),
235
self.index_sizes[self.index_offset(index_type)],
236
unlimited_cache=unlimited_cache))
175
def _external_compression_parents_of_texts(self):
178
for node in self.text_index.iter_all_entries():
180
refs.update(node[3][1])
239
184
class ExistingPack(Pack):
240
185
"""An in memory proxy for an existing .pack and its disk indices."""
242
187
def __init__(self, pack_transport, name, revision_index, inventory_index,
243
text_index, signature_index, chk_index=None):
188
text_index, signature_index):
244
189
"""Create an ExistingPack object.
246
191
:param pack_transport: The transport where the pack file resides.
247
192
:param name: The name of the pack on disk in the pack_transport.
249
194
Pack.__init__(self, revision_index, inventory_index, text_index,
250
signature_index, chk_index)
252
197
self.pack_transport = pack_transport
253
198
if None in (revision_index, inventory_index, text_index,
261
206
return not self.__eq__(other)
263
208
def __repr__(self):
264
return "<%s.%s object at 0x%x, %s, %s" % (
265
self.__class__.__module__, self.__class__.__name__, id(self),
266
self.pack_transport, self.name)
269
class ResumedPack(ExistingPack):
271
def __init__(self, name, revision_index, inventory_index, text_index,
272
signature_index, upload_transport, pack_transport, index_transport,
273
pack_collection, chk_index=None):
274
"""Create a ResumedPack object."""
275
ExistingPack.__init__(self, pack_transport, name, revision_index,
276
inventory_index, text_index, signature_index,
278
self.upload_transport = upload_transport
279
self.index_transport = index_transport
280
self.index_sizes = [None, None, None, None]
282
('revision', revision_index),
283
('inventory', inventory_index),
284
('text', text_index),
285
('signature', signature_index),
287
if chk_index is not None:
288
indices.append(('chk', chk_index))
289
self.index_sizes.append(None)
290
for index_type, index in indices:
291
offset = self.index_offset(index_type)
292
self.index_sizes[offset] = index._size
293
self.index_class = pack_collection._index_class
294
self._pack_collection = pack_collection
295
self._state = 'resumed'
296
# XXX: perhaps check that the .pack file exists?
298
def access_tuple(self):
299
if self._state == 'finished':
300
return Pack.access_tuple(self)
301
elif self._state == 'resumed':
302
return self.upload_transport, self.file_name()
304
raise AssertionError(self._state)
307
self.upload_transport.delete(self.file_name())
308
indices = [self.revision_index, self.inventory_index, self.text_index,
309
self.signature_index]
310
if self.chk_index is not None:
311
indices.append(self.chk_index)
312
for index in indices:
313
index._transport.delete(index._name)
316
self._check_references()
317
index_types = ['revision', 'inventory', 'text', 'signature']
318
if self.chk_index is not None:
319
index_types.append('chk')
320
for index_type in index_types:
321
old_name = self.index_name(index_type, self.name)
322
new_name = '../indices/' + old_name
323
self.upload_transport.rename(old_name, new_name)
324
self._replace_index_with_readonly(index_type)
325
new_name = '../packs/' + self.file_name()
326
self.upload_transport.rename(self.file_name(), new_name)
327
self._state = 'finished'
329
def _get_external_refs(self, index):
330
"""Return compression parents for this index that are not present.
332
This returns any compression parents that are referenced by this index,
333
which are not contained *in* this index. They may be present elsewhere.
335
return index.external_references(1)
209
return "<bzrlib.repofmt.pack_repo.Pack object at 0x%x, %s, %s" % (
210
id(self), self.pack_transport, self.name)
338
213
class NewPack(Pack):
339
214
"""An in memory proxy for a pack which is being created."""
341
def __init__(self, pack_collection, upload_suffix='', file_mode=None):
216
# A map of index 'type' to the file extension and position in the
218
index_definitions = {
219
'revision': ('.rix', 0),
220
'inventory': ('.iix', 1),
222
'signature': ('.six', 3),
225
def __init__(self, upload_transport, index_transport, pack_transport,
226
upload_suffix='', file_mode=None, index_builder_class=None,
342
228
"""Create a NewPack instance.
344
:param pack_collection: A PackCollection into which this is being inserted.
230
:param upload_transport: A writable transport for the pack to be
231
incrementally uploaded to.
232
:param index_transport: A writable transport for the pack's indices to
233
be written to when the pack is finished.
234
:param pack_transport: A writable transport for the pack to be renamed
235
to when the upload is complete. This *must* be the same as
236
upload_transport.clone('../packs').
345
237
:param upload_suffix: An optional suffix to be given to any temporary
346
238
files created during the pack creation. e.g '.autopack'
347
:param file_mode: Unix permissions for newly created file.
239
:param file_mode: An optional file mode to create the new files with.
240
:param index_builder_class: Required keyword parameter - the class of
241
index builder to use.
242
:param index_class: Required keyword parameter - the class of index
349
245
# The relative locations of the packs are constrained, but all are
350
246
# passed in because the caller has them, so as to avoid object churn.
351
index_builder_class = pack_collection._index_builder_class
352
if pack_collection.chk_index is not None:
353
chk_index = index_builder_class(reference_lists=0)
356
247
Pack.__init__(self,
357
248
# Revisions: parents list, no text compression.
358
249
index_builder_class(reference_lists=1),
367
258
# Signatures: Just blobs to store, no compression, no parents
369
260
index_builder_class(reference_lists=0),
370
# CHK based storage - just blobs, no compression or parents.
373
self._pack_collection = pack_collection
374
262
# When we make readonly indices, we need this.
375
self.index_class = pack_collection._index_class
263
self.index_class = index_class
376
264
# where should the new pack be opened
377
self.upload_transport = pack_collection._upload_transport
265
self.upload_transport = upload_transport
378
266
# where are indices written out to
379
self.index_transport = pack_collection._index_transport
267
self.index_transport = index_transport
380
268
# where is the pack renamed to when it is finished?
381
self.pack_transport = pack_collection._pack_transport
269
self.pack_transport = pack_transport
382
270
# What file mode to upload the pack and indices with.
383
271
self._file_mode = file_mode
384
272
# tracks the content written to the .pack file.
385
273
self._hash = osutils.md5()
386
# a tuple with the length in bytes of the indices, once the pack
387
# is finalised. (rev, inv, text, sigs, chk_if_in_use)
274
# a four-tuple with the length in bytes of the indices, once the pack
275
# is finalised. (rev, inv, text, sigs)
388
276
self.index_sizes = None
389
277
# How much data to cache when writing packs. Note that this is not
390
278
# synchronised with reads, because it's not in the transport layer, so
475
352
- stores the index size tuple for the pack in the index_sizes
478
self.finish_content()
480
self._check_references()
357
self._write_data('', flush=True)
358
self.name = self._hash.hexdigest()
482
360
# XXX: It'd be better to write them all to temporary names, then
483
361
# rename them all into place, so that the window when only some are
484
362
# visible is smaller. On the other hand none will be seen until
485
363
# they're in the names list.
486
364
self.index_sizes = [None, None, None, None]
487
self._write_index('revision', self.revision_index, 'revision', suspend)
488
self._write_index('inventory', self.inventory_index, 'inventory',
490
self._write_index('text', self.text_index, 'file texts', suspend)
365
self._write_index('revision', self.revision_index, 'revision')
366
self._write_index('inventory', self.inventory_index, 'inventory')
367
self._write_index('text', self.text_index, 'file texts')
491
368
self._write_index('signature', self.signature_index,
492
'revision signatures', suspend)
493
if self.chk_index is not None:
494
self.index_sizes.append(None)
495
self._write_index('chk', self.chk_index,
496
'content hash bytes', suspend)
369
'revision signatures')
497
370
self.write_stream.close()
498
371
# Note that this will clobber an existing pack with the same name,
499
372
# without checking for hash collisions. While this is undesirable this
506
379
# - try for HASH.pack
507
380
# - try for temporary-name
508
381
# - refresh the pack-list to see if the pack is now absent
509
new_name = self.name + '.pack'
511
new_name = '../packs/' + new_name
512
self.upload_transport.rename(self.random_name, new_name)
382
self.upload_transport.rename(self.random_name,
383
'../packs/' + self.name + '.pack')
513
384
self._state = 'finished'
514
385
if 'pack' in debug.debug_flags:
515
386
# XXX: size might be interesting?
516
mutter('%s: create_pack: pack finished: %s%s->%s t+%6.3fs',
387
mutter('%s: create_pack: pack renamed into place: %s%s->%s%s t+%6.3fs',
517
388
time.ctime(), self.upload_transport.base, self.random_name,
518
new_name, time.time() - self.start_time)
389
self.pack_transport, self.name,
390
time.time() - self.start_time)
521
393
"""Flush any current data."""
525
397
self._hash.update(bytes)
526
398
self._buffer[:] = [[], 0]
528
def _get_external_refs(self, index):
529
return index._external_references()
400
def index_name(self, index_type, name):
401
"""Get the disk name of an index type for pack name 'name'."""
402
return name + NewPack.index_definitions[index_type][0]
404
def index_offset(self, index_type):
405
"""Get the position in a index_size array for a given index type."""
406
return NewPack.index_definitions[index_type][1]
408
def _replace_index_with_readonly(self, index_type):
409
setattr(self, index_type + '_index',
410
self.index_class(self.index_transport,
411
self.index_name(index_type, self.name),
412
self.index_sizes[self.index_offset(index_type)]))
531
414
def set_write_cache_size(self, size):
532
415
self._cache_limit = size
534
def _write_index(self, index_type, index, label, suspend=False):
417
def _write_index(self, index_type, index, label):
535
418
"""Write out an index.
537
420
:param index_type: The type of index to write - e.g. 'revision'.
539
422
:param label: What label to give the index e.g. 'revision'.
541
424
index_name = self.index_name(index_type, self.name)
543
transport = self.upload_transport
545
transport = self.index_transport
546
self.index_sizes[self.index_offset(index_type)] = transport.put_file(
547
index_name, index.finish(), mode=self._file_mode)
425
self.index_sizes[self.index_offset(index_type)] = \
426
self.index_transport.put_file(index_name, index.finish(),
427
mode=self._file_mode)
548
428
if 'pack' in debug.debug_flags:
549
429
# XXX: size might be interesting?
550
430
mutter('%s: create_pack: wrote %s index: %s%s t+%6.3fs',
551
431
time.ctime(), label, self.upload_transport.base,
552
432
self.random_name, time.time() - self.start_time)
553
# Replace the writable index on this object with a readonly,
433
# Replace the writable index on this object with a readonly,
554
434
# presently unloaded index. We should alter
555
435
# the index layer to make its finish() error if add_node is
556
436
# subsequently used. RBC
582
462
self._reload_func = reload_func
583
463
self.index_to_pack = {}
584
464
self.combined_index = CombinedGraphIndex([], reload_func=reload_func)
585
self.data_access = _DirectPackAccess(self.index_to_pack,
586
reload_func=reload_func,
587
flush_func=flush_func)
465
self.data_access = _DirectPackAccess(self.index_to_pack)
466
self.add_callback = None
468
def replace_indices(self, index_to_pack, indices):
469
"""Replace the current mappings with fresh ones.
471
This should probably not be used eventually, rather incremental add and
472
removal of indices. It has been added during refactoring of existing
475
:param index_to_pack: A mapping from index objects to
476
(transport, name) tuples for the pack file data.
477
:param indices: A list of indices.
479
# refresh the revision pack map dict without replacing the instance.
480
self.index_to_pack.clear()
481
self.index_to_pack.update(index_to_pack)
482
# XXX: API break - clearly a 'replace' method would be good?
483
self.combined_index._indices[:] = indices
484
# the current add nodes callback for the current writable index if
588
486
self.add_callback = None
590
488
def add_index(self, index, pack):
625
523
self.data_access.set_writer(None, None, (None, None))
626
524
self.index_to_pack.clear()
627
525
del self.combined_index._indices[:]
628
del self.combined_index._index_names[:]
629
526
self.add_callback = None
631
def remove_index(self, index):
528
def remove_index(self, index, pack):
632
529
"""Remove index from the indices used to answer queries.
634
531
:param index: An index from the pack parameter.
532
:param pack: A Pack instance.
636
534
del self.index_to_pack[index]
637
pos = self.combined_index._indices.index(index)
638
del self.combined_index._indices[pos]
639
del self.combined_index._index_names[pos]
535
self.combined_index._indices.remove(index)
640
536
if (self.add_callback is not None and
641
537
getattr(index, 'add_nodes', None) == self.add_callback):
642
538
self.add_callback = None
677
568
def _extra_init(self):
678
569
"""A template hook to allow extending the constructor trivially."""
680
def _pack_map_and_index_list(self, index_attribute):
681
"""Convert a list of packs to an index pack map and index list.
683
:param index_attribute: The attribute that the desired index is found
685
:return: A tuple (map, list) where map contains the dict from
686
index:pack_tuple, and list contains the indices in the preferred
691
for pack_obj in self.packs:
692
index = getattr(pack_obj, index_attribute)
693
indices.append(index)
694
pack_map[index] = pack_obj
695
return pack_map, indices
697
def _index_contents(self, indices, key_filter=None):
698
"""Get an iterable of the index contents from a pack_map.
700
:param indices: The list of indices to query
701
:param key_filter: An optional filter to limit the keys returned.
703
all_index = CombinedGraphIndex(indices)
704
if key_filter is None:
705
return all_index.iter_all_entries()
707
return all_index.iter_entries(key_filter)
709
571
def pack(self, pb=None):
710
572
"""Create a new pack by reading data from other packs.
712
574
This does little more than a bulk copy of data. One key difference
713
575
is that data with the same item key across multiple packs is elided
714
576
from the output. The new pack is written into the current pack store
715
along with its indices, and the name added to the pack names. The
577
along with its indices, and the name added to the pack names. The
716
578
source packs are not altered and are not required to be in the current
749
610
def open_pack(self):
750
611
"""Open a pack for the pack we are creating."""
751
new_pack = self._pack_collection.pack_factory(self._pack_collection,
752
upload_suffix=self.suffix,
753
file_mode=self._pack_collection.repo.bzrdir._get_file_mode())
754
# We know that we will process all nodes in order, and don't need to
755
# query, so don't combine any indices spilled to disk until we are done
756
new_pack.revision_index.set_optimize(combine_backing_indices=False)
757
new_pack.inventory_index.set_optimize(combine_backing_indices=False)
758
new_pack.text_index.set_optimize(combine_backing_indices=False)
759
new_pack.signature_index.set_optimize(combine_backing_indices=False)
762
def _update_pack_order(self, entries, index_to_pack_map):
763
"""Determine how we want our packs to be ordered.
765
This changes the sort order of the self.packs list so that packs unused
766
by 'entries' will be at the end of the list, so that future requests
767
can avoid probing them. Used packs will be at the front of the
768
self.packs list, in the order of their first use in 'entries'.
770
:param entries: A list of (index, ...) tuples
771
:param index_to_pack_map: A mapping from index objects to pack objects.
775
for entry in entries:
777
if index not in seen_indexes:
778
packs.append(index_to_pack_map[index])
779
seen_indexes.add(index)
780
if len(packs) == len(self.packs):
781
if 'pack' in debug.debug_flags:
782
mutter('Not changing pack list, all packs used.')
784
seen_packs = set(packs)
785
for pack in self.packs:
786
if pack not in seen_packs:
789
if 'pack' in debug.debug_flags:
790
old_names = [p.access_tuple()[1] for p in self.packs]
791
new_names = [p.access_tuple()[1] for p in packs]
792
mutter('Reordering packs\nfrom: %s\n to: %s',
793
old_names, new_names)
612
return NewPack(self._pack_collection._upload_transport,
613
self._pack_collection._index_transport,
614
self._pack_collection._pack_transport, upload_suffix=self.suffix,
615
file_mode=self._pack_collection.repo.bzrdir._get_file_mode(),
616
index_builder_class=self._pack_collection._index_builder_class,
617
index_class=self._pack_collection._index_class)
796
619
def _copy_revision_texts(self):
797
620
"""Copy revision data to the new pack."""
940
755
self._pack_collection.allocate(new_pack)
943
def _copy_chks(self, refs=None):
944
# XXX: Todo, recursive follow-pointers facility when fetching some
946
chk_index_map, chk_indices = self._pack_map_and_index_list(
948
chk_nodes = self._index_contents(chk_indices, refs)
950
# TODO: This isn't strictly tasteful as we are accessing some private
951
# variables (_serializer). Perhaps a better way would be to have
952
# Repository._deserialise_chk_node()
953
search_key_func = chk_map.search_key_registry.get(
954
self._pack_collection.repo._serializer.search_key_name)
955
def accumlate_refs(lines):
956
# XXX: move to a generic location
958
bytes = ''.join(lines)
959
node = chk_map._deserialise(bytes, ("unknown",), search_key_func)
960
new_refs.update(node.refs())
961
self._copy_nodes(chk_nodes, chk_index_map, self.new_pack._writer,
962
self.new_pack.chk_index, output_lines=accumlate_refs)
965
def _copy_nodes(self, nodes, index_map, writer, write_index,
967
"""Copy knit nodes between packs with no graph references.
969
:param output_lines: Output full texts of copied items.
758
def _copy_nodes(self, nodes, index_map, writer, write_index):
759
"""Copy knit nodes between packs with no graph references."""
971
760
pb = ui.ui_factory.nested_progress_bar()
973
762
return self._do_copy_nodes(nodes, index_map, writer,
974
write_index, pb, output_lines=output_lines)
978
def _do_copy_nodes(self, nodes, index_map, writer, write_index, pb,
767
def _do_copy_nodes(self, nodes, index_map, writer, write_index, pb):
980
768
# for record verification
981
769
knit = KnitVersionedFiles(None, None)
982
770
# plan a readv on each source pack:
1003
791
# linear scan up the pack
1004
792
pack_readv_requests.sort()
1006
pack_obj = index_map[index]
1007
transport, path = pack_obj.access_tuple()
1009
reader = pack.make_readv_reader(transport, path,
1010
[offset[0:2] for offset in pack_readv_requests])
1011
except errors.NoSuchFile:
1012
if self._reload_func is not None:
794
transport, path = index_map[index]
795
reader = pack.make_readv_reader(transport, path,
796
[offset[0:2] for offset in pack_readv_requests])
1015
797
for (names, read_func), (_1, _2, (key, eol_flag)) in \
1016
798
izip(reader.iter_records(), pack_readv_requests):
1017
799
raw_data = read_func(None)
1018
800
# check the header only
1019
if output_lines is not None:
1020
output_lines(knit._parse_record(key[-1], raw_data)[0])
1022
df, _ = knit._parse_record_header(key, raw_data)
801
df, _ = knit._parse_record_header(key, raw_data)
1024
803
pos, size = writer.add_bytes_record(raw_data, names)
1025
804
write_index.add_node(key, eol_flag + "%d %d" % (pos, size))
1026
805
pb.update("Copied record", record_index)
1086
859
record_index += 1
1088
861
def _get_text_nodes(self):
1089
text_index_map, text_indices = self._pack_map_and_index_list(
1091
return text_index_map, self._index_contents(text_indices,
862
text_index_map = self._pack_collection._packs_list_to_pack_map_and_index_list(
863
self.packs, 'text_index')[0]
864
return text_index_map, self._pack_collection._index_contents(text_index_map,
1092
865
self._text_filter)
1094
867
def _least_readv_node_readv(self, nodes):
1095
868
"""Generate request groups for nodes using the least readv's.
1097
870
:param nodes: An iterable of graph index nodes.
1098
871
:return: Total node count and an iterator of the data needed to perform
1099
872
readvs to obtain the data for nodes. Each item yielded by the
1100
873
iterator is a tuple with:
1101
874
index, readv_vector, node_vector. readv_vector is a list ready to
1102
875
hand to the transport readv method, and node_vector is a list of
1103
(key, eol_flag, references) for the node retrieved by the
876
(key, eol_flag, references) for the the node retrieved by the
1104
877
matching readv_vector.
1106
879
# group by pack so we do one readv per pack
1382
1149
self._pack_transport = pack_transport
1383
1150
self._index_builder_class = index_builder_class
1384
1151
self._index_class = index_class
1385
self._suffix_offsets = {'.rix': 0, '.iix': 1, '.tix': 2, '.six': 3,
1152
self._suffix_offsets = {'.rix': 0, '.iix': 1, '.tix': 2, '.six': 3}
1387
1153
self.packs = []
1388
1154
# name:Pack mapping
1390
1155
self._packs_by_name = {}
1391
1156
# the previous pack-names content
1392
1157
self._packs_at_load = None
1393
1158
# when a pack is being created by this object, the state of that pack.
1394
1159
self._new_pack = None
1395
1160
# aggregated revision index data
1396
flush = self._flush_new_pack
1397
self.revision_index = AggregateIndex(self.reload_pack_names, flush)
1398
self.inventory_index = AggregateIndex(self.reload_pack_names, flush)
1399
self.text_index = AggregateIndex(self.reload_pack_names, flush)
1400
self.signature_index = AggregateIndex(self.reload_pack_names, flush)
1401
all_indices = [self.revision_index, self.inventory_index,
1402
self.text_index, self.signature_index]
1404
self.chk_index = AggregateIndex(self.reload_pack_names, flush)
1405
all_indices.append(self.chk_index)
1407
# used to determine if we're using a chk_index elsewhere.
1408
self.chk_index = None
1409
# Tell all the CombinedGraphIndex objects about each other, so they can
1410
# share hints about which pack names to search first.
1411
all_combined = [agg_idx.combined_index for agg_idx in all_indices]
1412
for combined_idx in all_combined:
1413
combined_idx.set_sibling_indices(
1414
set(all_combined).difference([combined_idx]))
1416
self._resumed_packs = []
1419
return '%s(%r)' % (self.__class__.__name__, self.repo)
1161
self.revision_index = AggregateIndex(self.reload_pack_names)
1162
self.inventory_index = AggregateIndex(self.reload_pack_names)
1163
self.text_index = AggregateIndex(self.reload_pack_names)
1164
self.signature_index = AggregateIndex(self.reload_pack_names)
1421
1166
def add_pack_to_memory(self, pack):
1422
1167
"""Make a Pack object available to the repository to satisfy queries.
1424
1169
:param pack: A Pack object.
1426
1171
if pack.name in self._packs_by_name:
1427
raise AssertionError(
1428
'pack %s already in _packs_by_name' % (pack.name,))
1172
raise AssertionError()
1429
1173
self.packs.append(pack)
1430
1174
self._packs_by_name[pack.name] = pack
1431
1175
self.revision_index.add_index(pack.revision_index, pack)
1432
1176
self.inventory_index.add_index(pack.inventory_index, pack)
1433
1177
self.text_index.add_index(pack.text_index, pack)
1434
1178
self.signature_index.add_index(pack.signature_index, pack)
1435
if self.chk_index is not None:
1436
self.chk_index.add_index(pack.chk_index, pack)
1438
1180
def all_packs(self):
1439
1181
"""Return a list of all the Pack objects this repository has.
1461
1203
in synchronisation with certain steps. Otherwise the names collection
1462
1204
is not flushed.
1464
:return: Something evaluating true if packing took place.
1206
:return: True if packing took place.
1468
return self._do_autopack()
1469
except errors.RetryAutopack:
1470
# If we get a RetryAutopack exception, we should abort the
1471
# current action, and retry.
1474
def _do_autopack(self):
1475
1208
# XXX: Should not be needed when the management of indices is sane.
1476
1209
total_revisions = self.revision_index.combined_index.key_count()
1477
1210
total_packs = len(self._names)
1478
1211
if self._max_pack_count(total_revisions) >= total_packs:
1213
# XXX: the following may want to be a class, to pack with a given
1215
mutter('Auto-packing repository %s, which has %d pack files, '
1216
'containing %d revisions into %d packs.', self, total_packs,
1217
total_revisions, self._max_pack_count(total_revisions))
1480
1218
# determine which packs need changing
1481
1219
pack_distribution = self.pack_distribution(total_revisions)
1482
1220
existing_packs = []
1490
1228
# group their data with the relevant commit, and that may
1491
1229
# involve rewriting ancient history - which autopack tries to
1492
1230
# avoid. Alternatively we could not group the data but treat
1493
# each of these as having a single revision, and thus add
1231
# each of these as having a single revision, and thus add
1494
1232
# one revision for each to the total revision count, to get
1495
1233
# a matching distribution.
1497
1235
existing_packs.append((revision_count, pack))
1498
1236
pack_operations = self.plan_autopack_combinations(
1499
1237
existing_packs, pack_distribution)
1500
num_new_packs = len(pack_operations)
1501
num_old_packs = sum([len(po[1]) for po in pack_operations])
1502
num_revs_affected = sum([po[0] for po in pack_operations])
1503
mutter('Auto-packing repository %s, which has %d pack files, '
1504
'containing %d revisions. Packing %d files into %d affecting %d'
1505
' revisions', self, total_packs, total_revisions, num_old_packs,
1506
num_new_packs, num_revs_affected)
1507
result = self._execute_pack_operations(pack_operations,
1508
reload_func=self._restart_autopack)
1509
mutter('Auto-packing repository %s completed', self)
1238
self._execute_pack_operations(pack_operations)
1512
def _execute_pack_operations(self, pack_operations, _packer_class=Packer,
1241
def _execute_pack_operations(self, pack_operations, _packer_class=Packer):
1514
1242
"""Execute a series of pack operations.
1516
1244
:param pack_operations: A list of [revision_count, packs_to_combine].
1517
1245
:param _packer_class: The class of packer to use (default: Packer).
1518
:return: The new pack names.
1520
1248
for revision_count, packs in pack_operations:
1521
1249
# we may have no-ops from the setup logic
1522
1250
if len(packs) == 0:
1524
packer = _packer_class(self, packs, '.autopack',
1525
reload_func=reload_func)
1528
except errors.RetryWithNewPacks:
1529
# An exception is propagating out of this context, make sure
1530
# this packer has cleaned up. Packer() doesn't set its new_pack
1531
# state into the RepositoryPackCollection object, so we only
1532
# have access to it directly here.
1533
if packer.new_pack is not None:
1534
packer.new_pack.abort()
1252
_packer_class(self, packs, '.autopack').pack()
1536
1253
for pack in packs:
1537
1254
self._remove_pack_from_memory(pack)
1538
1255
# record the newly available packs and stop advertising the old
1540
to_be_obsoleted = []
1541
for _, packs in pack_operations:
1542
to_be_obsoleted.extend(packs)
1543
result = self._save_pack_names(clear_obsolete_packs=True,
1544
obsolete_packs=to_be_obsoleted)
1547
def _flush_new_pack(self):
1548
if self._new_pack is not None:
1549
self._new_pack.flush()
1257
self._save_pack_names(clear_obsolete_packs=True)
1258
# Move the old packs out of the way now they are no longer referenced.
1259
for revision_count, packs in pack_operations:
1260
self._obsolete_packs(packs)
1551
1262
def lock_names(self):
1552
1263
"""Acquire the mutex around the pack-names index.
1554
1265
This cannot be used in the middle of a read-only transaction on the
1557
1268
self.repo.control_files.lock_write()
1559
def _already_packed(self):
1560
"""Is the collection already packed?"""
1561
return not (self.repo._format.pack_compresses or (len(self._names) > 1))
1563
def pack(self, hint=None, clean_obsolete_packs=False):
1564
1271
"""Pack the pack collection totally."""
1565
1272
self.ensure_loaded()
1566
1273
total_packs = len(self._names)
1567
if self._already_packed():
1275
# This is arguably wrong because we might not be optimal, but for
1276
# now lets leave it in. (e.g. reconcile -> one pack. But not
1569
1279
total_revisions = self.revision_index.combined_index.key_count()
1570
1280
# XXX: the following may want to be a class, to pack with a given
1572
1282
mutter('Packing repository %s, which has %d pack files, '
1573
'containing %d revisions with hint %r.', self, total_packs,
1574
total_revisions, hint)
1283
'containing %d revisions into 1 packs.', self, total_packs,
1575
1285
# determine which packs need changing
1286
pack_distribution = [1]
1576
1287
pack_operations = [[0, []]]
1577
1288
for pack in self.all_packs():
1578
if hint is None or pack.name in hint:
1579
# Either no hint was provided (so we are packing everything),
1580
# or this pack was included in the hint.
1581
pack_operations[-1][0] += pack.get_revision_count()
1582
pack_operations[-1][1].append(pack)
1289
pack_operations[-1][0] += pack.get_revision_count()
1290
pack_operations[-1][1].append(pack)
1583
1291
self._execute_pack_operations(pack_operations, OptimisingPacker)
1585
if clean_obsolete_packs:
1586
self._clear_obsolete_packs()
1588
1293
def plan_autopack_combinations(self, existing_packs, pack_distribution):
1589
1294
"""Plan a pack operation.
1677
1374
inv_index = self._make_index(name, '.iix')
1678
1375
txt_index = self._make_index(name, '.tix')
1679
1376
sig_index = self._make_index(name, '.six')
1680
if self.chk_index is not None:
1681
chk_index = self._make_index(name, '.cix', unlimited_cache=True)
1684
1377
result = ExistingPack(self._pack_transport, name, rev_index,
1685
inv_index, txt_index, sig_index, chk_index)
1378
inv_index, txt_index, sig_index)
1686
1379
self.add_pack_to_memory(result)
1689
def _resume_pack(self, name):
1690
"""Get a suspended Pack object by name.
1692
:param name: The name of the pack - e.g. '123456'
1693
:return: A Pack object.
1695
if not re.match('[a-f0-9]{32}', name):
1696
# Tokens should be md5sums of the suspended pack file, i.e. 32 hex
1698
raise errors.UnresumableWriteGroup(
1699
self.repo, [name], 'Malformed write group token')
1701
rev_index = self._make_index(name, '.rix', resume=True)
1702
inv_index = self._make_index(name, '.iix', resume=True)
1703
txt_index = self._make_index(name, '.tix', resume=True)
1704
sig_index = self._make_index(name, '.six', resume=True)
1705
if self.chk_index is not None:
1706
chk_index = self._make_index(name, '.cix', resume=True,
1707
unlimited_cache=True)
1710
result = self.resumed_pack_factory(name, rev_index, inv_index,
1711
txt_index, sig_index, self._upload_transport,
1712
self._pack_transport, self._index_transport, self,
1713
chk_index=chk_index)
1714
except errors.NoSuchFile, e:
1715
raise errors.UnresumableWriteGroup(self.repo, [name], str(e))
1716
self.add_pack_to_memory(result)
1717
self._resumed_packs.append(result)
1720
1382
def allocate(self, a_new_pack):
1721
1383
"""Allocate name in the list of packs.
1740
1402
return self._index_class(self.transport, 'pack-names', None
1741
1403
).iter_all_entries()
1743
def _make_index(self, name, suffix, resume=False, unlimited_cache=False):
1405
def _make_index(self, name, suffix):
1744
1406
size_offset = self._suffix_offsets[suffix]
1745
1407
index_name = name + suffix
1747
transport = self._upload_transport
1748
index_size = transport.stat(index_name).st_size
1750
transport = self._index_transport
1751
index_size = self._names[name][size_offset]
1752
return self._index_class(transport, index_name, index_size,
1753
unlimited_cache=unlimited_cache)
1408
index_size = self._names[name][size_offset]
1409
return self._index_class(
1410
self._index_transport, index_name, index_size)
1755
1412
def _max_pack_count(self, total_revisions):
1756
1413
"""Return the maximum number of packs to use for total revisions.
1758
1415
:param total_revisions: The total number of revisions in the
1784
1441
:param return: None.
1786
1443
for pack in packs:
1788
pack.pack_transport.rename(pack.file_name(),
1789
'../obsolete_packs/' + pack.file_name())
1790
except (errors.PathError, errors.TransportError), e:
1791
# TODO: Should these be warnings or mutters?
1792
mutter("couldn't rename obsolete pack, skipping it:\n%s"
1444
pack.pack_transport.rename(pack.file_name(),
1445
'../obsolete_packs/' + pack.file_name())
1794
1446
# TODO: Probably needs to know all possible indices for this pack
1795
1447
# - or maybe list the directory and move all indices matching this
1796
1448
# name whether we recognize it or not?
1797
suffixes = ['.iix', '.six', '.tix', '.rix']
1798
if self.chk_index is not None:
1799
suffixes.append('.cix')
1800
for suffix in suffixes:
1802
self._index_transport.rename(pack.name + suffix,
1803
'../obsolete_packs/' + pack.name + suffix)
1804
except (errors.PathError, errors.TransportError), e:
1805
mutter("couldn't rename obsolete index, skipping it:\n%s"
1449
for suffix in ('.iix', '.six', '.tix', '.rix'):
1450
self._index_transport.rename(pack.name + suffix,
1451
'../obsolete_packs/' + pack.name + suffix)
1808
1453
def pack_distribution(self, total_revisions):
1809
1454
"""Generate a list of the number of revisions to put in each pack.
1835
1480
self._remove_pack_indices(pack)
1836
1481
self.packs.remove(pack)
1838
def _remove_pack_indices(self, pack, ignore_missing=False):
1839
"""Remove the indices for pack from the aggregated indices.
1841
:param ignore_missing: Suppress KeyErrors from calling remove_index.
1843
for index_type in Pack.index_definitions.keys():
1844
attr_name = index_type + '_index'
1845
aggregate_index = getattr(self, attr_name)
1846
if aggregate_index is not None:
1847
pack_index = getattr(pack, attr_name)
1849
aggregate_index.remove_index(pack_index)
1483
def _remove_pack_indices(self, pack):
1484
"""Remove the indices for pack from the aggregated indices."""
1485
self.revision_index.remove_index(pack.revision_index, pack)
1486
self.inventory_index.remove_index(pack.inventory_index, pack)
1487
self.text_index.remove_index(pack.text_index, pack)
1488
self.signature_index.remove_index(pack.signature_index, pack)
1855
1490
def reset(self):
1856
1491
"""Clear all cached data."""
1857
1492
# cached revision data
1493
self.repo._revision_knit = None
1858
1494
self.revision_index.clear()
1859
1495
# cached signature data
1496
self.repo._signature_knit = None
1860
1497
self.signature_index.clear()
1861
1498
# cached file text data
1862
1499
self.text_index.clear()
1500
self.repo._text_knit = None
1863
1501
# cached inventory data
1864
1502
self.inventory_index.clear()
1866
if self.chk_index is not None:
1867
self.chk_index.clear()
1868
1503
# remove the open pack
1869
1504
self._new_pack = None
1870
1505
# information about packs.
1873
1508
self._packs_by_name = {}
1874
1509
self._packs_at_load = None
1511
def _make_index_map(self, index_suffix):
1512
"""Return information on existing indices.
1514
:param suffix: Index suffix added to pack name.
1516
:returns: (pack_map, indices) where indices is a list of GraphIndex
1517
objects, and pack_map is a mapping from those objects to the
1518
pack tuple they describe.
1520
# TODO: stop using this; it creates new indices unnecessarily.
1521
self.ensure_loaded()
1522
suffix_map = {'.rix': 'revision_index',
1523
'.six': 'signature_index',
1524
'.iix': 'inventory_index',
1525
'.tix': 'text_index',
1527
return self._packs_list_to_pack_map_and_index_list(self.all_packs(),
1528
suffix_map[index_suffix])
1530
def _packs_list_to_pack_map_and_index_list(self, packs, index_attribute):
1531
"""Convert a list of packs to an index pack map and index list.
1533
:param packs: The packs list to process.
1534
:param index_attribute: The attribute that the desired index is found
1536
:return: A tuple (map, list) where map contains the dict from
1537
index:pack_tuple, and lsit contains the indices in the same order
1543
index = getattr(pack, index_attribute)
1544
indices.append(index)
1545
pack_map[index] = (pack.pack_transport, pack.file_name())
1546
return pack_map, indices
1548
def _index_contents(self, pack_map, key_filter=None):
1549
"""Get an iterable of the index contents from a pack_map.
1551
:param pack_map: A map from indices to pack details.
1552
:param key_filter: An optional filter to limit the
1555
indices = [index for index in pack_map.iterkeys()]
1556
all_index = CombinedGraphIndex(indices)
1557
if key_filter is None:
1558
return all_index.iter_all_entries()
1560
return all_index.iter_entries(key_filter)
1876
1562
def _unlock_names(self):
1877
1563
"""Release the mutex around the pack-names index."""
1878
1564
self.repo.control_files.unlock()
1965
1650
:param clear_obsolete_packs: If True, clear out the contents of the
1966
1651
obsolete_packs directory.
1967
:param obsolete_packs: Packs that are obsolete once the new pack-names
1968
file has been written.
1969
:return: A list of the names saved that were not previously on disk.
1971
already_obsolete = []
1972
1653
self.lock_names()
1974
1655
builder = self._index_builder_class()
1975
(disk_nodes, deleted_nodes, new_nodes,
1976
orig_disk_nodes) = self._diff_pack_names()
1977
# TODO: handle same-name, index-size-changes here -
1656
disk_nodes, deleted_nodes, new_nodes = self._diff_pack_names()
1657
# TODO: handle same-name, index-size-changes here -
1978
1658
# e.g. use the value from disk, not ours, *unless* we're the one
1980
1660
for key, value in disk_nodes:
1981
1661
builder.add_node(key, value)
1982
1662
self.transport.put_file('pack-names', builder.finish(),
1983
1663
mode=self.repo.bzrdir._get_file_mode())
1664
# move the baseline forward
1984
1665
self._packs_at_load = disk_nodes
1985
1666
if clear_obsolete_packs:
1988
to_preserve = set([o.name for o in obsolete_packs])
1989
already_obsolete = self._clear_obsolete_packs(to_preserve)
1667
self._clear_obsolete_packs()
1991
1669
self._unlock_names()
1992
1670
# synchronise the memory packs list with what we just wrote:
1993
1671
self._syncronize_pack_names_from_disk_nodes(disk_nodes)
1995
# TODO: We could add one more condition here. "if o.name not in
1996
# orig_disk_nodes and o != the new_pack we haven't written to
1997
# disk yet. However, the new pack object is not easily
1998
# accessible here (it would have to be passed through the
1999
# autopacking code, etc.)
2000
obsolete_packs = [o for o in obsolete_packs
2001
if o.name not in already_obsolete]
2002
self._obsolete_packs(obsolete_packs)
2003
return [new_node[0][0] for new_node in new_nodes]
2005
1673
def reload_pack_names(self):
2006
1674
"""Sync our pack listing with what is present in the repository.
2008
1676
This should be called when we find out that something we thought was
2009
1677
present is now missing. This happens when another process re-packs the
2010
1678
repository, etc.
2012
:return: True if the in-memory list of packs has been altered at all.
2014
# The ensure_loaded call is to handle the case where the first call
2015
# made involving the collection was to reload_pack_names, where we
2016
# don't have a view of disk contents. Its a bit of a bandaid, and
2017
# causes two reads of pack-names, but its a rare corner case not struck
2018
# with regular push/pull etc.
2019
first_read = self.ensure_loaded()
1680
# This is functionally similar to _save_pack_names, but we don't write
2022
1681
# out the new value.
2023
(disk_nodes, deleted_nodes, new_nodes,
2024
orig_disk_nodes) = self._diff_pack_names()
2025
# _packs_at_load is meant to be the explicit list of names in
2026
# 'pack-names' at then start. As such, it should not contain any
2027
# pending names that haven't been written out yet.
2028
self._packs_at_load = orig_disk_nodes
1682
disk_nodes, _, _ = self._diff_pack_names()
1683
self._packs_at_load = disk_nodes
2029
1684
(removed, added,
2030
1685
modified) = self._syncronize_pack_names_from_disk_nodes(disk_nodes)
2031
1686
if removed or added or modified:
2035
def _restart_autopack(self):
2036
"""Reload the pack names list, and restart the autopack code."""
2037
if not self.reload_pack_names():
2038
# Re-raise the original exception, because something went missing
2039
# and a restart didn't find it
2041
raise errors.RetryAutopack(self.repo, False, sys.exc_info())
2043
def _clear_obsolete_packs(self, preserve=None):
1690
def _clear_obsolete_packs(self):
2044
1691
"""Delete everything from the obsolete-packs directory.
2046
:return: A list of pack identifiers (the filename without '.pack') that
2047
were found in obsolete_packs.
2050
1693
obsolete_pack_transport = self.transport.clone('obsolete_packs')
2051
if preserve is None:
2053
1694
for filename in obsolete_pack_transport.list_dir('.'):
2054
name, ext = osutils.splitext(filename)
2057
if name in preserve:
2060
1696
obsolete_pack_transport.delete(filename)
2061
1697
except (errors.PathError, errors.TransportError), e:
2062
warning("couldn't delete obsolete pack, skipping it:\n%s"
1698
warning("couldn't delete obsolete pack, skipping it:\n%s" % (e,))
2066
1700
def _start_write_group(self):
2067
1701
# Do not permit preparation for writing if we're not in a 'write lock'.
2068
1702
if not self.repo.is_write_locked():
2069
1703
raise errors.NotWriteLocked(self)
2070
self._new_pack = self.pack_factory(self, upload_suffix='.pack',
2071
file_mode=self.repo.bzrdir._get_file_mode())
1704
self._new_pack = NewPack(self._upload_transport, self._index_transport,
1705
self._pack_transport, upload_suffix='.pack',
1706
file_mode=self.repo.bzrdir._get_file_mode(),
1707
index_builder_class=self._index_builder_class,
1708
index_class=self._index_class)
2072
1709
# allow writing: queue writes to a new index
2073
1710
self.revision_index.add_writable_index(self._new_pack.revision_index,
2074
1711
self._new_pack)
2094
1725
# FIXME: just drop the transient index.
2095
1726
# forget what names there are
2096
1727
if self._new_pack is not None:
2097
operation = cleanup.OperationWithCleanups(self._new_pack.abort)
2098
operation.add_cleanup(setattr, self, '_new_pack', None)
2099
# If we aborted while in the middle of finishing the write
2100
# group, _remove_pack_indices could fail because the indexes are
2101
# already gone. But they're not there we shouldn't fail in this
2102
# case, so we pass ignore_missing=True.
2103
operation.add_cleanup(self._remove_pack_indices, self._new_pack,
2104
ignore_missing=True)
2105
operation.run_simple()
2106
for resumed_pack in self._resumed_packs:
2107
operation = cleanup.OperationWithCleanups(resumed_pack.abort)
2108
# See comment in previous finally block.
2109
operation.add_cleanup(self._remove_pack_indices, resumed_pack,
2110
ignore_missing=True)
2111
operation.run_simple()
2112
del self._resumed_packs[:]
2114
def _remove_resumed_pack_indices(self):
2115
for resumed_pack in self._resumed_packs:
2116
self._remove_pack_indices(resumed_pack)
2117
del self._resumed_packs[:]
2119
def _check_new_inventories(self):
2120
"""Detect missing inventories in this write group.
2122
:returns: list of strs, summarising any problems found. If the list is
2123
empty no problems were found.
2125
# The base implementation does no checks. GCRepositoryPackCollection
1728
self._new_pack.abort()
1729
self._remove_pack_indices(self._new_pack)
1730
self._new_pack = None
1731
self.repo._text_knit = None
2129
1733
def _commit_write_group(self):
2131
for prefix, versioned_file in (
2132
('revisions', self.repo.revisions),
2133
('inventories', self.repo.inventories),
2134
('texts', self.repo.texts),
2135
('signatures', self.repo.signatures),
2137
missing = versioned_file.get_missing_compression_parent_keys()
2138
all_missing.update([(prefix,) + key for key in missing])
2140
raise errors.BzrCheckError(
2141
"Repository %s has missing compression parent(s) %r "
2142
% (self.repo, sorted(all_missing)))
2143
problems = self._check_new_inventories()
2145
problems_summary = '\n'.join(problems)
2146
raise errors.BzrCheckError(
2147
"Cannot add revision(s) to repository: " + problems_summary)
2148
1734
self._remove_pack_indices(self._new_pack)
2149
any_new_content = False
2150
1735
if self._new_pack.data_inserted():
2151
1736
# get all the data to disk and read to use
2152
1737
self._new_pack.finish()
2153
1738
self.allocate(self._new_pack)
2154
1739
self._new_pack = None
2155
any_new_content = True
2157
self._new_pack.abort()
2158
self._new_pack = None
2159
for resumed_pack in self._resumed_packs:
2160
# XXX: this is a pretty ugly way to turn the resumed pack into a
2161
# properly committed pack.
2162
self._names[resumed_pack.name] = None
2163
self._remove_pack_from_memory(resumed_pack)
2164
resumed_pack.finish()
2165
self.allocate(resumed_pack)
2166
any_new_content = True
2167
del self._resumed_packs[:]
2169
result = self.autopack()
1740
if not self.autopack():
2171
1741
# when autopack takes no steps, the names list is still
2173
return self._save_pack_names()
2177
def _suspend_write_group(self):
2178
tokens = [pack.name for pack in self._resumed_packs]
2179
self._remove_pack_indices(self._new_pack)
2180
if self._new_pack.data_inserted():
2181
# get all the data to disk and read to use
2182
self._new_pack.finish(suspend=True)
2183
tokens.append(self._new_pack.name)
2184
self._new_pack = None
1743
self._save_pack_names()
2186
1745
self._new_pack.abort()
2187
1746
self._new_pack = None
2188
self._remove_resumed_pack_indices()
1747
self.repo._text_knit = None
2191
def _resume_write_group(self, tokens):
2192
for token in tokens:
2193
self._resume_pack(token)
1749
def _check_references_present(self, external_refs):
1750
index = self.text_index.combined_index
1751
found_items = list(index.iter_entries(external_refs))
1752
if len(found_items) != len(external_refs):
1753
found_keys = set(k for idx, k, refs, value in found_items)
1754
missing_items = external_refs - found_keys
1755
missing_file_id, missing_revision_id = missing_items.pop()
1756
raise errors.RevisionNotPresent(missing_revision_id,
2196
1760
class KnitPackRepository(KnitRepository):
2197
1761
"""Repository with knit objects stored inside pack containers.
2199
1763
The layering for a KnitPackRepository is:
2201
1765
Graph | HPSS | Repository public layer |
2256
1817
deltas=True, parents=True, is_locked=self.is_locked),
2257
1818
data_access=self._pack_collection.text_index.data_access,
2258
1819
max_delta_chain=200)
2259
if _format.supports_chks:
2260
# No graph, no compression:- references from chks are between
2261
# different objects not temporal versions of the same; and without
2262
# some sort of temporal structure knit compression will just fail.
2263
self.chk_bytes = KnitVersionedFiles(
2264
_KnitGraphIndex(self._pack_collection.chk_index.combined_index,
2265
add_callback=self._pack_collection.chk_index.add_callback,
2266
deltas=False, parents=False, is_locked=self.is_locked),
2267
data_access=self._pack_collection.chk_index.data_access,
2270
self.chk_bytes = None
2271
1820
# True when the repository object is 'write locked' (as opposed to the
2272
# physical lock only taken out around changes to the pack-names list.)
1821
# physical lock only taken out around changes to the pack-names list.)
2273
1822
# Another way to represent this would be a decorator around the control
2274
1823
# files object that presents logical locks as physical ones - if this
2275
1824
# gets ugly consider that alternative design. RBC 20071011
2279
1828
self._reconcile_does_inventory_gc = True
2280
1829
self._reconcile_fixes_text_parents = True
2281
1830
self._reconcile_backsup_inventory = False
1831
self._fetch_order = 'unordered'
2283
def _warn_if_deprecated(self, branch=None):
1833
def _warn_if_deprecated(self):
2284
1834
# This class isn't deprecated, but one sub-format is
2285
1835
if isinstance(self._format, RepositoryFormatKnitPack5RichRootBroken):
2286
super(KnitPackRepository, self)._warn_if_deprecated(branch)
1836
from bzrlib import repository
1837
if repository._deprecation_warning_done:
1839
repository._deprecation_warning_done = True
1840
warning("Format %s for %s is deprecated - please use"
1841
" 'bzr upgrade --1.6.1-rich-root'"
1842
% (self._format, self.bzrdir.transport.base))
2288
1844
def _abort_write_group(self):
2289
self.revisions._index._key_dependencies.clear()
2290
1845
self._pack_collection._abort_write_group()
2292
def _get_source(self, to_format):
2293
if to_format.network_name() == self._format.network_name():
2294
return KnitPackStreamSource(self, to_format)
2295
return super(KnitPackRepository, self)._get_source(to_format)
1847
def _find_inconsistent_revision_parents(self):
1848
"""Find revisions with incorrectly cached parents.
1850
:returns: an iterator yielding tuples of (revison-id, parents-in-index,
1851
parents-in-revision).
1853
if not self.is_locked():
1854
raise errors.ObjectNotLocked(self)
1855
pb = ui.ui_factory.nested_progress_bar()
1858
revision_nodes = self._pack_collection.revision_index \
1859
.combined_index.iter_all_entries()
1860
index_positions = []
1861
# Get the cached index values for all revisions, and also the location
1862
# in each index of the revision text so we can perform linear IO.
1863
for index, key, value, refs in revision_nodes:
1864
pos, length = value[1:].split(' ')
1865
index_positions.append((index, int(pos), key[0],
1866
tuple(parent[0] for parent in refs[0])))
1867
pb.update("Reading revision index.", 0, 0)
1868
index_positions.sort()
1869
batch_count = len(index_positions) / 1000 + 1
1870
pb.update("Checking cached revision graph.", 0, batch_count)
1871
for offset in xrange(batch_count):
1872
pb.update("Checking cached revision graph.", offset)
1873
to_query = index_positions[offset * 1000:(offset + 1) * 1000]
1876
rev_ids = [item[2] for item in to_query]
1877
revs = self.get_revisions(rev_ids)
1878
for revision, item in zip(revs, to_query):
1879
index_parents = item[3]
1880
rev_parents = tuple(revision.parent_ids)
1881
if index_parents != rev_parents:
1882
result.append((revision.revision_id, index_parents, rev_parents))
1887
@symbol_versioning.deprecated_method(symbol_versioning.one_one)
1888
def get_parents(self, revision_ids):
1889
"""See graph._StackedParentsProvider.get_parents."""
1890
parent_map = self.get_parent_map(revision_ids)
1891
return [parent_map.get(r, None) for r in revision_ids]
2297
1893
def _make_parents_provider(self):
2298
1894
return graph.CachingParentsProvider(self)
2300
1896
def _refresh_data(self):
2301
if not self.is_locked():
2303
self._pack_collection.reload_pack_names()
1897
if self._write_lock_count == 1 or (
1898
self.control_files._lock_count == 1 and
1899
self.control_files._lock_mode == 'r'):
1900
# forget what names there are
1901
self._pack_collection.reset()
1902
# XXX: Better to do an in-memory merge when acquiring a new lock -
1903
# factor out code from _save_pack_names.
1904
self._pack_collection.ensure_loaded()
2305
1906
def _start_write_group(self):
2306
1907
self._pack_collection._start_write_group()
2308
1909
def _commit_write_group(self):
2309
hint = self._pack_collection._commit_write_group()
2310
self.revisions._index._key_dependencies.clear()
2313
def suspend_write_group(self):
2314
# XXX check self._write_group is self.get_transaction()?
2315
tokens = self._pack_collection._suspend_write_group()
2316
self.revisions._index._key_dependencies.clear()
2317
self._write_group = None
2320
def _resume_write_group(self, tokens):
2321
self._start_write_group()
2323
self._pack_collection._resume_write_group(tokens)
2324
except errors.UnresumableWriteGroup:
2325
self._abort_write_group()
2327
for pack in self._pack_collection._resumed_packs:
2328
self.revisions._index.scan_unvalidated_index(pack.revision_index)
1910
return self._pack_collection._commit_write_group()
2330
1912
def get_transaction(self):
2331
1913
if self._write_lock_count:
2340
1922
return self._write_lock_count
2342
1924
def lock_write(self, token=None):
2343
locked = self.is_locked()
2344
if not self._write_lock_count and locked:
1925
if not self._write_lock_count and self.is_locked():
2345
1926
raise errors.ReadOnlyError(self)
2346
1927
self._write_lock_count += 1
2347
1928
if self._write_lock_count == 1:
2348
1929
self._transaction = transactions.WriteTransaction()
2350
if 'relock' in debug.debug_flags and self._prev_lock == 'w':
2351
note('%r was write locked again', self)
2352
self._prev_lock = 'w'
2353
1930
for repo in self._fallback_repositories:
2354
1931
# Writes don't affect fallback repos
2355
1932
repo.lock_read()
2356
self._refresh_data()
1933
self._refresh_data()
2358
1935
def lock_read(self):
2359
locked = self.is_locked()
2360
1936
if self._write_lock_count:
2361
1937
self._write_lock_count += 1
2363
1939
self.control_files.lock_read()
2365
if 'relock' in debug.debug_flags and self._prev_lock == 'r':
2366
note('%r was read locked again', self)
2367
self._prev_lock = 'r'
2368
1940
for repo in self._fallback_repositories:
1941
# Writes don't affect fallback repos
2369
1942
repo.lock_read()
2370
self._refresh_data()
1943
self._refresh_data()
2372
1945
def leave_lock_in_place(self):
2373
1946
# not supported - raise an error
2413
1981
transaction = self._transaction
2414
1982
self._transaction = None
2415
1983
transaction.finish()
1984
for repo in self._fallback_repositories:
2417
1987
self.control_files.unlock()
2419
if not self.is_locked():
2420
1988
for repo in self._fallback_repositories:
2424
class KnitPackStreamSource(StreamSource):
2425
"""A StreamSource used to transfer data between same-format KnitPack repos.
2427
This source assumes:
2428
1) Same serialization format for all objects
2429
2) Same root information
2430
3) XML format inventories
2431
4) Atomic inserts (so we can stream inventory texts before text
2436
def __init__(self, from_repository, to_format):
2437
super(KnitPackStreamSource, self).__init__(from_repository, to_format)
2438
self._text_keys = None
2439
self._text_fetch_order = 'unordered'
2441
def _get_filtered_inv_stream(self, revision_ids):
2442
from_repo = self.from_repository
2443
parent_ids = from_repo._find_parent_ids_of_revisions(revision_ids)
2444
parent_keys = [(p,) for p in parent_ids]
2445
find_text_keys = from_repo._find_text_key_references_from_xml_inventory_lines
2446
parent_text_keys = set(find_text_keys(
2447
from_repo._inventory_xml_lines_for_keys(parent_keys)))
2448
content_text_keys = set()
2449
knit = KnitVersionedFiles(None, None)
2450
factory = KnitPlainFactory()
2451
def find_text_keys_from_content(record):
2452
if record.storage_kind not in ('knit-delta-gz', 'knit-ft-gz'):
2453
raise ValueError("Unknown content storage kind for"
2454
" inventory text: %s" % (record.storage_kind,))
2455
# It's a knit record, it has a _raw_record field (even if it was
2456
# reconstituted from a network stream).
2457
raw_data = record._raw_record
2458
# read the entire thing
2459
revision_id = record.key[-1]
2460
content, _ = knit._parse_record(revision_id, raw_data)
2461
if record.storage_kind == 'knit-delta-gz':
2462
line_iterator = factory.get_linedelta_content(content)
2463
elif record.storage_kind == 'knit-ft-gz':
2464
line_iterator = factory.get_fulltext_content(content)
2465
content_text_keys.update(find_text_keys(
2466
[(line, revision_id) for line in line_iterator]))
2467
revision_keys = [(r,) for r in revision_ids]
2468
def _filtered_inv_stream():
2469
source_vf = from_repo.inventories
2470
stream = source_vf.get_record_stream(revision_keys,
2472
for record in stream:
2473
if record.storage_kind == 'absent':
2474
raise errors.NoSuchRevision(from_repo, record.key)
2475
find_text_keys_from_content(record)
2477
self._text_keys = content_text_keys - parent_text_keys
2478
return ('inventories', _filtered_inv_stream())
2480
def _get_text_stream(self):
2481
# Note: We know we don't have to handle adding root keys, because both
2482
# the source and target are the identical network name.
2483
text_stream = self.from_repository.texts.get_record_stream(
2484
self._text_keys, self._text_fetch_order, False)
2485
return ('texts', text_stream)
2487
def get_stream(self, search):
2488
revision_ids = search.get_keys()
2489
for stream_info in self._fetch_revision_texts(revision_ids):
2491
self._revision_keys = [(rev_id,) for rev_id in revision_ids]
2492
yield self._get_filtered_inv_stream(revision_ids)
2493
yield self._get_text_stream()
2497
1992
class RepositoryFormatPack(MetaDirRepositoryFormat):
2498
1993
"""Format logic for pack structured repositories.
2835
2349
def get_format_string(self):
2836
2350
"""See RepositoryFormat.get_format_string()."""
2837
return "Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n"
2351
return "Bazaar development format 2 (needs bzr.dev from before 1.8)\n"
2839
2353
def get_format_description(self):
2840
2354
"""See RepositoryFormat.get_format_description()."""
2841
return "Packs 6 (uses btree indexes, requires bzr 1.9)"
2844
class RepositoryFormatKnitPack6RichRoot(RepositoryFormatPack):
2845
"""A repository with rich roots, no subtrees, stacking and btree indexes.
2847
1.6-rich-root with B+Tree indices.
2850
repository_class = KnitPackRepository
2851
_commit_builder_class = PackRootCommitBuilder
2852
rich_root_data = True
2853
supports_tree_reference = False # no subtrees
2854
supports_external_lookups = True
2855
# What index classes to use
2856
index_builder_class = BTreeBuilder
2857
index_class = BTreeGraphIndex
2860
def _serializer(self):
2861
return xml6.serializer_v6
2863
def _get_matching_bzrdir(self):
2864
return bzrdir.format_registry.make_bzrdir(
2867
def _ignore_setting_bzrdir(self, format):
2355
return ("Development repository format, currently the same as "
2356
"1.6.1 with B+Trees.\n")
2358
def check_conversion_target(self, target_format):
2870
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2872
def get_format_string(self):
2873
"""See RepositoryFormat.get_format_string()."""
2874
return "Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n"
2876
def get_format_description(self):
2877
return "Packs 6 rich-root (uses btree indexes, requires bzr 1.9)"
2880
2362
class RepositoryFormatPackDevelopment2Subtree(RepositoryFormatPack):
2881
2363
"""A subtrees development repository.
added
removed
bzrlib/repofmt/pack_repo.py
