linelog: add replacelines_vec for fastannotate

# no-check-commit because we're conforming to an existing interface

Differential Revision: https://phab.mercurial-scm.org/D3993

mercurial/linelog.py

@@ -1,414 +1,421 b''
 # linelog - efficient cache for annotate data
 #
 # Copyright 2018 Google LLC.
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 """linelog is an efficient cache for annotate data inspired by SCCS Weaves.
 
 SCCS Weaves are an implementation of
 https://en.wikipedia.org/wiki/Interleaved_deltas. See
 mercurial/help/internals/linelog.txt for an exploration of SCCS weaves
 and how linelog works in detail.
 
 Here's a hacker's summary: a linelog is a program which is executed in
 the context of a revision. Executing the program emits information
 about lines, including the revision that introduced them and the line
 number in the file at the introducing revision. When an insertion or
 deletion is performed on the file, a jump instruction is used to patch
 in a new body of annotate information.
 """
 from __future__ import absolute_import, print_function
 
 import abc
 import struct
 
 from .thirdparty import (
     attr,
 )
 from . import (
     pycompat,
 )
 
 _llentry = struct.Struct('>II')
 
 class LineLogError(Exception):
     """Error raised when something bad happens internally in linelog."""
 
 @attr.s
 class lineinfo(object):
     # Introducing revision of this line.
     rev = attr.ib()
     # Line number for this line in its introducing revision.
     linenum = attr.ib()
     # Private. Offset in the linelog program of this line. Used internally.
     _offset = attr.ib()
 
 @attr.s
 class annotateresult(object):
     rev = attr.ib()
     lines = attr.ib()
     _eof = attr.ib()
 
     def __iter__(self):
         return iter(self.lines)
 
 class _llinstruction(object):
 
     __metaclass__ = abc.ABCMeta
 
     @abc.abstractmethod
     def __init__(self, op1, op2):
         pass
 
     @abc.abstractmethod
     def __str__(self):
         pass
 
     def __repr__(self):
         return str(self)
 
     @abc.abstractmethod
     def __eq__(self, other):
         pass
 
     @abc.abstractmethod
     def encode(self):
         """Encode this instruction to the binary linelog format."""
 
     @abc.abstractmethod
     def execute(self, rev, pc, emit):
         """Execute this instruction.
 
         Args:
           rev: The revision we're annotating.
           pc: The current offset in the linelog program.
           emit: A function that accepts a single lineinfo object.
 
         Returns:
           The new value of pc. Returns None if exeuction should stop
           (that is, we've found the end of the file.)
         """
 
 class _jge(_llinstruction):
     """If the current rev is greater than or equal to op1, jump to op2."""
 
     def __init__(self, op1, op2):
         self._cmprev = op1
         self._target = op2
 
     def __str__(self):
         return r'JGE %d %d' % (self._cmprev, self._target)
 
     def __eq__(self, other):
         return (type(self) == type(other)
                 and self._cmprev == other._cmprev
                 and self._target == other._target)
 
     def encode(self):
         return _llentry.pack(self._cmprev << 2, self._target)
 
     def execute(self, rev, pc, emit):
         if rev >= self._cmprev:
             return self._target
         return pc + 1
 
 class _jump(_llinstruction):
     """Unconditional jumps are expressed as a JGE with op1 set to 0."""
 
     def __init__(self, op1, op2):
         if op1 != 0:
             raise LineLogError("malformed JUMP, op1 must be 0, got %d" % op1)
         self._target = op2
 
     def __str__(self):
         return r'JUMP %d' % (self._target)
 
     def __eq__(self, other):
         return (type(self) == type(other)
                 and self._target == other._target)
 
     def encode(self):
         return _llentry.pack(0, self._target)
 
     def execute(self, rev, pc, emit):
         return self._target
 
 class _eof(_llinstruction):
     """EOF is expressed as a JGE that always jumps to 0."""
 
     def __init__(self, op1, op2):
         if op1 != 0:
             raise LineLogError("malformed EOF, op1 must be 0, got %d" % op1)
         if op2 != 0:
             raise LineLogError("malformed EOF, op2 must be 0, got %d" % op2)
 
     def __str__(self):
         return r'EOF'
 
     def __eq__(self, other):
         return type(self) == type(other)
 
     def encode(self):
         return _llentry.pack(0, 0)
 
     def execute(self, rev, pc, emit):
         return None
 
 class _jl(_llinstruction):
     """If the current rev is less than op1, jump to op2."""
 
     def __init__(self, op1, op2):
         self._cmprev = op1
         self._target = op2
 
     def __str__(self):
         return r'JL %d %d' % (self._cmprev, self._target)
 
     def __eq__(self, other):
         return (type(self) == type(other)
                 and self._cmprev == other._cmprev
                 and self._target == other._target)
 
     def encode(self):
         return _llentry.pack(1 | (self._cmprev << 2), self._target)
 
     def execute(self, rev, pc, emit):
         if rev < self._cmprev:
             return self._target
         return pc + 1
 
 class _line(_llinstruction):
     """Emit a line."""
 
     def __init__(self, op1, op2):
         # This line was introduced by this revision number.
         self._rev = op1
         # This line had the specified line number in the introducing revision.
         self._origlineno = op2
 
     def __str__(self):
         return r'LINE %d %d' % (self._rev, self._origlineno)
 
     def __eq__(self, other):
         return (type(self) == type(other)
                 and self._rev == other._rev
                 and self._origlineno == other._origlineno)
 
     def encode(self):
         return _llentry.pack(2 | (self._rev << 2), self._origlineno)
 
     def execute(self, rev, pc, emit):
         emit(lineinfo(self._rev, self._origlineno, pc))
         return pc + 1
 
 def _decodeone(data, offset):
     """Decode a single linelog instruction from an offset in a buffer."""
     try:
         op1, op2 = _llentry.unpack_from(data, offset)
     except struct.error as e:
         raise LineLogError('reading an instruction failed: %r' % e)
     opcode = op1 & 0b11
     op1 = op1 >> 2
     if opcode == 0:
         if op1 == 0:
             if op2 == 0:
                 return _eof(op1, op2)
             return _jump(op1, op2)
         return _jge(op1, op2)
     elif opcode == 1:
         return _jl(op1, op2)
     elif opcode == 2:
         return _line(op1, op2)
     raise NotImplementedError('Unimplemented opcode %r' % opcode)
 
 class linelog(object):
     """Efficient cache for per-line history information."""
 
     def __init__(self, program=None, maxrev=0):
         if program is None:
             # We pad the program with an extra leading EOF so that our
             # offsets will match the C code exactly. This means we can
             # interoperate with the C code.
             program = [_eof(0, 0), _eof(0, 0)]
         self._program = program
         self._lastannotate = None
         self._maxrev = maxrev
 
     def __eq__(self, other):
         return (type(self) == type(other)
                 and self._program == other._program
                 and self._maxrev == other._maxrev)
 
     def __repr__(self):
         return '<linelog at %s: maxrev=%d size=%d>' % (
             hex(id(self)), self._maxrev, len(self._program))
 
     def debugstr(self):
         fmt = r'%%%dd %%s' % len(str(len(self._program)))
         return pycompat.sysstr('\n').join(
             fmt % (idx, i) for idx, i in enumerate(self._program[1:], 1))
 
     @classmethod
     def fromdata(cls, buf):
         if len(buf) % _llentry.size != 0:
             raise LineLogError(
                 "invalid linelog buffer size %d (must be a multiple of %d)" % (
                     len(buf), _llentry.size))
         expected = len(buf) / _llentry.size
         fakejge = _decodeone(buf, 0)
         if isinstance(fakejge, _jump):
             maxrev = 0
         else:
             maxrev = fakejge._cmprev
         numentries = fakejge._target
         if expected != numentries:
             raise LineLogError("corrupt linelog data: claimed"
                                " %d entries but given data for %d entries" % (
                                    expected, numentries))
         instructions = [_eof(0, 0)]
         for offset in pycompat.xrange(1, numentries):
             instructions.append(_decodeone(buf, offset * _llentry.size))
         return cls(instructions, maxrev=maxrev)
 
     def encode(self):
         hdr = _jge(self._maxrev, len(self._program)).encode()
         return hdr + ''.join(i.encode() for i in self._program[1:])
 
     def clear(self):
         self._program = []
         self._maxrev = 0
         self._lastannotate = None
 
