~bzr-pqm/bzr/bzr.dev

4241.6.1 by Ian Clatworthy
chk_map code from brisbane-core
1
# Copyright (C) 2008 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
17
"""Serializer object for CHK based inventory storage."""
18
4290.1.1 by Jelmer Vernooij
Add simple revision serializer based on RIO.
19
from cStringIO import (
20
    StringIO,
21
    )
22
4241.6.1 by Ian Clatworthy
chk_map code from brisbane-core
23
from bzrlib import (
4398.5.2 by John Arbash Meinel
Merge the chk serializer, and update it for the new bencode locations.
24
    bencode,
4290.1.1 by Jelmer Vernooij
Add simple revision serializer based on RIO.
25
    cache_utf8,
4241.6.1 by Ian Clatworthy
chk_map code from brisbane-core
26
    inventory,
4290.1.1 by Jelmer Vernooij
Add simple revision serializer based on RIO.
27
    osutils,
28
    revision as _mod_revision,
4241.6.1 by Ian Clatworthy
chk_map code from brisbane-core
29
    xml5,
30
    xml6,
31
    )
32
4398.5.9 by John Arbash Meinel
it seems that codecs.utf_8_decode is quite a bit faster than codecs.get_decoder('utf-8')
33
34
def _validate_properties(props, _decode=cache_utf8._utf8_decode):
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
35
    # TODO: we really want an 'isascii' check for key
4398.5.15 by John Arbash Meinel
Change how schemas are validated (down to 1.02s)
36
    # Cast the utf8 properties into Unicode 'in place'
37
    for key, value in props.iteritems():
38
        props[key] = _decode(value)[0]
39
    return props
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
40
41
42
def _is_format_10(value):
43
    if value != 10:
44
        raise ValueError('Format number was not recognized, expected 10 got %d'
45
                         % (value,))
46
    return 10
47
48
4290.1.12 by Jelmer Vernooij
Use bencode rather than rio in the new revision serialiszer.
49
class BEncodeRevisionSerializer1(object):
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
50
    """Simple revision serializer based around bencode.
4290.1.1 by Jelmer Vernooij
Add simple revision serializer based on RIO.
51
    """
52
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
53
    # Maps {key:(Revision attribute, bencode_type, validator)}
54
    # This tells us what kind we expect bdecode to create, what variable on
55
    # Revision we should be using, and a function to call to validate/transform
56
    # the type.
57
    # TODO: add a 'validate_utf8' for things like revision_id and file_id
58
    #       and a validator for parent-ids
59
    _schema = {'format': (None, int, _is_format_10),
4398.5.9 by John Arbash Meinel
it seems that codecs.utf_8_decode is quite a bit faster than codecs.get_decoder('utf-8')
60
               'committer': ('committer', str, cache_utf8.decode),
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
61
               'timezone': ('timezone', int, None),
62
               'timestamp': ('timestamp', str, float),
63
               'revision-id': ('revision_id', str, None),
4398.5.19 by John Arbash Meinel
Change parent_ids back to a list, because there are other tests that expect it.
64
               'parent-ids': ('parent_ids', list, None),
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
65
               'inventory-sha1': ('inventory_sha1', str, None),
4398.5.9 by John Arbash Meinel
it seems that codecs.utf_8_decode is quite a bit faster than codecs.get_decoder('utf-8')
66
               'message': ('message', str, cache_utf8.decode),
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
67
               'properties': ('properties', dict, _validate_properties),
68
    }
69
4290.1.12 by Jelmer Vernooij
Use bencode rather than rio in the new revision serialiszer.
70
    def write_revision_to_string(self, rev):
4398.5.9 by John Arbash Meinel
it seems that codecs.utf_8_decode is quite a bit faster than codecs.get_decoder('utf-8')
71
        encode_utf8 = cache_utf8._utf8_encode
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
72
        # Use a list of tuples rather than a dict
73
        # This lets us control the ordering, so that we are able to create
74
        # smaller deltas
75
        ret = [
76
            ("format", 10),
4398.5.9 by John Arbash Meinel
it seems that codecs.utf_8_decode is quite a bit faster than codecs.get_decoder('utf-8')
77
            ("committer", encode_utf8(rev.committer)[0]),
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
78
        ]
79
        if rev.timezone is not None:
80
            ret.append(("timezone", rev.timezone))
81
        # For bzr revisions, the most common property is just 'branch-nick'
82
        # which changes infrequently.
4290.1.12 by Jelmer Vernooij
Use bencode rather than rio in the new revision serialiszer.
83
        revprops = {}
84
        for key, value in rev.properties.iteritems():
4398.5.9 by John Arbash Meinel
it seems that codecs.utf_8_decode is quite a bit faster than codecs.get_decoder('utf-8')
85
            revprops[key] = encode_utf8(value)[0]
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
86
        ret.append(('properties', revprops))
87
        ret.extend([
88
            ("timestamp", "%.3f" % rev.timestamp),
89
            ("revision-id", rev.revision_id),
90
            ("parent-ids", rev.parent_ids),
91
            ("inventory-sha1", rev.inventory_sha1),
4398.5.9 by John Arbash Meinel
it seems that codecs.utf_8_decode is quite a bit faster than codecs.get_decoder('utf-8')
92
            ("message", encode_utf8(rev.message)[0]),
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
93
        ])
4398.5.2 by John Arbash Meinel
Merge the chk serializer, and update it for the new bencode locations.
94
        return bencode.bencode(ret)
4290.1.8 by Jelmer Vernooij
Some performance tweaks.
95
96
    def write_revision(self, rev, f):
