153
151
texts/deltas (via (fileid, revisionid) tuples).
154
152
:param signature_index: A GraphIndex for determining what signatures are
155
153
present in the Pack and accessing the locations of their texts.
156
:param chk_index: A GraphIndex for accessing content by CHK, if the
159
155
self.revision_index = revision_index
160
156
self.inventory_index = inventory_index
161
157
self.text_index = text_index
162
158
self.signature_index = signature_index
163
self.chk_index = chk_index
165
160
def access_tuple(self):
166
161
"""Return a tuple (transport, name) for the pack content."""
227
222
return self.index_name('text', name)
229
224
def _replace_index_with_readonly(self, index_type):
230
unlimited_cache = False
231
if index_type == 'chk':
232
unlimited_cache = True
233
225
setattr(self, index_type + '_index',
234
226
self.index_class(self.index_transport,
235
227
self.index_name(index_type, self.name),
236
self.index_sizes[self.index_offset(index_type)],
237
unlimited_cache=unlimited_cache))
228
self.index_sizes[self.index_offset(index_type)]))
240
231
class ExistingPack(Pack):
241
232
"""An in memory proxy for an existing .pack and its disk indices."""
243
234
def __init__(self, pack_transport, name, revision_index, inventory_index,
244
text_index, signature_index, chk_index=None):
235
text_index, signature_index):
245
236
"""Create an ExistingPack object.
247
238
:param pack_transport: The transport where the pack file resides.
248
239
:param name: The name of the pack on disk in the pack_transport.
250
241
Pack.__init__(self, revision_index, inventory_index, text_index,
251
signature_index, chk_index)
253
244
self.pack_transport = pack_transport
254
245
if None in (revision_index, inventory_index, text_index,
272
263
def __init__(self, name, revision_index, inventory_index, text_index,
273
264
signature_index, upload_transport, pack_transport, index_transport,
274
pack_collection, chk_index=None):
275
266
"""Create a ResumedPack object."""
276
267
ExistingPack.__init__(self, pack_transport, name, revision_index,
277
inventory_index, text_index, signature_index,
268
inventory_index, text_index, signature_index)
279
269
self.upload_transport = upload_transport
280
270
self.index_transport = index_transport
281
271
self.index_sizes = [None, None, None, None]
308
295
self.upload_transport.delete(self.file_name())
309
296
indices = [self.revision_index, self.inventory_index, self.text_index,
310
297
self.signature_index]
311
if self.chk_index is not None:
312
indices.append(self.chk_index)
313
298
for index in indices:
314
299
index._transport.delete(index._name)
316
301
def finish(self):
317
302
self._check_references()
318
index_types = ['revision', 'inventory', 'text', 'signature']
319
if self.chk_index is not None:
320
index_types.append('chk')
321
for index_type in index_types:
303
new_name = '../packs/' + self.file_name()
304
self.upload_transport.rename(self.file_name(), new_name)
305
for index_type in ['revision', 'inventory', 'text', 'signature']:
322
306
old_name = self.index_name(index_type, self.name)
323
307
new_name = '../indices/' + old_name
324
308
self.upload_transport.rename(old_name, new_name)
325
309
self._replace_index_with_readonly(index_type)
326
new_name = '../packs/' + self.file_name()
327
self.upload_transport.rename(self.file_name(), new_name)
328
310
self._state = 'finished'
330
312
def _get_external_refs(self, index):
331
"""Return compression parents for this index that are not present.
333
This returns any compression parents that are referenced by this index,
334
which are not contained *in* this index. They may be present elsewhere.
336
313
return index.external_references(1)
384
355
self._file_mode = file_mode
385
356
# tracks the content written to the .pack file.
386
357
self._hash = osutils.md5()
387
# a tuple with the length in bytes of the indices, once the pack
388
# is finalised. (rev, inv, text, sigs, chk_if_in_use)
358
# a four-tuple with the length in bytes of the indices, once the pack
359
# is finalised. (rev, inv, text, sigs)
389
360
self.index_sizes = None
390
361
# How much data to cache when writing packs. Note that this is not
391
362
# synchronised with reads, because it's not in the transport layer, so
454
423
return bool(self.get_revision_count() or
455
424
self.inventory_index.key_count() or
456
425
self.text_index.key_count() or
457
self.signature_index.key_count() or
458
(self.chk_index is not None and self.chk_index.key_count()))
460
def finish_content(self):
461
if self.name is not None:
465
self._write_data('', flush=True)
466
self.name = self._hash.hexdigest()
426
self.signature_index.key_count())
468
428
def finish(self, suspend=False):
469
429
"""Finish the new pack.
491
454
self._write_index('text', self.text_index, 'file texts', suspend)
492
455
self._write_index('signature', self.signature_index,
493
456
'revision signatures', suspend)
494
if self.chk_index is not None:
495
self.index_sizes.append(None)
496
self._write_index('chk', self.chk_index,
497
'content hash bytes', suspend)
498
457
self.write_stream.close()
499
458
# Note that this will clobber an existing pack with the same name,
500
459
# without checking for hash collisions. While this is undesirable this
584
543
self.index_to_pack = {}
585
544
self.combined_index = CombinedGraphIndex([], reload_func=reload_func)
586
545
self.data_access = _DirectPackAccess(self.index_to_pack,
587
reload_func=reload_func,
588
flush_func=flush_func)
546
reload_func=reload_func)
547
self.add_callback = None
549
def replace_indices(self, index_to_pack, indices):
550
"""Replace the current mappings with fresh ones.
552
This should probably not be used eventually, rather incremental add and
553
removal of indices. It has been added during refactoring of existing
556
:param index_to_pack: A mapping from index objects to
557
(transport, name) tuples for the pack file data.
558
:param indices: A list of indices.
560
# refresh the revision pack map dict without replacing the instance.
561
self.index_to_pack.clear()
562
self.index_to_pack.update(index_to_pack)
563
# XXX: API break - clearly a 'replace' method would be good?
564
self.combined_index._indices[:] = indices
565
# the current add nodes callback for the current writable index if
589
567
self.add_callback = None
591
569
def add_index(self, index, pack):
626
604
self.data_access.set_writer(None, None, (None, None))
627
605
self.index_to_pack.clear()
628
606
del self.combined_index._indices[:]
629
del self.combined_index._index_names[:]
630
607
self.add_callback = None
632
def remove_index(self, index):
609
def remove_index(self, index, pack):
633
610
"""Remove index from the indices used to answer queries.
635
612
:param index: An index from the pack parameter.
613
:param pack: A Pack instance.
637
615
del self.index_to_pack[index]
638
pos = self.combined_index._indices.index(index)
639
del self.combined_index._indices[pos]
640
del self.combined_index._index_names[pos]
616
self.combined_index._indices.remove(index)
641
617
if (self.add_callback is not None and
642
618
getattr(index, 'add_nodes', None) == self.add_callback):
643
619
self.add_callback = None
921
896
time.ctime(), self._pack_collection._upload_transport.base, new_pack.random_name,
922
897
new_pack.signature_index.key_count(),
923
898
time.time() - new_pack.start_time)
925
# NB XXX: how to check CHK references are present? perhaps by yielding
926
# the items? How should that interact with stacked repos?
927
if new_pack.chk_index is not None:
929
if 'pack' in debug.debug_flags:
930
mutter('%s: create_pack: chk content copied: %s%s %d items t+%6.3fs',
931
time.ctime(), self._pack_collection._upload_transport.base,
932
new_pack.random_name,
933
new_pack.chk_index.key_count(),
934
time.time() - new_pack.start_time)
935
899
new_pack._check_references()
936
900
if not self._use_pack(new_pack):
941
905
self._pack_collection.allocate(new_pack)
944
def _copy_chks(self, refs=None):
945
# XXX: Todo, recursive follow-pointers facility when fetching some
947
chk_index_map, chk_indices = self._pack_map_and_index_list(
949
chk_nodes = self._index_contents(chk_indices, refs)
951
# TODO: This isn't strictly tasteful as we are accessing some private
952
# variables (_serializer). Perhaps a better way would be to have
953
# Repository._deserialise_chk_node()
954
search_key_func = chk_map.search_key_registry.get(
955
self._pack_collection.repo._serializer.search_key_name)
956
def accumlate_refs(lines):
957
# XXX: move to a generic location
959
bytes = ''.join(lines)
960
node = chk_map._deserialise(bytes, ("unknown",), search_key_func)
961
new_refs.update(node.refs())
962
self._copy_nodes(chk_nodes, chk_index_map, self.new_pack._writer,
963
self.new_pack.chk_index, output_lines=accumlate_refs)
966
def _copy_nodes(self, nodes, index_map, writer, write_index,
968
"""Copy knit nodes between packs with no graph references.
970
:param output_lines: Output full texts of copied items.
908
def _copy_nodes(self, nodes, index_map, writer, write_index):
909
"""Copy knit nodes between packs with no graph references."""
972
910
pb = ui.ui_factory.nested_progress_bar()
974
912
return self._do_copy_nodes(nodes, index_map, writer,
975
write_index, pb, output_lines=output_lines)
979
def _do_copy_nodes(self, nodes, index_map, writer, write_index, pb,
917
def _do_copy_nodes(self, nodes, index_map, writer, write_index, pb):
981
918
# for record verification
982
919
knit = KnitVersionedFiles(None, None)
983
920
# plan a readv on each source pack:
1017
954
izip(reader.iter_records(), pack_readv_requests):
1018
955
raw_data = read_func(None)
1019
956
# check the header only
1020
if output_lines is not None:
1021
output_lines(knit._parse_record(key[-1], raw_data)[0])
1023
df, _ = knit._parse_record_header(key, raw_data)
957
df, _ = knit._parse_record_header(key, raw_data)
1025
959
pos, size = writer.add_bytes_record(raw_data, names)
1026
960
write_index.add_node(key, eol_flag + "%d %d" % (pos, size))
1027
961
pb.update("Copied record", record_index)
1357
1291
:ivar _names: map of {pack_name: (index_size,)}
1360
pack_factory = NewPack
1361
resumed_pack_factory = ResumedPack
1363
1294
def __init__(self, repo, transport, index_transport, upload_transport,
1364
pack_transport, index_builder_class, index_class,
1295
pack_transport, index_builder_class, index_class):
1366
1296
"""Create a new RepositoryPackCollection.
1368
1298
:param transport: Addresses the repository base directory
1394
1322
# when a pack is being created by this object, the state of that pack.
1395
1323
self._new_pack = None
1396
1324
# aggregated revision index data
1397
flush = self._flush_new_pack
1398
self.revision_index = AggregateIndex(self.reload_pack_names, flush)
1399
self.inventory_index = AggregateIndex(self.reload_pack_names, flush)
1400
self.text_index = AggregateIndex(self.reload_pack_names, flush)
1401
self.signature_index = AggregateIndex(self.reload_pack_names, flush)
1402
all_indices = [self.revision_index, self.inventory_index,
1403
self.text_index, self.signature_index]
1405
self.chk_index = AggregateIndex(self.reload_pack_names, flush)
1406
all_indices.append(self.chk_index)
1408
# used to determine if we're using a chk_index elsewhere.
1409
self.chk_index = None
1410
# Tell all the CombinedGraphIndex objects about each other, so they can
1411
# share hints about which pack names to search first.
1412
all_combined = [agg_idx.combined_index for agg_idx in all_indices]
1413
for combined_idx in all_combined:
1414
combined_idx.set_sibling_indices(
1415
set(all_combined).difference([combined_idx]))
1325
self.revision_index = AggregateIndex(self.reload_pack_names)
1326
self.inventory_index = AggregateIndex(self.reload_pack_names)
1327
self.text_index = AggregateIndex(self.reload_pack_names)
1328
self.signature_index = AggregateIndex(self.reload_pack_names)
1416
1329
# resumed packs
1417
1330
self._resumed_packs = []
1420
return '%s(%r)' % (self.__class__.__name__, self.repo)
1422
1332
def add_pack_to_memory(self, pack):
1423
1333
"""Make a Pack object available to the repository to satisfy queries.
1505
1415
'containing %d revisions. Packing %d files into %d affecting %d'
1506
1416
' revisions', self, total_packs, total_revisions, num_old_packs,
1507
1417
num_new_packs, num_revs_affected)
1508
result = self._execute_pack_operations(pack_operations,
1418
self._execute_pack_operations(pack_operations,
1509
1419
reload_func=self._restart_autopack)
1510
mutter('Auto-packing repository %s completed', self)
1513
1422
def _execute_pack_operations(self, pack_operations, _packer_class=Packer,
1514
1423
reload_func=None):
1538
1447
self._remove_pack_from_memory(pack)
1539
1448
# record the newly available packs and stop advertising the old
1541
to_be_obsoleted = []
1542
for _, packs in pack_operations:
1543
to_be_obsoleted.extend(packs)
1544
result = self._save_pack_names(clear_obsolete_packs=True,
1545
obsolete_packs=to_be_obsoleted)
1548
def _flush_new_pack(self):
1549
if self._new_pack is not None:
1550
self._new_pack.flush()
1450
self._save_pack_names(clear_obsolete_packs=True)
1451
# Move the old packs out of the way now they are no longer referenced.
1452
for revision_count, packs in pack_operations:
1453
self._obsolete_packs(packs)
1552
1455
def lock_names(self):
1553
1456
"""Acquire the mutex around the pack-names index.
1558
1461
self.repo.control_files.lock_write()
1560
def _already_packed(self):
1561
"""Is the collection already packed?"""
1562
return not (self.repo._format.pack_compresses or (len(self._names) > 1))
1564
def pack(self, hint=None, clean_obsolete_packs=False):
1565
1464
"""Pack the pack collection totally."""
1566
1465
self.ensure_loaded()
1567
1466
total_packs = len(self._names)
1568
if self._already_packed():
1468
# This is arguably wrong because we might not be optimal, but for
1469
# now lets leave it in. (e.g. reconcile -> one pack. But not
1570
1472
total_revisions = self.revision_index.combined_index.key_count()
1571
1473
# XXX: the following may want to be a class, to pack with a given
1573
1475
mutter('Packing repository %s, which has %d pack files, '
1574
'containing %d revisions with hint %r.', self, total_packs,
1575
total_revisions, hint)
1476
'containing %d revisions into 1 packs.', self, total_packs,
1576
1478
# determine which packs need changing
1479
pack_distribution = [1]
1577
1480
pack_operations = [[0, []]]
1578
1481
for pack in self.all_packs():
1579
if hint is None or pack.name in hint:
1580
# Either no hint was provided (so we are packing everything),
1581
# or this pack was included in the hint.
1582
pack_operations[-1][0] += pack.get_revision_count()
1583
pack_operations[-1][1].append(pack)
1482
pack_operations[-1][0] += pack.get_revision_count()
1483
pack_operations[-1][1].append(pack)
1584
1484
self._execute_pack_operations(pack_operations, OptimisingPacker)
1586
if clean_obsolete_packs:
1587
self._clear_obsolete_packs()
1589
1486
def plan_autopack_combinations(self, existing_packs, pack_distribution):
1590
1487
"""Plan a pack operation.
1678
1575
inv_index = self._make_index(name, '.iix')
1679
1576
txt_index = self._make_index(name, '.tix')
1680
1577
sig_index = self._make_index(name, '.six')
1681
if self.chk_index is not None:
1682
chk_index = self._make_index(name, '.cix', unlimited_cache=True)
1685
1578
result = ExistingPack(self._pack_transport, name, rev_index,
1686
inv_index, txt_index, sig_index, chk_index)
1579
inv_index, txt_index, sig_index)
1687
1580
self.add_pack_to_memory(result)
1703
1596
inv_index = self._make_index(name, '.iix', resume=True)
1704
1597
txt_index = self._make_index(name, '.tix', resume=True)
1705
1598
sig_index = self._make_index(name, '.six', resume=True)
1706
if self.chk_index is not None:
1707
chk_index = self._make_index(name, '.cix', resume=True,
1708
unlimited_cache=True)
1711
result = self.resumed_pack_factory(name, rev_index, inv_index,
1712
txt_index, sig_index, self._upload_transport,
1713
self._pack_transport, self._index_transport, self,
1714
chk_index=chk_index)
1599
result = ResumedPack(name, rev_index, inv_index, txt_index,
1600
sig_index, self._upload_transport, self._pack_transport,
1601
self._index_transport, self)
1715
1602
except errors.NoSuchFile, e:
1716
1603
raise errors.UnresumableWriteGroup(self.repo, [name], str(e))
1717
1604
self.add_pack_to_memory(result)
1785
1671
:param return: None.
1787
1673
for pack in packs:
1789
pack.pack_transport.rename(pack.file_name(),
1790
'../obsolete_packs/' + pack.file_name())
1791
except (errors.PathError, errors.TransportError), e:
1792
# TODO: Should these be warnings or mutters?
1793
mutter("couldn't rename obsolete pack, skipping it:\n%s"
1674
pack.pack_transport.rename(pack.file_name(),
1675
'../obsolete_packs/' + pack.file_name())
1795
1676
# TODO: Probably needs to know all possible indices for this pack
1796
1677
# - or maybe list the directory and move all indices matching this
1797
1678
# name whether we recognize it or not?
1798
suffixes = ['.iix', '.six', '.tix', '.rix']
1799
if self.chk_index is not None:
1800
suffixes.append('.cix')
1801
for suffix in suffixes:
1803
self._index_transport.rename(pack.name + suffix,
1804
'../obsolete_packs/' + pack.name + suffix)
1805
except (errors.PathError, errors.TransportError), e:
1806
mutter("couldn't rename obsolete index, skipping it:\n%s"
1679
for suffix in ('.iix', '.six', '.tix', '.rix'):
1680
self._index_transport.rename(pack.name + suffix,
1681
'../obsolete_packs/' + pack.name + suffix)
1809
1683
def pack_distribution(self, total_revisions):
1810
1684
"""Generate a list of the number of revisions to put in each pack.
1836
1710
self._remove_pack_indices(pack)
1837
1711
self.packs.remove(pack)
1839
def _remove_pack_indices(self, pack, ignore_missing=False):
1840
"""Remove the indices for pack from the aggregated indices.
1842
:param ignore_missing: Suppress KeyErrors from calling remove_index.
1844
for index_type in Pack.index_definitions.keys():
1845
attr_name = index_type + '_index'
1846
aggregate_index = getattr(self, attr_name)
1847
if aggregate_index is not None:
1848
pack_index = getattr(pack, attr_name)
1850
aggregate_index.remove_index(pack_index)
1713
def _remove_pack_indices(self, pack):
1714
"""Remove the indices for pack from the aggregated indices."""
1715
self.revision_index.remove_index(pack.revision_index, pack)
1716
self.inventory_index.remove_index(pack.inventory_index, pack)
1717
self.text_index.remove_index(pack.text_index, pack)
1718
self.signature_index.remove_index(pack.signature_index, pack)
1856
1720
def reset(self):
1857
1721
"""Clear all cached data."""
1858
1722
# cached revision data
1723
self.repo._revision_knit = None
1859
1724
self.revision_index.clear()
1860
1725
# cached signature data
1726
self.repo._signature_knit = None
1861
1727
self.signature_index.clear()
1862
1728
# cached file text data
1863
1729
self.text_index.clear()
1730
self.repo._text_knit = None
1864
1731
# cached inventory data
1865
1732
self.inventory_index.clear()
1867
if self.chk_index is not None:
1868
self.chk_index.clear()
1869
1733
# remove the open pack
1870
1734
self._new_pack = None
1871
1735
# information about packs.
1966
1829
:param clear_obsolete_packs: If True, clear out the contents of the
1967
1830
obsolete_packs directory.
1968
:param obsolete_packs: Packs that are obsolete once the new pack-names
1969
file has been written.
1970
:return: A list of the names saved that were not previously on disk.
1972
already_obsolete = []
1973
1832
self.lock_names()
1975
1834
builder = self._index_builder_class()
1976
(disk_nodes, deleted_nodes, new_nodes,
1977
orig_disk_nodes) = self._diff_pack_names()
1835
disk_nodes, deleted_nodes, new_nodes = self._diff_pack_names()
1978
1836
# TODO: handle same-name, index-size-changes here -
1979
1837
# e.g. use the value from disk, not ours, *unless* we're the one
1982
1840
builder.add_node(key, value)
1983
1841
self.transport.put_file('pack-names', builder.finish(),
1984
1842
mode=self.repo.bzrdir._get_file_mode())
1843
# move the baseline forward
1985
1844
self._packs_at_load = disk_nodes
1986
1845
if clear_obsolete_packs:
1989
to_preserve = set([o.name for o in obsolete_packs])
1990
already_obsolete = self._clear_obsolete_packs(to_preserve)
1846
self._clear_obsolete_packs()
1992
1848
self._unlock_names()
1993
1849
# synchronise the memory packs list with what we just wrote:
1994
1850
self._syncronize_pack_names_from_disk_nodes(disk_nodes)
1996
# TODO: We could add one more condition here. "if o.name not in
1997
# orig_disk_nodes and o != the new_pack we haven't written to
1998
# disk yet. However, the new pack object is not easily
1999
# accessible here (it would have to be passed through the
2000
# autopacking code, etc.)
2001
obsolete_packs = [o for o in obsolete_packs
2002
if o.name not in already_obsolete]
2003
self._obsolete_packs(obsolete_packs)
2004
return [new_node[0][0] for new_node in new_nodes]
2006
1852
def reload_pack_names(self):
2007
1853
"""Sync our pack listing with what is present in the repository.
2023
1869
# out the new value.
2024
(disk_nodes, deleted_nodes, new_nodes,
2025
orig_disk_nodes) = self._diff_pack_names()
2026
# _packs_at_load is meant to be the explicit list of names in
2027
# 'pack-names' at then start. As such, it should not contain any
2028
# pending names that haven't been written out yet.
2029
self._packs_at_load = orig_disk_nodes
1870
disk_nodes, _, _ = self._diff_pack_names()
1871
self._packs_at_load = disk_nodes
2030
1872
(removed, added,
2031
1873
modified) = self._syncronize_pack_names_from_disk_nodes(disk_nodes)
2032
1874
if removed or added or modified:
2042
1884
raise errors.RetryAutopack(self.repo, False, sys.exc_info())
2044
def _clear_obsolete_packs(self, preserve=None):
1886
def _clear_obsolete_packs(self):
2045
1887
"""Delete everything from the obsolete-packs directory.
2047
:return: A list of pack identifiers (the filename without '.pack') that
2048
were found in obsolete_packs.
2051
1889
obsolete_pack_transport = self.transport.clone('obsolete_packs')
2052
if preserve is None:
2054
1890
for filename in obsolete_pack_transport.list_dir('.'):
2055
name, ext = osutils.splitext(filename)
2058
if name in preserve:
2061
1892
obsolete_pack_transport.delete(filename)
2062
1893
except (errors.PathError, errors.TransportError), e:
2063
warning("couldn't delete obsolete pack, skipping it:\n%s"
1894
warning("couldn't delete obsolete pack, skipping it:\n%s" % (e,))
2067
1896
def _start_write_group(self):
2068
1897
# Do not permit preparation for writing if we're not in a 'write lock'.
2069
1898
if not self.repo.is_write_locked():
2070
1899
raise errors.NotWriteLocked(self)
2071
self._new_pack = self.pack_factory(self, upload_suffix='.pack',
1900
self._new_pack = NewPack(self, upload_suffix='.pack',
2072
1901
file_mode=self.repo.bzrdir._get_file_mode())
2073
1902
# allow writing: queue writes to a new index
2074
1903
self.revision_index.add_writable_index(self._new_pack.revision_index,
2077
1906
self._new_pack)
2078
1907
self.text_index.add_writable_index(self._new_pack.text_index,
2079
1908
self._new_pack)
2080
self._new_pack.text_index.set_optimize(combine_backing_indices=False)
2081
1909
self.signature_index.add_writable_index(self._new_pack.signature_index,
2082
1910
self._new_pack)
2083
if self.chk_index is not None:
2084
self.chk_index.add_writable_index(self._new_pack.chk_index,
2086
self.repo.chk_bytes._index._add_callback = self.chk_index.add_callback
2087
self._new_pack.chk_index.set_optimize(combine_backing_indices=False)
2089
1912
self.repo.inventories._index._add_callback = self.inventory_index.add_callback
2090
1913
self.repo.revisions._index._add_callback = self.revision_index.add_callback
2095
1918
# FIXME: just drop the transient index.
2096
1919
# forget what names there are
2097
1920
if self._new_pack is not None:
2098
operation = cleanup.OperationWithCleanups(self._new_pack.abort)
2099
operation.add_cleanup(setattr, self, '_new_pack', None)
2100
# If we aborted while in the middle of finishing the write
2101
# group, _remove_pack_indices could fail because the indexes are
2102
# already gone. But they're not there we shouldn't fail in this
2103
# case, so we pass ignore_missing=True.
2104
operation.add_cleanup(self._remove_pack_indices, self._new_pack,
2105
ignore_missing=True)
2106
operation.run_simple()
1922
self._new_pack.abort()
1924
# XXX: If we aborted while in the middle of finishing the write
1925
# group, _remove_pack_indices can fail because the indexes are
1926
# already gone. If they're not there we shouldn't fail in this
1927
# case. -- mbp 20081113
1928
self._remove_pack_indices(self._new_pack)
1929
self._new_pack = None
2107
1930
for resumed_pack in self._resumed_packs:
2108
operation = cleanup.OperationWithCleanups(resumed_pack.abort)
2109
# See comment in previous finally block.
2110
operation.add_cleanup(self._remove_pack_indices, resumed_pack,
2111
ignore_missing=True)
2112
operation.run_simple()
1932
resumed_pack.abort()
1934
# See comment in previous finally block.
1936
self._remove_pack_indices(resumed_pack)
2113
1939
del self._resumed_packs[:]
1940
self.repo._text_knit = None
2115
1942
def _remove_resumed_pack_indices(self):
2116
1943
for resumed_pack in self._resumed_packs:
2117
1944
self._remove_pack_indices(resumed_pack)
2118
1945
del self._resumed_packs[:]
2120
def _check_new_inventories(self):
2121
"""Detect missing inventories in this write group.
2123
:returns: list of strs, summarising any problems found. If the list is
2124
empty no problems were found.
2126
# The base implementation does no checks. GCRepositoryPackCollection
2130
1947
def _commit_write_group(self):
2131
1948
all_missing = set()
2132
1949
for prefix, versioned_file in (
2141
1958
raise errors.BzrCheckError(
2142
1959
"Repository %s has missing compression parent(s) %r "
2143
1960
% (self.repo, sorted(all_missing)))
2144
problems = self._check_new_inventories()
2146
problems_summary = '\n'.join(problems)
2147
raise errors.BzrCheckError(
2148
"Cannot add revision(s) to repository: " + problems_summary)
2149
1961
self._remove_pack_indices(self._new_pack)
2150
any_new_content = False
1962
should_autopack = False
2151
1963
if self._new_pack.data_inserted():
2152
1964
# get all the data to disk and read to use
2153
1965
self._new_pack.finish()
2154
1966
self.allocate(self._new_pack)
2155
1967
self._new_pack = None
2156
any_new_content = True
1968
should_autopack = True
2158
1970
self._new_pack.abort()
2159
1971
self._new_pack = None
2241
2050
self.revisions = KnitVersionedFiles(
2242
2051
_KnitGraphIndex(self._pack_collection.revision_index.combined_index,
2243
2052
add_callback=self._pack_collection.revision_index.add_callback,
2244
deltas=False, parents=True, is_locked=self.is_locked,
2245
track_external_parent_refs=True),
2053
deltas=False, parents=True, is_locked=self.is_locked),
2246
2054
data_access=self._pack_collection.revision_index.data_access,
2247
2055
max_delta_chain=0)
2248
2056
self.signatures = KnitVersionedFiles(
2257
2065
deltas=True, parents=True, is_locked=self.is_locked),
2258
2066
data_access=self._pack_collection.text_index.data_access,
2259
2067
max_delta_chain=200)
2260
if _format.supports_chks:
2261
# No graph, no compression:- references from chks are between
2262
# different objects not temporal versions of the same; and without
2263
# some sort of temporal structure knit compression will just fail.
2264
self.chk_bytes = KnitVersionedFiles(
2265
_KnitGraphIndex(self._pack_collection.chk_index.combined_index,
2266
add_callback=self._pack_collection.chk_index.add_callback,
2267
deltas=False, parents=False, is_locked=self.is_locked),
2268
data_access=self._pack_collection.chk_index.data_access,
2271
self.chk_bytes = None
2272
2068
# True when the repository object is 'write locked' (as opposed to the
2273
2069
# physical lock only taken out around changes to the pack-names list.)
2274
2070
# Another way to represent this would be a decorator around the control
2281
2077
self._reconcile_fixes_text_parents = True
2282
2078
self._reconcile_backsup_inventory = False
2284
def _warn_if_deprecated(self, branch=None):
2080
def _warn_if_deprecated(self):
2285
2081
# This class isn't deprecated, but one sub-format is
2286
2082
if isinstance(self._format, RepositoryFormatKnitPack5RichRootBroken):
2287
super(KnitPackRepository, self)._warn_if_deprecated(branch)
2083
from bzrlib import repository
2084
if repository._deprecation_warning_done:
2086
repository._deprecation_warning_done = True
2087
warning("Format %s for %s is deprecated - please use"
2088
" 'bzr upgrade --1.6.1-rich-root'"
2089
% (self._format, self.bzrdir.transport.base))
2289
2091
def _abort_write_group(self):
2290
self.revisions._index._key_dependencies.clear()
2291
2092
self._pack_collection._abort_write_group()
2293
def _get_source(self, to_format):
2294
if to_format.network_name() == self._format.network_name():
2295
return KnitPackStreamSource(self, to_format)
2296
return super(KnitPackRepository, self)._get_source(to_format)
2094
def _find_inconsistent_revision_parents(self):
2095
"""Find revisions with incorrectly cached parents.
2097
:returns: an iterator yielding tuples of (revison-id, parents-in-index,
2098
parents-in-revision).
2100
if not self.is_locked():
2101
raise errors.ObjectNotLocked(self)
2102
pb = ui.ui_factory.nested_progress_bar()
2105
revision_nodes = self._pack_collection.revision_index \
2106
.combined_index.iter_all_entries()
2107
index_positions = []
2108
# Get the cached index values for all revisions, and also the location
2109
# in each index of the revision text so we can perform linear IO.
2110
for index, key, value, refs in revision_nodes:
2111
pos, length = value[1:].split(' ')
2112
index_positions.append((index, int(pos), key[0],
2113
tuple(parent[0] for parent in refs[0])))
2114
pb.update("Reading revision index", 0, 0)
2115
index_positions.sort()
2116
batch_count = len(index_positions) / 1000 + 1
2117
pb.update("Checking cached revision graph", 0, batch_count)
2118
for offset in xrange(batch_count):
2119
pb.update("Checking cached revision graph", offset)
2120
to_query = index_positions[offset * 1000:(offset + 1) * 1000]
2123
rev_ids = [item[2] for item in to_query]
2124
revs = self.get_revisions(rev_ids)
2125
for revision, item in zip(revs, to_query):
2126
index_parents = item[3]
2127
rev_parents = tuple(revision.parent_ids)
2128
if index_parents != rev_parents:
2129
result.append((revision.revision_id, index_parents, rev_parents))
2298
2134
def _make_parents_provider(self):
2299
2135
return graph.CachingParentsProvider(self)
2307
2143
self._pack_collection._start_write_group()
2309
2145
def _commit_write_group(self):
2310
hint = self._pack_collection._commit_write_group()
2311
self.revisions._index._key_dependencies.clear()
2146
return self._pack_collection._commit_write_group()
2314
2148
def suspend_write_group(self):
2315
2149
# XXX check self._write_group is self.get_transaction()?
2316
2150
tokens = self._pack_collection._suspend_write_group()
2317
self.revisions._index._key_dependencies.clear()
2318
2151
self._write_group = None
2321
2154
def _resume_write_group(self, tokens):
2322
2155
self._start_write_group()
2324
self._pack_collection._resume_write_group(tokens)
2325
except errors.UnresumableWriteGroup:
2326
self._abort_write_group()
2328
for pack in self._pack_collection._resumed_packs:
2329
self.revisions._index.scan_unvalidated_index(pack.revision_index)
2156
self._pack_collection._resume_write_group(tokens)
2331
2158
def get_transaction(self):
2332
2159
if self._write_lock_count:
2416
2231
transaction = self._transaction
2417
2232
self._transaction = None
2418
2233
transaction.finish()
2234
for repo in self._fallback_repositories:
2420
2237
self.control_files.unlock()
2422
if not self.is_locked():
2423
2238
for repo in self._fallback_repositories:
2427
class KnitPackStreamSource(StreamSource):
2428
"""A StreamSource used to transfer data between same-format KnitPack repos.
2430
This source assumes:
2431
1) Same serialization format for all objects
2432
2) Same root information
2433
3) XML format inventories
2434
4) Atomic inserts (so we can stream inventory texts before text
2439
def __init__(self, from_repository, to_format):
2440
super(KnitPackStreamSource, self).__init__(from_repository, to_format)
2441
self._text_keys = None
2442
self._text_fetch_order = 'unordered'
2444
def _get_filtered_inv_stream(self, revision_ids):
2445
from_repo = self.from_repository
2446
parent_ids = from_repo._find_parent_ids_of_revisions(revision_ids)
2447
parent_keys = [(p,) for p in parent_ids]
2448
find_text_keys = from_repo._find_text_key_references_from_xml_inventory_lines
2449
parent_text_keys = set(find_text_keys(
2450
from_repo._inventory_xml_lines_for_keys(parent_keys)))
2451
content_text_keys = set()
2452
knit = KnitVersionedFiles(None, None)
2453
factory = KnitPlainFactory()
2454
def find_text_keys_from_content(record):
2455
if record.storage_kind not in ('knit-delta-gz', 'knit-ft-gz'):
2456
raise ValueError("Unknown content storage kind for"
2457
" inventory text: %s" % (record.storage_kind,))
2458
# It's a knit record, it has a _raw_record field (even if it was
2459
# reconstituted from a network stream).
2460
raw_data = record._raw_record
2461
# read the entire thing
2462
revision_id = record.key[-1]
2463
content, _ = knit._parse_record(revision_id, raw_data)
2464
if record.storage_kind == 'knit-delta-gz':
2465
line_iterator = factory.get_linedelta_content(content)
2466
elif record.storage_kind == 'knit-ft-gz':
2467
line_iterator = factory.get_fulltext_content(content)
2468
content_text_keys.update(find_text_keys(
2469
[(line, revision_id) for line in line_iterator]))
2470
revision_keys = [(r,) for r in revision_ids]
2471
def _filtered_inv_stream():
2472
source_vf = from_repo.inventories
2473
stream = source_vf.get_record_stream(revision_keys,
2475
for record in stream:
2476
if record.storage_kind == 'absent':
2477
raise errors.NoSuchRevision(from_repo, record.key)
2478
find_text_keys_from_content(record)
2480
self._text_keys = content_text_keys - parent_text_keys
2481
return ('inventories', _filtered_inv_stream())
2483
def _get_text_stream(self):
2484
# Note: We know we don't have to handle adding root keys, because both
2485
# the source and target are the identical network name.
2486
text_stream = self.from_repository.texts.get_record_stream(
2487
self._text_keys, self._text_fetch_order, False)
2488
return ('texts', text_stream)
2490
def get_stream(self, search):
2491
revision_ids = search.get_keys()
2492
for stream_info in self._fetch_revision_texts(revision_ids):
2494
self._revision_keys = [(rev_id,) for rev_id in revision_ids]
2495
yield self._get_filtered_inv_stream(revision_ids)
2496
yield self._get_text_stream()
2500
2242
class RepositoryFormatPack(MetaDirRepositoryFormat):
2501
2243
"""Format logic for pack structured repositories.
2549
2289
utf8_files = [('format', self.get_format_string())]
2551
2291
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
2552
repository = self.open(a_bzrdir=a_bzrdir, _found=True)
2553
self._run_post_repo_init_hooks(repository, a_bzrdir, shared)
2292
return self.open(a_bzrdir=a_bzrdir, _found=True)
2556
2294
def open(self, a_bzrdir, _found=False, _override_transport=None):
2557
2295
"""See RepositoryFormat.open().
2639
2379
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2381
def check_conversion_target(self, target_format):
2382
if not target_format.rich_root_data:
2383
raise errors.BadConversionTarget(
2384
'Does not support rich root data.', target_format)
2385
if not getattr(target_format, 'supports_tree_reference', False):
2386
raise errors.BadConversionTarget(
2387
'Does not support nested trees', target_format)
2641
2389
def get_format_string(self):
2642
2390
"""See RepositoryFormat.get_format_string()."""
2643
2391
return "Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n"
2880
2654
return "Packs 6 rich-root (uses btree indexes, requires bzr 1.9)"
2657
class RepositoryFormatPackDevelopment2(RepositoryFormatPack):
2658
"""A no-subtrees development repository.
2660
This format should be retained until the second release after bzr 1.7.
2662
This is pack-1.6.1 with B+Tree indices.
2665
repository_class = KnitPackRepository
2666
_commit_builder_class = PackCommitBuilder
2667
supports_external_lookups = True
2668
# What index classes to use
2669
index_builder_class = BTreeBuilder
2670
index_class = BTreeGraphIndex
2671
# Set to true to get the fast-commit code path tested until a really fast
2672
# format lands in trunk. Not actually fast in this format.
2676
def _serializer(self):
2677
return xml5.serializer_v5
2679
def _get_matching_bzrdir(self):
2680
return bzrdir.format_registry.make_bzrdir('development2')
2682
def _ignore_setting_bzrdir(self, format):
2685
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2687
def get_format_string(self):
2688
"""See RepositoryFormat.get_format_string()."""
2689
return "Bazaar development format 2 (needs bzr.dev from before 1.8)\n"
2691
def get_format_description(self):
2692
"""See RepositoryFormat.get_format_description()."""
2693
return ("Development repository format, currently the same as "
2694
"1.6.1 with B+Trees.\n")
2696
def check_conversion_target(self, target_format):
2883
2700
class RepositoryFormatPackDevelopment2Subtree(RepositoryFormatPack):
2884
2701
"""A subtrees development repository.
2886
2703
This format should be retained until the second release after bzr 1.7.
2888
2705
1.6.1-subtree[as it might have been] with B+Tree indices.
2890
This is [now] retained until we have a CHK based subtree format in
2894
2708
repository_class = KnitPackRepository
2895
2709
_commit_builder_class = PackRootCommitBuilder
2896
2710
rich_root_data = True
2898
2711
supports_tree_reference = True
2899
2712
supports_external_lookups = True
2900
2713
# What index classes to use
2908
2721
def _get_matching_bzrdir(self):
2909
2722
return bzrdir.format_registry.make_bzrdir(
2910
'development-subtree')
2723
'development2-subtree')
2912
2725
def _ignore_setting_bzrdir(self, format):
2915
2728
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2730
def check_conversion_target(self, target_format):
2731
if not target_format.rich_root_data:
2732
raise errors.BadConversionTarget(
2733
'Does not support rich root data.', target_format)
2734
if not getattr(target_format, 'supports_tree_reference', False):
2735
raise errors.BadConversionTarget(
2736
'Does not support nested trees', target_format)
2917
2738
def get_format_string(self):
2918
2739
"""See RepositoryFormat.get_format_string()."""
2919
2740
return ("Bazaar development format 2 with subtree support "