-    def replacelines(self, rev, a1, a2, b1, b2):
+    def replacelines_vec(self, rev, a1, a2, blines):
+        return self.replacelines(rev, a1, a2, 0, len(blines),
+                                 _internal_blines=blines)
+
+    def replacelines(self, rev, a1, a2, b1, b2, _internal_blines=None):
         """Replace lines [a1, a2) with lines [b1, b2)."""
         if self._lastannotate:
             # TODO(augie): make replacelines() accept a revision at
             # which we're editing as well as a revision to mark
             # responsible for the edits. In hg-experimental it's
             # stateful like this, so we're doing the same thing to
             # retain compatibility with absorb until that's imported.
             ar = self._lastannotate
         else:
             ar = self.annotate(rev)
             #        ar = self.annotate(self._maxrev)
         if a1 > len(ar.lines):
             raise LineLogError(
                 '%d contains %d lines, tried to access line %d' % (
                     rev, len(ar.lines), a1))
         elif a1 == len(ar.lines):
             # Simulated EOF instruction since we're at EOF, which
             # doesn't have a "real" line.
             a1inst = _eof(0, 0)
             a1info = lineinfo(0, 0, ar._eof)
         else:
             a1info = ar.lines[a1]
             a1inst = self._program[a1info._offset]
         oldproglen = len(self._program)
         appendinst = self._program.append
 
         # insert
         if b1 < b2:
             # Determine the jump target for the JGE at the start of
             # the new block.
             tgt = oldproglen + (b2 - b1 + 1)
             # Jump to skip the insert if we're at an older revision.
             appendinst(_jl(rev, tgt))
             for linenum in pycompat.xrange(b1, b2):
