1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
|
# groupcompress, a bzr plugin providing new compression logic.
# Copyright (C) 2008 Canonical Limited.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as published
# by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
"""Core compression logic for compressing streams of related files."""
from itertools import izip
from cStringIO import StringIO
import struct
import zlib
from bzrlib import (
annotate,
debug,
diff,
errors,
graph as _mod_graph,
osutils,
pack,
patiencediff,
)
from bzrlib.graph import Graph
from bzrlib.knit import _DirectPackAccess
from bzrlib.osutils import (
contains_whitespace,
contains_linebreaks,
sha_string,
sha_strings,
split_lines,
)
from bzrlib.btree_index import BTreeBuilder
from bzrlib.lru_cache import LRUSizeCache
from bzrlib.tsort import topo_sort
from bzrlib.versionedfile import (
adapter_registry,
AbsentContentFactory,
ChunkedContentFactory,
FulltextContentFactory,
VersionedFiles,
)
from bzrlib.plugins.groupcompress import errors as gc_errors
_NO_LABELS = False
_FAST = False
def encode_base128_int(val):
"""Convert an integer into a 7-bit lsb encoding."""
bytes = []
count = 0
while val >= 0x80:
bytes.append(chr((val | 0x80) & 0xFF))
val >>= 7
bytes.append(chr(val))
return ''.join(bytes)
def decode_base128_int(bytes):
"""Decode an integer from a 7-bit lsb encoding."""
offset = 0
val = 0
shift = 0
bval = ord(bytes[offset])
while bval >= 0x80:
val |= (bval & 0x7F) << shift
shift += 7
offset += 1
bval = ord(bytes[offset])
val |= bval << shift
offset += 1
return val, offset
def sort_gc_optimal(parent_map):
"""Sort and group the keys in parent_map into gc-optimal order.
gc-optimal is defined (currently) as reverse-topological order, grouped by
the key prefix.
:return: A sorted-list of keys
"""
# gc-optimal ordering is approximately reverse topological,
# properly grouped by file-id.
per_prefix_map = {}
for item in parent_map.iteritems():
key = item[0]
if isinstance(key, str) or len(key) == 1:
prefix = ''
else:
prefix = key[0]
try:
per_prefix_map[prefix].append(item)
except KeyError:
per_prefix_map[prefix] = [item]
present_keys = []
for prefix in sorted(per_prefix_map):
present_keys.extend(reversed(topo_sort(per_prefix_map[prefix])))
return present_keys
class GroupCompressBlockEntry(object):
"""Track the information about a single object inside a GC group.
This is generally just the dumb data structure.
"""
def __init__(self, key, type, sha1, start, length):
self.key = key
self.type = type # delta, fulltext, external?
self.sha1 = sha1 # Sha1 of content
self.start = start # Byte offset to start of data
self.length = length # Length of content
def __repr__(self):
return '%s(%s, %s, %s, %s, %s)' % (
self.__class__.__name__,
self.key, self.type, self.sha1, self.start, self.length
)
class GroupCompressBlock(object):
"""An object which maintains the internal structure of the compressed data.
This tracks the meta info (start of text, length, type, etc.)
"""
# Group Compress Block v1 Zlib
GCB_HEADER = 'gcb1z\n'
def __init__(self):
# map by key? or just order in file?
self._entries = {}
self._content = None
self._size = 0
def _parse_header(self):
"""Parse the meta-info from the stream."""
def __len__(self):
return self._size
@classmethod
def from_bytes(cls, bytes):
out = cls()
if bytes[:6] != cls.GCB_HEADER:
raise gc_errors.InvalidGroupCompressBlock(
'bytes did not start with %r' % (cls.GCB_HEADER,))
pos = bytes.index('\n', 6)
z_header_length = int(bytes[6:pos])
pos += 1
pos2 = bytes.index('\n', pos)
header_length = int(bytes[pos:pos2])
if z_header_length == 0:
assert header_length == 0
out._content = zlib.decompress(bytes[pos2+1:])
out._size = len(out._content)
return out
pos = pos2 + 1
pos2 = pos + z_header_length
z_header_bytes = bytes[pos:pos2]
assert len(z_header_bytes) == z_header_length
d = zlib.decompressobj()
header_bytes = d.decompress(z_header_bytes)
assert len(header_bytes) == header_length
del z_header_bytes
lines = header_bytes.split('\n')
header_len = len(header_bytes)
del header_bytes
info_dict = {}
for line in lines:
if not line: #End of record
if not info_dict:
break
out.add_entry(**info_dict)
info_dict = {}
continue
key, value = line.split(':', 1)
if key == 'key':
value = tuple(map(intern, value.split('\x00')))
elif key in ('start', 'length'):
value = int(value)
elif key == 'type':
value = intern(value)
info_dict[key] = value
zcontent = bytes[pos2:]
if zcontent:
out._content = d.decompress(zcontent)
assert d.flush() == ''
out._size = header_len + len(out._content)
return out
def extract(self, key, index_memo, sha1=None):
"""Extract the text for a specific key.
:param key: The label used for this content
:param sha1: TODO (should we validate only when sha1 is supplied?)
:return: The bytes for the content
"""
if _NO_LABELS or not self._entries:
start, end = index_memo[3:5]
c = self._content[start]
if c == 'f':
bytes = self._content[start+1:end]
type = 'fulltext'
else:
assert c == 'd'
type = 'delta'
delta = self._content[start+1:end]
bytes = _groupcompress_pyx.apply_delta(self._content, delta)
entry = GroupCompressBlockEntry(key, type, sha_string(bytes),
start, end-start)
return entry, bytes
entry = self._entries[key]
if entry.type == 'fulltext':
assert self._content[entry.start] == 'f'
bytes = self._content[entry.start+1:entry.start + entry.length]
elif entry.type == 'delta':
assert self._content[entry.start] == 'd'
delta = self._content[entry.start+1:entry.start + entry.length]
bytes = _groupcompress_pyx.apply_delta(self._content, delta)
# XXX: sha1?
return entry, bytes
def add_entry(self, key, type, sha1, start, length):
"""Add new meta info about an entry.
:param key: The key for the new content
:param type: Whether this is a delta or fulltext entry (external?)
:param sha1: sha1sum of the fulltext of this entry
:param start: where the encoded bytes start
:param length: total number of bytes in the encoded form
:return: The entry?
"""
entry = GroupCompressBlockEntry(key, type, sha1, start, length)
assert key not in self._entries
self._entries[key] = entry
return entry
def to_bytes(self, content=''):
"""Encode the information into a byte stream."""
chunks = []
for key in sorted(self._entries):
entry = self._entries[key]
chunk = ('key:%s\n'
'sha1:%s\n'
'type:%s\n'
'start:%s\n'
'length:%s\n'
'\n'
) % ('\x00'.join(entry.key),
entry.sha1,
entry.type,
entry.start,
entry.length,
)
chunks.append(chunk)
bytes = ''.join(chunks)
info_len = len(bytes)
c = zlib.compressobj()
z_bytes = []
z_bytes.append(c.compress(bytes))
del bytes
# TODO: we may want to have the header compressed in the same chain
# as the data, or we may not, evaulate it
# having them compressed together is probably a win for
# revisions and the 'inv' portion of chk inventories. As the
# label in the header is duplicated in the text.
# For chk pages and real bytes, I would guess this is not
# true.
z_bytes.append(c.flush(zlib.Z_SYNC_FLUSH))
z_len = sum(map(len, z_bytes))
c_len = len(content)
if _NO_LABELS:
z_bytes = []
z_len = 0
info_len = 0
c = zlib.compressobj()
z_bytes.append(c.compress(content))
z_bytes.append(c.flush())
chunks = [self.GCB_HEADER,
'%d\n' % (z_len,),
'%d\n' % (info_len,),
#'%d\n' % (c_len,),
]
chunks.extend(z_bytes)
return ''.join(chunks)
class GroupCompressor(object):
"""Produce a serialised group of compressed texts.
It contains code very similar to SequenceMatcher because of having a similar
task. However some key differences apply:
- there is no junk, we want a minimal edit not a human readable diff.
- we don't filter very common lines (because we don't know where a good
range will start, and after the first text we want to be emitting minmal
edits only.
- we chain the left side, not the right side
- we incrementally update the adjacency matrix as new lines are provided.
- we look for matches in all of the left side, so the routine which does
the analagous task of find_longest_match does not need to filter on the
left side.
"""
def __init__(self, delta=True):
"""Create a GroupCompressor.
:param delta: If False, do not compress records.
"""
# Consider seeding the lines with some sort of GC Start flag, or
# putting it as part of the output stream, rather than in the
# compressed bytes.
self.lines = []
self.endpoint = 0
self.input_bytes = 0
self.num_keys = 0
self.labels_deltas = {}
self._last = None
self._delta_index = _groupcompress_pyx.DeltaIndex()
self._block = GroupCompressBlock()
def compress(self, key, bytes, expected_sha, soft=False):
"""Compress lines with label key.
:param key: A key tuple. It is stored in the output
for identification of the text during decompression. If the last
element is 'None' it is replaced with the sha1 of the text -
e.g. sha1:xxxxxxx.
:param bytes: The bytes to be compressed
:param expected_sha: If non-None, the sha the lines are believed to
have. During compression the sha is calculated; a mismatch will
cause an error.
:param soft: Do a 'soft' compression. This means that we require larger
ranges to match to be considered for a copy command.
:return: The sha1 of lines, and the number of bytes accumulated in
the group output so far.
"""
if not _FAST or expected_sha is None:
sha1 = sha_string(bytes)
else:
sha1 = expected_sha
if key[-1] is None:
key = key[:-1] + ('sha1:' + sha1,)
input_len = len(bytes)
# By having action/label/sha1/len, we can parse the group if the index
# was ever destroyed, we have the key in 'label', we know the final
# bytes are valid from sha1, and we know where to find the end of this
# record because of 'len'. (the delta record itself will store the
# total length for the expanded record)
# 'len: %d\n' costs approximately 1% increase in total data
# Having the labels at all costs us 9-10% increase, 38% increase for
# inventory pages, and 5.8% increase for text pages
# new_chunks = ['label:%s\nsha1:%s\n' % (label, sha1)]
if self._delta_index._source_offset != self.endpoint:
raise AssertionError('_source_offset != endpoint'
' somehow the DeltaIndex got out of sync with'
' the output lines')
max_delta_size = len(bytes) / 2
delta = self._delta_index.make_delta(bytes, max_delta_size)
if (delta is None):
type = 'fulltext'
length = len(bytes) + 1
self._delta_index.add_source(bytes, 1)
new_chunks = ['f', bytes]
else:
type = 'delta'
length = len(delta) + 1
new_chunks = ['d', delta]
if _FAST:
self._delta_index._source_offset += length
else:
self._delta_index.add_delta_source(delta, 1)
self._block.add_entry(key, type=type, sha1=sha1,
start=self.endpoint, length=length)
delta_start = (self.endpoint, len(self.lines))
self.num_keys += 1
self.output_chunks(new_chunks)
self.input_bytes += input_len
delta_end = (self.endpoint, len(self.lines))
self.labels_deltas[key] = (delta_start, delta_end)
if not self._delta_index._source_offset == self.endpoint:
raise AssertionError('the delta index is out of sync'
'with the output lines %s != %s'
% (self._delta_index._source_offset, self.endpoint))
return sha1, self.endpoint, type, length
def extract(self, key):
"""Extract a key previously added to the compressor.
:param key: The key to extract.
:return: An iterable over bytes and the sha1.
"""
delta_details = self.labels_deltas[key]
delta_chunks = self.lines[delta_details[0][1]:delta_details[1][1]]
stored_bytes = ''.join(delta_chunks)
# TODO: Fix this, we shouldn't really be peeking here
entry = self._block._entries[key]
if entry.type == 'fulltext':
bytes = stored_bytes
else:
assert entry.type == 'delta'
# XXX: This is inefficient at best
source = ''.join(self.lines)
bytes = _groupcompress_pyx.apply_delta(source, stored_bytes)
assert entry.sha1 == sha_string(bytes)
return bytes, entry.sha1
def output_chunks(self, new_chunks):
"""Output some chunks.
:param new_chunks: The chunks to output.
"""
self._last = (len(self.lines), self.endpoint)
endpoint = self.endpoint
self.lines.extend(new_chunks)
endpoint += sum(map(len, new_chunks))
self.endpoint = endpoint
def pop_last(self):
"""Call this if you want to 'revoke' the last compression.
After this, the data structures will be rolled back, but you cannot do
more compression.
"""
self._delta_index = None
del self.lines[self._last[0]:]
self.endpoint = self._last[1]
self._last = None
def ratio(self):
"""Return the overall compression ratio."""
return float(self.input_bytes) / float(self.endpoint)
def make_pack_factory(graph, delta, keylength):
"""Create a factory for creating a pack based groupcompress.
This is only functional enough to run interface tests, it doesn't try to
provide a full pack environment.
:param graph: Store a graph.
:param delta: Delta compress contents.
:param keylength: How long should keys be.
"""
def factory(transport):
parents = graph or delta
ref_length = 0
if graph:
ref_length = 1
graph_index = BTreeBuilder(reference_lists=ref_length,
key_elements=keylength)
stream = transport.open_write_stream('newpack')
writer = pack.ContainerWriter(stream.write)
writer.begin()
index = _GCGraphIndex(graph_index, lambda:True, parents=parents,
add_callback=graph_index.add_nodes)
access = _DirectPackAccess({})
access.set_writer(writer, graph_index, (transport, 'newpack'))
result = GroupCompressVersionedFiles(index, access, delta)
result.stream = stream
result.writer = writer
return result
return factory
def cleanup_pack_group(versioned_files):
versioned_files.writer.end()
versioned_files.stream.close()
class GroupCompressVersionedFiles(VersionedFiles):
"""A group-compress based VersionedFiles implementation."""
def __init__(self, index, access, delta=True):
"""Create a GroupCompressVersionedFiles object.
:param index: The index object storing access and graph data.
:param access: The access object storing raw data.
:param delta: Whether to delta compress or just entropy compress.
"""
self._index = index
self._access = access
self._delta = delta
self._unadded_refs = {}
self._group_cache = LRUSizeCache(max_size=50*1024*1024)
def add_lines(self, key, parents, lines, parent_texts=None,
left_matching_blocks=None, nostore_sha=None, random_id=False,
check_content=True):
"""Add a text to the store.
:param key: The key tuple of the text to add.
:param parents: The parents key tuples of the text to add.
:param lines: A list of lines. Each line must be a bytestring. And all
of them except the last must be terminated with \n and contain no
other \n's. The last line may either contain no \n's or a single
terminating \n. If the lines list does meet this constraint the add
routine may error or may succeed - but you will be unable to read
the data back accurately. (Checking the lines have been split
correctly is expensive and extremely unlikely to catch bugs so it
is not done at runtime unless check_content is True.)
:param parent_texts: An optional dictionary containing the opaque
representations of some or all of the parents of version_id to
allow delta optimisations. VERY IMPORTANT: the texts must be those
returned by add_lines or data corruption can be caused.
:param left_matching_blocks: a hint about which areas are common
between the text and its left-hand-parent. The format is
the SequenceMatcher.get_matching_blocks format.
:param nostore_sha: Raise ExistingContent and do not add the lines to
the versioned file if the digest of the lines matches this.
:param random_id: If True a random id has been selected rather than
an id determined by some deterministic process such as a converter
from a foreign VCS. When True the backend may choose not to check
for uniqueness of the resulting key within the versioned file, so
this should only be done when the result is expected to be unique
anyway.
:param check_content: If True, the lines supplied are verified to be
bytestrings that are correctly formed lines.
:return: The text sha1, the number of bytes in the text, and an opaque
representation of the inserted version which can be provided
back to future add_lines calls in the parent_texts dictionary.
"""
self._index._check_write_ok()
self._check_add(key, lines, random_id, check_content)
if parents is None:
# The caller might pass None if there is no graph data, but kndx
# indexes can't directly store that, so we give them
# an empty tuple instead.
parents = ()
# double handling for now. Make it work until then.
length = sum(map(len, lines))
record = ChunkedContentFactory(key, parents, None, lines)
sha1 = list(self._insert_record_stream([record], random_id=random_id))[0]
return sha1, length, None
def annotate(self, key):
"""See VersionedFiles.annotate."""
graph = Graph(self)
parent_map = self.get_parent_map([key])
if not parent_map:
raise errors.RevisionNotPresent(key, self)
if parent_map[key] is not None:
search = graph._make_breadth_first_searcher([key])
keys = set()
while True:
try:
present, ghosts = search.next_with_ghosts()
except StopIteration:
break
keys.update(present)
parent_map = self.get_parent_map(keys)
else:
keys = [key]
parent_map = {key:()}
head_cache = _mod_graph.FrozenHeadsCache(graph)
parent_cache = {}
reannotate = annotate.reannotate
for record in self.get_record_stream(keys, 'topological', True):
key = record.key
chunks = osutils.chunks_to_lines(record.get_bytes_as('chunked'))
parent_lines = [parent_cache[parent] for parent in parent_map[key]]
parent_cache[key] = list(
reannotate(parent_lines, chunks, key, None, head_cache))
return parent_cache[key]
def check(self, progress_bar=None):
"""See VersionedFiles.check()."""
keys = self.keys()
for record in self.get_record_stream(keys, 'unordered', True):
record.get_bytes_as('fulltext')
def _check_add(self, key, lines, random_id, check_content):
"""check that version_id and lines are safe to add."""
version_id = key[-1]
if version_id is not None:
if contains_whitespace(version_id):
raise InvalidRevisionId(version_id, self)
self.check_not_reserved_id(version_id)
# TODO: If random_id==False and the key is already present, we should
# probably check that the existing content is identical to what is
# being inserted, and otherwise raise an exception. This would make
# the bundle code simpler.
if check_content:
self._check_lines_not_unicode(lines)
self._check_lines_are_lines(lines)
def get_parent_map(self, keys):
"""Get a map of the parents of keys.
:param keys: The keys to look up parents for.
:return: A mapping from keys to parents. Absent keys are absent from
the mapping.
"""
result = {}
sources = [self._index]
source_results = []
missing = set(keys)
for source in sources:
if not missing:
break
new_result = source.get_parent_map(missing)
source_results.append(new_result)
result.update(new_result)
missing.difference_update(set(new_result))
if self._unadded_refs:
for key in missing:
if key in self._unadded_refs:
result[key] = self._unadded_refs[key]
return result
def _get_block(self, index_memo):
read_memo = index_memo[0:3]
# get the group:
try:
block = self._group_cache[read_memo]
except KeyError:
# read the group
zdata = self._access.get_raw_records([read_memo]).next()
# decompress - whole thing - this is not a bug, as it
# permits caching. We might want to store the partially
# decompresed group and decompress object, so that recent
# texts are not penalised by big groups.
block = GroupCompressBlock.from_bytes(zdata)
self._group_cache[read_memo] = block
# cheapo debugging:
# print len(zdata), len(plain)
# parse - requires split_lines, better to have byte offsets
# here (but not by much - we only split the region for the
# recipe, and we often want to end up with lines anyway.
return block
def get_missing_compression_parent_keys(self):
"""Return the keys of missing compression parents.
Missing compression parents occur when a record stream was missing
basis texts, or a index was scanned that had missing basis texts.
"""
# GroupCompress cannot currently reference texts that are not in the
# group, so this is valid for now
return frozenset()
def get_record_stream(self, keys, ordering, include_delta_closure):
"""Get a stream of records for keys.
:param keys: The keys to include.
:param ordering: Either 'unordered' or 'topological'. A topologically
sorted stream has compression parents strictly before their
children.
:param include_delta_closure: If True then the closure across any
compression parents will be included (in the opaque data).
:return: An iterator of ContentFactory objects, each of which is only
valid until the iterator is advanced.
"""
# keys might be a generator
orig_keys = list(keys)
keys = set(orig_keys)
if not keys:
return
if (not self._index.has_graph
and ordering in ('topological', 'gc-optimal')):
# Cannot topological order when no graph has been stored.
ordering = 'unordered'
# Cheap: iterate
locations = self._index.get_build_details(keys)
local_keys = frozenset(keys).intersection(set(self._unadded_refs))
if ordering == 'topological':
# would be better to not globally sort initially but instead
# start with one key, recurse to its oldest parent, then grab
# everything in the same group, etc.
parent_map = dict((key, details[2]) for key, details in
locations.iteritems())
for key in local_keys:
parent_map[key] = self._unadded_refs[key]
present_keys = topo_sort(parent_map)
# Now group by source:
elif ordering == 'gc-optimal':
parent_map = dict((key, details[2]) for key, details in
locations.iteritems())
for key in local_keys:
parent_map[key] = self._unadded_refs[key]
# XXX: This only optimizes for the target ordering. We may need to
# balance that with the time it takes to extract ordering, by
# somehow grouping based on locations[key][0:3]
present_keys = sort_gc_optimal(parent_map)
elif ordering == 'as-requested':
present_keys = [key for key in orig_keys if key in locations
or key in local_keys]
else:
# We want to yield the keys in a semi-optimal (read-wise) ordering.
# Otherwise we thrash the _group_cache and destroy performance
def get_group(key):
# This is the group the bytes are stored in, followed by the
# location in the group
return locations[key][0]
present_keys = sorted(locations.iterkeys(), key=get_group)
# We don't have an ordering for keys in the in-memory object, but
# lets process the in-memory ones first.
present_keys = list(local_keys) + present_keys
locations.update((key, None) for key in local_keys)
absent_keys = keys.difference(set(locations))
for key in absent_keys:
yield AbsentContentFactory(key)
for key in present_keys:
if key in self._unadded_refs:
chunks, sha1 = self._compressor.extract(key)
parents = self._unadded_refs[key]
else:
index_memo, _, parents, (method, _) = locations[key]
block = self._get_block(index_memo)
entry, bytes = block.extract(key, index_memo)
sha1 = entry.sha1
if not _FAST and sha_string(bytes) != sha1:
raise AssertionError('sha1 sum did not match')
yield FulltextContentFactory(key, parents, sha1, bytes)
def get_sha1s(self, keys):
"""See VersionedFiles.get_sha1s()."""
result = {}
for record in self.get_record_stream(keys, 'unordered', True):
if record.sha1 != None:
result[record.key] = record.sha1
else:
if record.storage_kind != 'absent':
result[record.key] == sha_string(record.get_bytes_as(
'fulltext'))
return result
def insert_record_stream(self, stream):
"""Insert a record stream into this container.
:param stream: A stream of records to insert.
:return: None
:seealso VersionedFiles.get_record_stream:
"""
for _ in self._insert_record_stream(stream):
pass
def _insert_record_stream(self, stream, random_id=False):
"""Internal core to insert a record stream into this container.
This helper function has a different interface than insert_record_stream
to allow add_lines to be minimal, but still return the needed data.
:param stream: A stream of records to insert.
:return: An iterator over the sha1 of the inserted records.
:seealso insert_record_stream:
:seealso add_lines:
"""
adapters = {}
def get_adapter(adapter_key):
try:
return adapters[adapter_key]
except KeyError:
adapter_factory = adapter_registry.get(adapter_key)
adapter = adapter_factory(self)
adapters[adapter_key] = adapter
return adapter
# This will go up to fulltexts for gc to gc fetching, which isn't
# ideal.
self._compressor = GroupCompressor(self._delta)
self._unadded_refs = {}
keys_to_add = []
basis_end = 0
def flush():
bytes = self._compressor._block.to_bytes(
''.join(self._compressor.lines))
index, start, length = self._access.add_raw_records(
[(None, len(bytes))], bytes)[0]
nodes = []
for key, reads, refs in keys_to_add:
nodes.append((key, "%d %d %s" % (start, length, reads), refs))
self._index.add_records(nodes, random_id=random_id)
self._unadded_refs = {}
del keys_to_add[:]
self._compressor = GroupCompressor(self._delta)
last_prefix = None
last_fulltext_len = None
max_fulltext_len = 0
max_fulltext_prefix = None
for record in stream:
# Raise an error when a record is missing.
if record.storage_kind == 'absent':
raise errors.RevisionNotPresent(record.key, self)
try:
bytes = record.get_bytes_as('fulltext')
except errors.UnavailableRepresentation:
adapter_key = record.storage_kind, 'fulltext'
adapter = get_adapter(adapter_key)
bytes = adapter.get_bytes(record)
if len(record.key) > 1:
prefix = record.key[0]
soft = (prefix == last_prefix)
else:
prefix = None
soft = False
if max_fulltext_len < len(bytes):
max_fulltext_len = len(bytes)
max_fulltext_prefix = prefix
(found_sha1, end_point, type,
length) = self._compressor.compress(record.key,
bytes, record.sha1, soft=soft)
# delta_ratio = float(len(bytes)) / length
# Check if we want to continue to include that text
if (prefix == max_fulltext_prefix
and end_point < 2 * max_fulltext_len):
# As long as we are on the same file_id, we will fill at least
# 2 * max_fulltext_len
start_new_block = False
elif end_point > 4*1024*1024:
start_new_block = True
elif (prefix is not None and prefix != last_prefix
and end_point > 2*1024*1024):
start_new_block = True
else:
start_new_block = False
# if type == 'fulltext':
# # If this is the first text, we don't do anything
# if self._compressor.num_keys > 1:
# if prefix is not None and prefix != last_prefix:
# # We just inserted a fulltext for a different prefix
# # (aka file-id).
# if end_point > 512 * 1024:
# start_new_block = True
# # TODO: Consider packing several small texts together
# # maybe only flush if end_point > some threshold
# # if end_point > 512 * 1024 or len(bytes) <
# # start_new_block = true
# else:
# # We just added a fulltext, part of the same file-id
# if (end_point > 2*1024*1024
# and end_point > 5*max_fulltext_len):
# start_new_block = True
# last_fulltext_len = len(bytes)
# else:
# delta_ratio = float(len(bytes)) / length
# if delta_ratio < 3: # Not much compression
# if end_point > 1*1024*1024:
# start_new_block = True
# elif delta_ratio < 10: # 10:1 compression
# if end_point > 4*1024*1024:
# start_new_block = True
last_prefix = prefix
if start_new_block:
self._compressor.pop_last()
flush()
basis_end = 0
max_fulltext_len = len(bytes)
(found_sha1, end_point, type,
length) = self._compressor.compress(record.key,
bytes, record.sha1)
assert type == 'fulltext'
last_fulltext_len = length
if record.key[-1] is None:
key = record.key[:-1] + ('sha1:' + found_sha1,)
else:
key = record.key
self._unadded_refs[key] = record.parents
yield found_sha1
keys_to_add.append((key, '%d %d' % (basis_end, end_point),
(record.parents,)))
basis_end = end_point
if len(keys_to_add):
flush()
self._compressor = None
assert self._unadded_refs == {}
def iter_lines_added_or_present_in_keys(self, keys, pb=None):
"""Iterate over the lines in the versioned files from keys.
This may return lines from other keys. Each item the returned
iterator yields is a tuple of a line and a text version that that line
is present in (not introduced in).
Ordering of results is in whatever order is most suitable for the
underlying storage format.
If a progress bar is supplied, it may be used to indicate progress.
The caller is responsible for cleaning up progress bars (because this
is an iterator).
NOTES:
* Lines are normalised by the underlying store: they will all have \n
terminators.
* Lines are returned in arbitrary order.
:return: An iterator over (line, key).
"""
if pb is None:
pb = progress.DummyProgress()
keys = set(keys)
total = len(keys)
# we don't care about inclusions, the caller cares.
# but we need to setup a list of records to visit.
# we need key, position, length
for key_idx, record in enumerate(self.get_record_stream(keys,
'unordered', True)):
# XXX: todo - optimise to use less than full texts.
key = record.key
pb.update('Walking content.', key_idx, total)
if record.storage_kind == 'absent':
raise errors.RevisionNotPresent(key, self)
lines = split_lines(record.get_bytes_as('fulltext'))
for line in lines:
yield line, key
pb.update('Walking content.', total, total)
def keys(self):
"""See VersionedFiles.keys."""
if 'evil' in debug.debug_flags:
trace.mutter_callsite(2, "keys scales with size of history")
sources = [self._index]
result = set()
for source in sources:
result.update(source.keys())
return result
class _GCGraphIndex(object):
"""Mapper from GroupCompressVersionedFiles needs into GraphIndex storage."""
def __init__(self, graph_index, is_locked, parents=True,
add_callback=None):
"""Construct a _GCGraphIndex on a graph_index.
:param graph_index: An implementation of bzrlib.index.GraphIndex.
:param is_locked: A callback, returns True if the index is locked and
thus usable.
:param parents: If True, record knits parents, if not do not record
parents.
:param add_callback: If not None, allow additions to the index and call
this callback with a list of added GraphIndex nodes:
[(node, value, node_refs), ...]
"""
self._add_callback = add_callback
self._graph_index = graph_index
self._parents = parents
self.has_graph = parents
self._is_locked = is_locked
def add_records(self, records, random_id=False):
"""Add multiple records to the index.
This function does not insert data into the Immutable GraphIndex
backing the KnitGraphIndex, instead it prepares data for insertion by
the caller and checks that it is safe to insert then calls
self._add_callback with the prepared GraphIndex nodes.
:param records: a list of tuples:
(key, options, access_memo, parents).
:param random_id: If True the ids being added were randomly generated
and no check for existence will be performed.
"""
if not self._add_callback:
raise errors.ReadOnlyError(self)
# we hope there are no repositories with inconsistent parentage
# anymore.
changed = False
keys = {}
for (key, value, refs) in records:
if not self._parents:
if refs:
for ref in refs:
if ref:
raise KnitCorrupt(self,
"attempt to add node with parents "
"in parentless index.")
refs = ()
changed = True
keys[key] = (value, refs)
# check for dups
if not random_id:
present_nodes = self._get_entries(keys)
for (index, key, value, node_refs) in present_nodes:
if node_refs != keys[key][1]:
raise errors.KnitCorrupt(self, "inconsistent details in add_records"
": %s %s" % ((value, node_refs), keys[key]))
del keys[key]
changed = True
if changed:
result = []
if self._parents:
for key, (value, node_refs) in keys.iteritems():
result.append((key, value, node_refs))
else:
for key, (value, node_refs) in keys.iteritems():
result.append((key, value))
records = result
self._add_callback(records)
def _check_read(self):
"""Raise an exception if reads are not permitted."""
if not self._is_locked():
raise errors.ObjectNotLocked(self)
def _check_write_ok(self):
"""Raise an exception if writes are not permitted."""
if not self._is_locked():
raise errors.ObjectNotLocked(self)
def _get_entries(self, keys, check_present=False):
"""Get the entries for keys.
Note: Callers are responsible for checking that the index is locked
before calling this method.
:param keys: An iterable of index key tuples.
"""
keys = set(keys)
found_keys = set()
if self._parents:
for node in self._graph_index.iter_entries(keys):
yield node
found_keys.add(node[1])
else:
# adapt parentless index to the rest of the code.
for node in self._graph_index.iter_entries(keys):
yield node[0], node[1], node[2], ()
found_keys.add(node[1])
if check_present:
missing_keys = keys.difference(found_keys)
if missing_keys:
raise RevisionNotPresent(missing_keys.pop(), self)
def get_parent_map(self, keys):
"""Get a map of the parents of keys.
:param keys: The keys to look up parents for.
:return: A mapping from keys to parents. Absent keys are absent from
the mapping.
"""
self._check_read()
nodes = self._get_entries(keys)
result = {}
if self._parents:
for node in nodes:
result[node[1]] = node[3][0]
else:
for node in nodes:
result[node[1]] = None
return result
def get_build_details(self, keys):
"""Get the various build details for keys.
Ghosts are omitted from the result.
:param keys: An iterable of keys.
:return: A dict of key:
(index_memo, compression_parent, parents, record_details).
index_memo
opaque structure to pass to read_records to extract the raw
data
compression_parent
Content that this record is built upon, may be None
parents
Logical parents of this node
record_details
extra information about the content which needs to be passed to
Factory.parse_record
"""
self._check_read()
result = {}
entries = self._get_entries(keys)
for entry in entries:
key = entry[1]
if not self._parents:
parents = None
else:
parents = entry[3][0]
method = 'group'
result[key] = (self._node_to_position(entry),
None, parents, (method, None))
return result
def keys(self):
"""Get all the keys in the collection.
The keys are not ordered.
"""
self._check_read()
return [node[1] for node in self._graph_index.iter_all_entries()]
def _node_to_position(self, node):
"""Convert an index value to position details."""
bits = node[2].split(' ')
# It would be nice not to read the entire gzip.
start = int(bits[0])
stop = int(bits[1])
basis_end = int(bits[2])
delta_end = int(bits[3])
return node[0], start, stop, basis_end, delta_end
try:
from bzrlib.plugins.groupcompress import _groupcompress_pyx
except ImportError:
pass
|