Patchwork [4,of,7,V4] revlog: use the native implementation of issnapshot

login
register
mail settings
Submitter Boris Feld
Date Dec. 30, 2018, 6:43 p.m.
Message ID <1730cc2b1fdae573dd58.1546195431@Laptop-Boris.lan>
Download mbox | patch
Permalink /patch/37398/
State Accepted
Headers show

Comments

Boris Feld - Dec. 30, 2018, 6:43 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1545366458 -3600
#      Fri Dec 21 05:27:38 2018 +0100
# Node ID 1730cc2b1fdae573dd58cb2def13c65fcbbd6162
# Parent  1317aebed1c5e98e3a89efe807f46d013a84e270
# EXP-Topic sparse-revlog
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 1730cc2b1fda
revlog: use the native implementation of issnapshot

In some sparserevlog case where a lot of the history has to be searched for a
snapshot, the cost of issnashot cost becomes significant. The computation done
by the method is fairly low level, a native implementation provide a very
significant speedup.

example affected manifest write
before: 0.490375s
after:  0.114989s (-76%)

Patch

diff --git a/mercurial/cext/revlog.c b/mercurial/cext/revlog.c
--- a/mercurial/cext/revlog.c
+++ b/mercurial/cext/revlog.c
@@ -1029,6 +1029,27 @@  static int index_issnapshotrev(indexObje
 	return rev == -1;
 }
 
+static PyObject *index_issnapshot(indexObject *self, PyObject *value)
+{
+	long rev;
+	int issnap;
+	Py_ssize_t length = index_length(self);
+
+	if (!pylong_to_long(value, &rev)) {
+		return NULL;
+	}
+	if (rev < -1 || rev >= length) {
+		PyErr_Format(PyExc_ValueError, "revlog index out of range: %ld",
+		             rev);
+		return NULL;
+	};
+	issnap = index_issnapshotrev(self, (Py_ssize_t)rev);
+	if (issnap < 0) {
+		return NULL;
+	};
+	return PyBool_FromLong((long)issnap);
+}
+
 static PyObject *index_deltachain(indexObject *self, PyObject *args)
 {
 	int rev, generaldelta;
@@ -2641,6 +2662,8 @@  static PyMethodDef index_methods[] = {
      "get head revisions"}, /* Can do filtering since 3.2 */
     {"headrevsfiltered", (PyCFunction)index_headrevs, METH_VARARGS,
      "get filtered head revisions"}, /* Can always do filtering */
+    {"issnapshot", (PyCFunction)index_issnapshot, METH_O,
+     "True if the object is a snapshot"},
     {"deltachain", (PyCFunction)index_deltachain, METH_VARARGS,
      "determine revisions with deltas to reconstruct fulltext"},
     {"slicechunktodensity", (PyCFunction)index_slicechunktodensity,
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -1533,14 +1533,18 @@  class revlog(object):
     def issnapshot(self, rev):
         """tells whether rev is a snapshot
         """
+        if not self._sparserevlog:
+            return self.deltaparent(rev) == nullrev
+        elif util.safehasattr(self.index, 'issnapshot'):
+            # directly assign the method to cache the testing and access
+            self.issnapshot = self.index.issnapshot
+            return self.issnapshot(rev)
         if rev == nullrev:
             return True
         entry = self.index[rev]
         base = entry[3]
         if base == rev:
             return True
-        elif not self._sparserevlog:
-            return False
         if base == nullrev:
             return True
         p1 = entry[5]