-                appendinst(_line(rev, linenum))
+                if _internal_blines is None:
+                    appendinst(_line(rev, linenum))
+                else:
+                    appendinst(_line(*_internal_blines[linenum]))
         # delete
         if a1 < a2:
             if a2 > len(ar.lines):
                 raise LineLogError(
                     '%d contains %d lines, tried to access line %d' % (
                         rev, len(ar.lines), a2))
             elif a2 == len(ar.lines):
                 endaddr = ar._eof
             else:
                 endaddr = ar.lines[a2]._offset
             if a2 > 0 and rev < self._maxrev:
                 # If we're here, we're deleting a chunk of an old
                 # commit, so we need to be careful and not touch
                 # invisible lines between a2-1 and a2 (IOW, lines that
                 # are added later).
                 endaddr = ar.lines[a2 - 1]._offset + 1
             appendinst(_jge(rev, endaddr))
         # copy instruction from a1
         appendinst(a1inst)
         # if a1inst isn't a jump or EOF, then we need to add an unconditional
         # jump back into the program here.
         if not isinstance(a1inst, (_jump, _eof)):
             appendinst(_jump(0, a1info._offset + 1))
         # Patch instruction at a1, which makes our patch live.
         self._program[a1info._offset] = _jump(0, oldproglen)
         # For compat with the C version, re-annotate rev so that
         # self.annotateresult is cromulent.. We could fix up the
         # annotateresult in place (which is how the C version works),
         # but for now we'll pass on that and see if it matters in
         # practice.
         self.annotate(max(self._lastannotate.rev, rev))
         if rev > self._maxrev:
             self._maxrev = rev
 
     def annotate(self, rev):
         pc = 1
         lines = []
         # Sanity check: if len(lines) is longer than len(program), we
         # hit an infinite loop in the linelog program somehow and we
         # should stop.
         while pc is not None and len(lines) < len(self._program):
             inst = self._program[pc]
             lastpc = pc
             pc = inst.execute(rev, pc, lines.append)
         if pc is not None:
             raise LineLogError(
                 'Probably hit an infinite loop in linelog. Program:\n' +
                 self.debugstr())
         ar = annotateresult(rev, lines, lastpc)
         self._lastannotate = ar
         return ar
 
     @property
     def maxrev(self):
         return self._maxrev
 
     # Stateful methods which depend on the value of the last
     # annotation run. This API is for compatiblity with the original
     # linelog, and we should probably consider refactoring it.
     @property
     def annotateresult(self):
         """Return the last annotation result. C linelog code exposed this."""
         return [(l.rev, l.linenum) for l in self._lastannotate.lines]
 
     def getoffset(self, line):
         return self._lastannotate.lines[line]._offset
 
     def getalllines(self, start=0, end=0):
         """Get all lines that ever occurred in [start, end).
 
         Passing start == end == 0 means "all lines ever".
 
         This works in terms of *internal* program offsets, not line numbers.
         """
         pc = start or 1
         lines = []
         # only take as many steps as there are instructions in the
         # program - if we don't find an EOF or our stop-line before
         # then, something is badly broken.
         for step in pycompat.xrange(len(self._program)):
             inst = self._program[pc]
             nextpc = pc + 1
             if isinstance(inst, _jump):
                 nextpc = inst._target
             elif isinstance(inst, _eof):
                 return lines
             elif isinstance(inst, (_jl, _jge)):
                 pass
             elif isinstance(inst, _line):
                 lines.append((inst._rev, inst._origlineno))
             else:
                 raise LineLogError("Illegal instruction %r" % inst)
             if nextpc == end:
                 return lines
             pc = nextpc
         raise LineLogError("Failed to perform getalllines")

