~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/pack_repo.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-07 17:02:44 UTC
  • mfrom: (4934.1.14 2.1.0rc1-set-mtime)
  • Revision ID: pqm@pqm.ubuntu.com-20100107170244-3cgdapvuokgf8l42
(jam,
        gz) (bug #488724) Set the mtime of files touched in a TreeTransform.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
24
24
 
25
25
from bzrlib import (
26
26
    chk_map,
27
 
    cleanup,
28
27
    debug,
29
28
    graph,
30
29
    osutils,
587
586
                                             flush_func=flush_func)
588
587
        self.add_callback = None
589
588
 
 
589
    def replace_indices(self, index_to_pack, indices):
 
590
        """Replace the current mappings with fresh ones.
 
591
 
 
592
        This should probably not be used eventually, rather incremental add and
 
593
        removal of indices. It has been added during refactoring of existing
 
594
        code.
 
595
 
 
596
        :param index_to_pack: A mapping from index objects to
 
597
            (transport, name) tuples for the pack file data.
 
598
        :param indices: A list of indices.
 
599
        """
 
600
        # refresh the revision pack map dict without replacing the instance.
 
601
        self.index_to_pack.clear()
 
602
        self.index_to_pack.update(index_to_pack)
 
603
        # XXX: API break - clearly a 'replace' method would be good?
 
604
        self.combined_index._indices[:] = indices
 
605
        # the current add nodes callback for the current writable index if
 
606
        # there is one.
 
607
        self.add_callback = None
 
608
 
590
609
    def add_index(self, index, pack):
591
610
        """Add index to the aggregate, which is an index for Pack pack.
592
611
 
599
618
        # expose it to the index map
600
619
        self.index_to_pack[index] = pack.access_tuple()
601
620
        # put it at the front of the linear index list
602
 
        self.combined_index.insert_index(0, index, pack.name)
 
621
        self.combined_index.insert_index(0, index)
603
622
 
604
623
    def add_writable_index(self, index, pack):
605
624
        """Add an index which is able to have data added to it.
625
644
        self.data_access.set_writer(None, None, (None, None))
626
645
        self.index_to_pack.clear()
627
646
        del self.combined_index._indices[:]
628
 
        del self.combined_index._index_names[:]
629
647
        self.add_callback = None
630
648
 
631
 
    def remove_index(self, index):
 
649
    def remove_index(self, index, pack):
632
650
        """Remove index from the indices used to answer queries.
633
651
 
634
652
        :param index: An index from the pack parameter.
 
653
        :param pack: A Pack instance.
635
654
        """
636
655
        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]
 
656
        self.combined_index._indices.remove(index)
640
657
        if (self.add_callback is not None and
641
658
            getattr(index, 'add_nodes', None) == self.add_callback):
642
659
            self.add_callback = None
1398
1415
        self.inventory_index = AggregateIndex(self.reload_pack_names, flush)
1399
1416
        self.text_index = AggregateIndex(self.reload_pack_names, flush)
1400
1417
        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]
1403
1418
        if use_chk_index:
1404
1419
            self.chk_index = AggregateIndex(self.reload_pack_names, flush)
1405
 
            all_indices.append(self.chk_index)
1406
1420
        else:
1407
1421
            # used to determine if we're using a chk_index elsewhere.
1408
1422
            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]))
1415
1423
        # resumed packs
1416
1424
        self._resumed_packs = []
1417
1425
 
1537
1545
                self._remove_pack_from_memory(pack)
1538
1546
        # record the newly available packs and stop advertising the old
1539
1547
        # packs
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)
 
1548
        result = self._save_pack_names(clear_obsolete_packs=True)
 
1549
        # Move the old packs out of the way now they are no longer referenced.
 
1550
        for revision_count, packs in pack_operations:
 
1551
            self._obsolete_packs(packs)
1545
1552
        return result
1546
1553
 
1547
1554
    def _flush_new_pack(self):
1560
1567
        """Is the collection already packed?"""
1561
1568
        return not (self.repo._format.pack_compresses or (len(self._names) > 1))
1562
1569
 
1563
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1570
    def pack(self, hint=None):
1564
1571
        """Pack the pack collection totally."""
1565
1572
        self.ensure_loaded()
1566
1573
        total_packs = len(self._names)
1582
1589
                pack_operations[-1][1].append(pack)
1583
1590
        self._execute_pack_operations(pack_operations, OptimisingPacker)
1584
1591
 
1585
 
        if clean_obsolete_packs:
1586
 
            self._clear_obsolete_packs()
1587
 
 
1588
1592
    def plan_autopack_combinations(self, existing_packs, pack_distribution):
1589
1593
        """Plan a pack operation.
1590
1594
 
1784
1788
        :param return: None.
1785
1789
        """
1786
1790
        for pack in packs:
1787
 
            try:
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"
1793
 
                       % (e,))
 
1791
            pack.pack_transport.rename(pack.file_name(),
 
1792
                '../obsolete_packs/' + pack.file_name())