4290.1.12 by Jelmer Vernooij
Use bencode rather than rio in the new revision serialiszer.
97
        f.write(self.write_revision_to_string(rev))
98
99
    def read_revision_from_string(self, text):
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
100
        # TODO: consider writing a Revision decoder, rather than using the
101
        #       generic bencode decoder
4398.5.8 by John Arbash Meinel
Update the TODO comment a bit.
102
        #       However, to decode all 25k revisions of bzr takes approx 1.3s
103
        #       If we remove all extra validation that goes down to about 1.2s.
104
        #       Of that time, probably 0.6s is spend in bencode.bdecode().
105
        #       Regardless 'time bzr log' of everything is 7+s, so 1.3s to
106
        #       extract revision texts isn't a majority of time.
4398.5.2 by John Arbash Meinel
Merge the chk serializer, and update it for the new bencode locations.
107
        ret = bencode.bdecode(text)
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
108
        if not isinstance(ret, list):
109
            raise ValueError("invalid revision text")
4398.5.15 by John Arbash Meinel
Change how schemas are validated (down to 1.02s)
110
        schema = self._schema
4398.5.7 by John Arbash Meinel
Spend a little bit more time optimizing the read_revision_from_string loop
111
        # timezone is allowed to be missing, but should be set
112
        bits = {'timezone': None}
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
113
        for key, value in ret:
4398.5.7 by John Arbash Meinel
Spend a little bit more time optimizing the read_revision_from_string loop
114
            # Will raise KeyError if not a valid part of the schema, or an
115
            # entry is given 2 times.
4398.5.15 by John Arbash Meinel
Change how schemas are validated (down to 1.02s)
116
            var_name, expected_type, validator = schema[key]
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
117
            if value.__class__ is not expected_type:
118
                raise ValueError('key %s did not conform to the expected type'
119
                                 ' %s, but was %s'
120
                                 % (key, expected_type, type(value)))
121
            if validator is not None:
122
                value = validator(value)
4398.5.7 by John Arbash Meinel
Spend a little bit more time optimizing the read_revision_from_string loop
123
            bits[var_name] = value
4398.5.15 by John Arbash Meinel
Change how schemas are validated (down to 1.02s)
124
        if len(bits) != len(schema):
125
            missing = [key for key, (var_name, _, _) in schema.iteritems()
126
                       if var_name not in bits]
127
            raise ValueError('Revision text was missing expected keys %s.'
128
                             ' text %r' % (missing, text))
129
        del bits[None]  # Get rid of 'format' since it doesn't get mapped
4398.5.5 by John Arbash Meinel
Update the CHK Serializer to do lots more validation.
130
        rev = _mod_revision.Revision(**bits)
4290.1.8 by Jelmer Vernooij
Some performance tweaks.
131
        return rev
132
133
    def read_revision(self, f):
4290.1.12 by Jelmer Vernooij
Use bencode rather than rio in the new revision serialiszer.
134
        return self.read_revision_from_string(f.read())
135
136
137
class CHKSerializerSubtree(BEncodeRevisionSerializer1, xml6.Serializer_v6):
4241.6.1 by Ian Clatworthy
chk_map code from brisbane-core
138
    """A CHKInventory based serializer that supports tree references"""
139
140
    supported_kinds = set(['file', 'directory', 'symlink', 'tree-reference'])
141
    format_num = '9'
142
    revision_format_num = None
143
    support_altered_by_hack = False
144
145
    def _unpack_entry(self, elt):
146
        kind = elt.tag
147
        if not kind in self.supported_kinds:
148
            raise AssertionError('unsupported entry kind %s' % kind)
149
        if kind == 'tree-reference':
150
            file_id = elt.attrib['file_id']
151
            name = elt.attrib['name']
152
            parent_id = elt.attrib['parent_id']
153
            revision = elt.get('revision')
154
            reference_revision = elt.get('reference_revision')
155
            return inventory.TreeReference(file_id, name, parent_id, revision,
156
                                           reference_revision)
157
        else:
158
            return xml6.Serializer_v6._unpack_entry(self, elt)
159
160
    def __init__(self, node_size, search_key_name):
161
        self.maximum_size = node_size
162
        self.search_key_name = search_key_name
163
164
4290.1.7 by Jelmer Vernooij
Add development7-rich-root format that uses the RIO Serializer.
165
class CHKSerializer(xml5.Serializer_v5):
4241.6.1 by Ian Clatworthy
chk_map code from brisbane-core
166
    """A CHKInventory based serializer with 'plain' behaviour."""
167
168
    format_num = '9'
169
    revision_format_num = None
170
    support_altered_by_hack = False
171
172
    def __init__(self, node_size, search_key_name):
173
        self.maximum_size = node_size
174
        self.search_key_name = search_key_name
175
176
177
chk_serializer_255_bigpage = CHKSerializer(65536, 'hash-255-way')
4290.1.7 by Jelmer Vernooij
Add development7-rich-root format that uses the RIO Serializer.
178
179
4290.1.12 by Jelmer Vernooij
Use bencode rather than rio in the new revision serialiszer.
180
class CHKBEncodeSerializer(BEncodeRevisionSerializer1, CHKSerializer):
181
    """A CHKInventory and BEncode based serializer with 'plain' behaviour."""
4290.1.7 by Jelmer Vernooij
Add development7-rich-root format that uses the RIO Serializer.
182
183
    format_num = '10'
184
185
4290.1.12 by Jelmer Vernooij
Use bencode rather than rio in the new revision serialiszer.
186
chk_bencode_serializer = CHKBEncodeSerializer(65536, 'hash-255-way')