tests/test-linelog.py

@@ -1,173 +1,184 b''
 from __future__ import absolute_import, print_function
 
 import difflib
 import random
 import unittest
 
 from mercurial import linelog
 
+vecratio = 3 # number of replacelines / number of replacelines_vec
 maxlinenum = 0xffffff
 maxb1 = 0xffffff
 maxdeltaa = 10
 maxdeltab = 10
 
 def _genedits(seed, endrev):
     lines = []
     random.seed(seed)
     rev = 0
     for rev in range(0, endrev):
         n = len(lines)
         a1 = random.randint(0, n)
         a2 = random.randint(a1, min(n, a1 + maxdeltaa))
         b1 = random.randint(0, maxb1)
         b2 = random.randint(b1, b1 + maxdeltab)
-        blines = [(rev, idx) for idx in range(b1, b2)]
+        usevec = not bool(random.randint(0, vecratio))
+        if usevec:
+            blines = [(random.randint(0, rev), random.randint(0, maxlinenum))
+                      for _ in range(b1, b2)]
+        else:
+            blines = [(rev, bidx) for bidx in range(b1, b2)]
         lines[a1:a2] = blines
-        yield lines, rev, a1, a2, b1, b2
+        yield lines, rev, a1, a2, b1, b2, blines, usevec
 
 class linelogtests(unittest.TestCase):
     def testlinelogencodedecode(self):
         program = [linelog._eof(0, 0),
                    linelog._jge(41, 42),
                    linelog._jump(0, 43),
                    linelog._eof(0, 0),
                    linelog._jl(44, 45),
                    linelog._line(46, 47),
                    ]
         ll = linelog.linelog(program, maxrev=100)
         enc = ll.encode()
         # round-trips okay
         self.assertEqual(linelog.linelog.fromdata(enc)._program, ll._program)
         self.assertEqual(linelog.linelog.fromdata(enc), ll)
         # This encoding matches the encoding used by hg-experimental's
         # linelog file, or is supposed to if it doesn't.
         self.assertEqual(enc, (b'\x00\x00\x01\x90\x00\x00\x00\x06'
                                b'\x00\x00\x00\xa4\x00\x00\x00*'
                                b'\x00\x00\x00\x00\x00\x00\x00+'
                                b'\x00\x00\x00\x00\x00\x00\x00\x00'
                                b'\x00\x00\x00\xb1\x00\x00\x00-'
                                b'\x00\x00\x00\xba\x00\x00\x00/'))
 
     def testsimpleedits(self):
         ll = linelog.linelog()
         # Initial revision: add lines 0, 1, and 2
         ll.replacelines(1, 0, 0, 0, 3)
         self.assertEqual([(l.rev, l.linenum) for l in ll.annotate(1)],
                          [(1, 0),
                           (1, 1),
                           (1, 2),
                          ])
         # Replace line 1 with a new line
         ll.replacelines(2, 1, 2, 1, 2)
         self.assertEqual([(l.rev, l.linenum) for l in ll.annotate(2)],
                          [(1, 0),
                           (2, 1),
                           (1, 2),
                          ])
         # delete a line out of 2
         ll.replacelines(3, 1, 2, 0, 0)
         self.assertEqual([(l.rev, l.linenum) for l in ll.annotate(3)],
                          [(1, 0),
                           (1, 2),
                          ])
         # annotation of 1 is unchanged
         self.assertEqual([(l.rev, l.linenum) for l in ll.annotate(1)],
                          [(1, 0),
                           (1, 1),
                           (1, 2),
                          ])
         ll.annotate(3) # set internal state to revision 3
         start = ll.getoffset(0)
         end = ll.getoffset(1)
         self.assertEqual(ll.getalllines(start, end), [
             (1, 0),
             (2, 1),
             (1, 1),
         ])
         self.assertEqual(ll.getalllines(), [
             (1, 0),
             (2, 1),
             (1, 1),
             (1, 2),
         ])
 
     def testparseclinelogfile(self):
         # This data is what the replacements in testsimpleedits
         # produce when fed to the original linelog.c implementation.
         data = (b'\x00\x00\x00\x0c\x00\x00\x00\x0f'
                 b'\x00\x00\x00\x00\x00\x00\x00\x02'
                 b'\x00\x00\x00\x05\x00\x00\x00\x06'
                 b'\x00\x00\x00\x06\x00\x00\x00\x00'
                 b'\x00\x00\x00\x00\x00\x00\x00\x07'
                 b'\x00\x00\x00\x06\x00\x00\x00\x02'
                 b'\x00\x00\x00\x00\x00\x00\x00\x00'
                 b'\x00\x00\x00\t\x00\x00\x00\t'
                 b'\x00\x00\x00\x00\x00\x00\x00\x0c'
                 b'\x00\x00\x00\x08\x00\x00\x00\x05'
                 b'\x00\x00\x00\x06\x00\x00\x00\x01'
                 b'\x00\x00\x00\x00\x00\x00\x00\x05'
                 b'\x00\x00\x00\x0c\x00\x00\x00\x05'
                 b'\x00\x00\x00\n\x00\x00\x00\x01'
                 b'\x00\x00\x00\x00\x00\x00\x00\t')
         llc = linelog.linelog.fromdata(data)
         self.assertEqual([(l.rev, l.linenum) for l in llc.annotate(1)],
                          [(1, 0),
                           (1, 1),
                           (1, 2),
                          ])
         self.assertEqual([(l.rev, l.linenum) for l in llc.annotate(2)],
                          [(1, 0),
                           (2, 1),
                           (1, 2),
                          ])
         self.assertEqual([(l.rev, l.linenum) for l in llc.annotate(3)],
                          [(1, 0),
                           (1, 2),
                          ])
         # Check we emit the same bytecode.
         ll = linelog.linelog()
         # Initial revision: add lines 0, 1, and 2
         ll.replacelines(1, 0, 0, 0, 3)
         # Replace line 1 with a new line
         ll.replacelines(2, 1, 2, 1, 2)
         # delete a line out of 2
         ll.replacelines(3, 1, 2, 0, 0)
         diff = '\n   ' + '\n   '.join(difflib.unified_diff(
             ll.debugstr().splitlines(), llc.debugstr().splitlines(),
             'python', 'c', lineterm=''))
         self.assertEqual(ll._program, llc._program, 'Program mismatch: ' + diff)
         # Done as a secondary step so we get a better result if the
         # program is where the mismatch is.
         self.assertEqual(ll, llc)
         self.assertEqual(ll.encode(), data)
 
     def testanothersimplecase(self):
         ll = linelog.linelog()
         ll.replacelines(3, 0, 0, 0, 2)
         ll.replacelines(4, 0, 2, 0, 0)
         self.assertEqual([(l.rev, l.linenum) for l in ll.annotate(4)],
                          [])
         self.assertEqual([(l.rev, l.linenum) for l in ll.annotate(3)],
                          [(3, 0), (3, 1)])
         # rev 2 is empty because contents were only ever introduced in rev 3
         self.assertEqual([(l.rev, l.linenum) for l in ll.annotate(2)],
                          [])
 
     def testrandomedits(self):
         # Inspired by original linelog tests.
         seed = random.random()
         numrevs = 2000
         ll = linelog.linelog()
         # Populate linelog
-        for lines, rev, a1, a2, b1, b2 in _genedits(seed, numrevs):
-            ll.replacelines(rev, a1, a2, b1, b2)
+        for lines, rev, a1, a2, b1, b2, blines, usevec in _genedits(
+                seed, numrevs):
+            if usevec:
+                ll.replacelines_vec(rev, a1, a2, blines)
+            else:
+                ll.replacelines(rev, a1, a2, b1, b2)
             ar = ll.annotate(rev)
             self.assertEqual(ll.annotateresult, lines)
         # Verify we can get back these states by annotating each rev
-        for lines, rev, a1, a2, b1, b2 in _genedits(seed, numrevs):
+        for lines, rev, a1, a2, b1, b2, blines, usevec in _genedits(
+                seed, numrevs):
             ar = ll.annotate(rev)
             self.assertEqual([(l.rev, l.linenum) for l in ar], lines)
 
 if __name__ == '__main__':
     import silenttestrunner
     silenttestrunner.main(__name__)