This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10724

revlog: fix index computation during inline->non-inline transition
ClosedPublic

Authored by joerg.sonnenberger on May 17 2021, 8:41 PM.

Details

Reviewers
indygreg
valentin.gatienbaron
Group Reviewers
hg-reviewers
Commits
rHG21ed126bab53: revlog: fix index computation during inline->non-inline transition
rHGf4117223239b: revlog: fix index computation during inline->non-inline transition
rHG762afde8c3a0: revlog: fix index computation during inline->non-inline transition
Summary

The computation in 63edc384d3b7 failed to factor in the index entries
themselve as revlog.start() doesn't count them. Found by Valtenin
Gatienbaron with a more precise test case from me.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

valentin.gatienbaron accepted this revision.May 18 2021, 10:38 PM
valentin.gatienbaron added a subscriber: valentin.gatienbaron.

I knew zstd could be turned off, but I didn't knew there was an option to turn off even zlib. Cool.

joerg.sonnenberger added a commit: rHG762afde8c3a0: revlog: fix index computation during inline->non-inline transition.May 19 2021, 1:57 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG762afde8c3a0: revlog: fix index computation during inline->non-inline transition (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.
Alphare added a subscriber: Alphare.May 20 2021, 3:46 AM

FYI, this change breaks the CI since the error code is not correct. I'll amend it.

https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/198659

Revision Contents
Changeset List

Diff 28124

mercurial/revlog.py

self._writinghandles = None self._writinghandles = None
new_dfh = self._datafp(b'w+') new_dfh = self._datafp(b'w+')
new_dfh.truncate(0) # drop any potentially existing data new_dfh.truncate(0) # drop any potentially existing data
try: try:
with self._indexfp() as read_ifh: with self._indexfp() as read_ifh:
for r in self: for r in self:
new_dfh.write(self._getsegmentforrevs(r, r, df=read_ifh)[1]) new_dfh.write(self._getsegmentforrevs(r, r, df=read_ifh)[1])
if troffset <= self.start(r): if troffset <= self.start(r) + r * self.index.entry_size:
trindex = r trindex = r
new_dfh.flush() new_dfh.flush()
with self.__index_new_fp() as fp: with self.__index_new_fp() as fp:
self._format_flags &= ~FLAG_INLINE_DATA self._format_flags &= ~FLAG_INLINE_DATA
self._inline = False self._inline = False
for i in self: for i in self:
e = self.index.entry_binary(i) e = self.index.entry_binary(i)

tests/helper-killhook.py

  • This file was added.
import os
def killme(ui, repo, hooktype, **wkargs):
os._exit(80)

tests/test-transaction-rollback-on-revlog-split.t

  • This file was added.
Test correctness of revlog inline -> non-inline transition
----------------------------------------------------------
Test offset computation to correctly factor in the index entries themselve.
Test repo has one small, one moderate and one big change. The clone has
the small and moderate change and will transition to non-inline storage when
adding the big change.
$ hg init troffset-computation --config format.revlog-compression=none
$ cd troffset-computation
$ printf '% 20d' '1' > file
$ hg commit -Aqm_
$ printf '% 1024d' '1' > file
$ hg commit -Aqm_
$ dd if=/dev/zero of=file bs=1k count=128 > /dev/null 2>&1
$ hg commit -Aqm_
$ cd ..
$ hg clone -r 1 troffset-computation troffset-computation-copy --config format.revlog-compression=none -q
$ cd troffset-computation-copy
$ cat > .hg/hgrc <<EOF
> [hooks]
> pretxnchangegroup = python:$TESTDIR/helper-killhook.py:killme
> EOF
$ hg pull ../troffset-computation
pulling from ../troffset-computation
[80]
$ cat .hg/store/journal | tr -s '\000' ' ' | grep data/file | tail -1
data/file.i 128