/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to brzlib/_btree_serializer_py.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/_btree_serializer_py.py
17
17
 
18
18
"""B+Tree index parsing."""
19
19
 
20
 
from .. import static_tuple
21
 
 
22
 
 
23
 
def _parse_leaf_lines(data, key_length, ref_list_length):
24
 
    lines = data.split(b'\n')
 
20
from __future__ import absolute_import
 
21
 
 
22
from brzlib import static_tuple
 
23
 
 
24
 
 
25
def _parse_leaf_lines(bytes, key_length, ref_list_length):
 
26
    lines = bytes.split('\n')
25
27
    nodes = []
26
28
    as_st = static_tuple.StaticTuple.from_sequence
27
29
    stuple = static_tuple.StaticTuple
28
30
    for line in lines[1:]:
29
 
        if line == b'':
 
31
        if line == '':
30
32
            return nodes
31
 
        elements = line.split(b'\0', key_length)
 
33
        elements = line.split('\0', key_length)
32
34
        # keys are tuples
33
35
        key = as_st(elements[:key_length]).intern()
34
36
        line = elements[-1]
35
 
        references, value = line.rsplit(b'\0', 1)
 
37
        references, value = line.rsplit('\0', 1)
36
38
        if ref_list_length:
37
39
            ref_lists = []
38
 
            for ref_string in references.split(b'\t'):
39
 
                ref_list = as_st([as_st(ref.split(b'\0')).intern()
40
 
                                  for ref in ref_string.split(b'\r') if ref])
 
40
            for ref_string in references.split('\t'):
 
41
                ref_list = as_st([as_st(ref.split('\0')).intern()
 
42
                                  for ref in ref_string.split('\r') if ref])
41
43
                ref_lists.append(ref_list)
42
44
            ref_lists = as_st(ref_lists)
43
45
            node_value = stuple(value, ref_lists)
61
63
        # TODO: Consider turning this back into the 'unoptimized' nested loop
62
64
        #       form. It is probably more obvious for most people, and this is
63
65
        #       just a reference implementation.
64
 
        flattened_references = [b'\r'.join([b'\x00'.join(reference)
65
 
                                            for reference in ref_list])
 
66
        flattened_references = ['\r'.join(['\x00'.join(reference)
 
67
                                           for reference in ref_list])
66
68
                                for ref_list in node[3]]
67
69
    else:
68
70
        flattened_references = []
69
 
    string_key = b'\x00'.join(node[1])
70
 
    line = (b"%s\x00%s\x00%s\n" % (string_key,
71
 
                                   b'\t'.join(flattened_references), node[2]))
 
71
    string_key = '\x00'.join(node[1])
 
72
    line = ("%s\x00%s\x00%s\n" % (string_key,
 
73
        '\t'.join(flattened_references), node[2]))
72
74
    return string_key, line