1794
1793
            # TODO: Probably needs to know all possible indices for this pack
1795
1794
            # - or maybe list the directory and move all indices matching this
1796
1795
            # name whether we recognize it or not?
1798
1797
            if self.chk_index is not None:
1799
1798
                suffixes.append('.cix')
1800
1799
            for suffix in suffixes:
1801
 
                try:
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"
1806
 
                           % (e,))
 
1800
                self._index_transport.rename(pack.name + suffix,
 
1801
                    '../obsolete_packs/' + pack.name + suffix)
1807
1802
 
1808
1803
    def pack_distribution(self, total_revisions):
1809
1804
        """Generate a list of the number of revisions to put in each pack.
1835
1830
        self._remove_pack_indices(pack)
1836
1831
        self.packs.remove(pack)
1837
1832
 
1838
 
    def _remove_pack_indices(self, pack, ignore_missing=False):
1839
 
        """Remove the indices for pack from the aggregated indices.
1840
 
        
1841
 
        :param ignore_missing: Suppress KeyErrors from calling remove_index.
1842
 
        """
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)
1848
 
                try:
1849
 
                    aggregate_index.remove_index(pack_index)
1850
 
                except KeyError:
1851
 
                    if ignore_missing:
1852
 
                        continue
1853
 
                    raise
 
1833
    def _remove_pack_indices(self, pack):
 
1834
        """Remove the indices for pack from the aggregated indices."""
 
1835
        self.revision_index.remove_index(pack.revision_index, pack)
 
1836
        self.inventory_index.remove_index(pack.inventory_index, pack)
 
1837
        self.text_index.remove_index(pack.text_index, pack)
 
1838
        self.signature_index.remove_index(pack.signature_index, pack)
 
1839
        if self.chk_index is not None:
 
1840
            self.chk_index.remove_index(pack.chk_index, pack)
1854
1841
 
1855
1842
    def reset(self):
1856
1843
        """Clear all cached data."""
1889
1876
        disk_nodes = set()
1890
1877
        for index, key, value in self._iter_disk_pack_index():
1891
1878
            disk_nodes.add((key, value))
1892
 
        orig_disk_nodes = set(disk_nodes)
1893
1879
 
1894
1880
        # do a two-way diff against our original content
1895
1881
        current_nodes = set()
1908
1894
        disk_nodes.difference_update(deleted_nodes)
1909
1895
        disk_nodes.update(new_nodes)
1910
1896
 
1911
 
        return disk_nodes, deleted_nodes, new_nodes, orig_disk_nodes
 
1897
        return disk_nodes, deleted_nodes, new_nodes
1912
1898
 
1913
1899
    def _syncronize_pack_names_from_disk_nodes(self, disk_nodes):
1914
1900
        """Given the correct set of pack files, update our saved info.
1954
1940
                added.append(name)
1955
1941
        return removed, added, modified
1956
1942
 
1957
 
    def _save_pack_names(self, clear_obsolete_packs=False, obsolete_packs=None):
 
1943
    def _save_pack_names(self, clear_obsolete_packs=False):
1958
1944
        """Save the list of packs.
1959
1945
 
1960
1946
        This will take out the mutex around the pack names list for the
1964
1950
 
1965
1951
        :param clear_obsolete_packs: If True, clear out the contents of the
1966
1952
            obsolete_packs directory.
1967
 
        :param obsolete_packs: Packs that are obsolete once the new pack-names
1968
 
            file has been written.
1969
1953
        :return: A list of the names saved that were not previously on disk.
1970
1954
        """
1971
 
        already_obsolete = []
1972
1955
        self.lock_names()
1973
1956
        try:
1974
1957
            builder = self._index_builder_class()
1975
 
            (disk_nodes, deleted_nodes, new_nodes,
1976
 
             orig_disk_nodes) = self._diff_pack_names()
 
1958
            disk_nodes, deleted_nodes, new_nodes = self._diff_pack_names()
1977
1959
            # TODO: handle same-name, index-size-changes here -
1978
1960
            # e.g. use the value from disk, not ours, *unless* we're the one
1979
1961
            # changing it.
1981
1963
                builder.add_node(key, value)
1982
1964
            self.transport.put_file('pack-names', builder.finish(),
1983
1965
                mode=self.repo.bzrdir._get_file_mode())
 
1966
            # move the baseline forward
1984
1967
            self._packs_at_load = disk_nodes
1985
1968
            if clear_obsolete_packs:
1986
 
                to_preserve = None
1987
 
                if obsolete_packs:
1988
 
                    to_preserve = set([o.name for o in obsolete_packs])
1989
 
                already_obsolete = self._clear_obsolete_packs(to_preserve)
 
1969
                self._clear_obsolete_packs()
1990
1970
        finally:
1991
1971
            self._unlock_names()
1992
1972
        # synchronise the memory packs list with what we just wrote:
1993
1973
        self._syncronize_pack_names_from_disk_nodes(disk_nodes)
1994
 
        if obsolete_packs:
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
1974
        return [new_node[0][0] for new_node in new_nodes]
2004
1975
 
2005
1976
    def reload_pack_names(self):
2020
1991
        if first_read:
2021
1992
            return True
2022
1993
        # 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
 
1994
        disk_nodes, _, _ = self._diff_pack_names()
 
1995
        self._packs_at_load = disk_nodes
2029
1996
        (removed, added,
2030
1997
         modified) = self._syncronize_pack_names_from_disk_nodes(disk_nodes)
2031
1998
        if removed or added or modified:
2040
2007
            raise
2041
2008
        raise errors.RetryAutopack(self.repo, False, sys.exc_info())
2042
2009
 
2043
 
    def _clear_obsolete_packs(self, preserve=None):
 
2010
    def _clear_obsolete_packs(self):
2044
2011
        """Delete everything from the obsolete-packs directory.
2045
 
 
2046
 
        :return: A list of pack identifiers (the filename without '.pack') that
2047
 
            were found in obsolete_packs.
2048
2012
        """
2049
 
        found = []
2050
2013
        obsolete_pack_transport = self.transport.clone('obsolete_packs')
2051
 
        if preserve is None:
2052
 
            preserve = set()
2053
2014
        for filename in obsolete_pack_transport.list_dir('.'):
2054
 
            name, ext = osutils.splitext(filename)
2055
 
            if ext == '.pack':
2056
 
                found.append(name)
2057
 
            if name in preserve:
2058
 
                continue
2059
2015
            try:
2060
2016
                obsolete_pack_transport.delete(filename)
2061
2017
            except (errors.PathError, errors.TransportError), e:
2062
 
                warning("couldn't delete obsolete pack, skipping it:\n%s"
2063
 
                        % (e,))
2064
 
        return found
 
2018
                warning("couldn't delete obsolete pack, skipping it:\n%s" % (e,))
2065
2019
 
2066
2020
    def _start_write_group(self):
2067
2021
        # Do not permit preparation for writing if we're not in a 'write lock'.
2094
2048
        # FIXME: just drop the transient index.
2095
2049
        # forget what names there are
2096
2050
        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()
 
2051
            try:
 
2052
                self._new_pack.abort()
 
2053
            finally:
 
2054
                # XXX: If we aborted while in the middle of finishing the write
 
2055
                # group, _remove_pack_indices can fail because the indexes are
 
2056
                # already gone.  If they're not there we shouldn't fail in this
 
2057
                # case.  -- mbp 20081113
 
2058
                self._remove_pack_indices(self._new_pack)
 
2059
                self._new_pack = None
2106
2060
        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()
 
2061
            try:
 
2062
                resumed_pack.abort()
 
2063
            finally:
 
2064
                # See comment in previous finally block.
 
2065
                try:
 
2066
                    self._remove_pack_indices(resumed_pack)
 
2067
                except KeyError:
 
2068
                    pass
2112
2069
        del self._resumed_packs[:]
2113
2070
 
2114
2071
    def _remove_resumed_pack_indices(self):
2378
2335
        raise NotImplementedError(self.dont_leave_lock_in_place)
2379
2336
 
2380
2337
    @needs_write_lock
2381
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
2338
    def pack(self, hint=None):
2382
2339
        """Compress the data within the repository.
2383
2340
 
2384
2341
        This will pack all the data to a single pack. In future it may
2385
2342
        recompress deltas or do other such expensive operations.
2386
2343
        """
2387
 
        self._pack_collection.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
2344
        self._pack_collection.pack(hint=hint)
2388
2345
 
2389
2346
    @needs_write_lock
2390
2347
    def reconcile(self, other=None, thorough=False):
2546
2503
        utf8_files = [('format', self.get_format_string())]
2547
2504
 
2548
2505
        self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
2549
 
        repository = self.open(a_bzrdir=a_bzrdir, _found=True)
2550
 
        self._run_post_repo_init_hooks(repository, a_bzrdir, shared)
2551
 
        return repository
 
2506
        return self.open(a_bzrdir=a_bzrdir, _found=True)
2552
2507
 
2553
2508
    def open(self, a_bzrdir, _found=False, _override_transport=None):
2554
2509
        """See RepositoryFormat.open().
2617
2572
    repository_class = KnitPackRepository
2618
2573
    _commit_builder_class = PackRootCommitBuilder
2619
2574
    rich_root_data = True
2620
 
    experimental = True
2621
2575
    supports_tree_reference = True
2622
2576
    @property
2623
2577
    def _serializer(self):
2891
2845
    repository_class = KnitPackRepository
2892
2846
    _commit_builder_class = PackRootCommitBuilder
2893
2847
    rich_root_data = True
2894
 
    experimental = True
2895
2848
    supports_tree_reference = True
2896
2849
    supports_external_lookups = True
2897
2850
    # What index classes to use