mirror of
https://github.com/facebook/sapling.git
synced 2025-01-07 14:10:42 +03:00
remotefilelog: remove fastdatapack
Summary: This code isn't used anywhere, let's get rid of it. Reviewed By: singhsrb Differential Revision: D16476583 fbshipit-source-id: d42376dbb2cf631a170ade3e2764d1f70922d882
This commit is contained in:
Xavier Deguillard
Facebook Github Bot
parent
6cdcb360ed
commit
28d7ef620b
@ -22,13 +22,6 @@ try:
|
||||
except NameError:
|
||||
xrange = range
|
||||
|
||||
try:
|
||||
from edenscmnative import cstore
|
||||
|
||||
cstore.datapack
|
||||
except ImportError:
|
||||
cstore = None
|
||||
|
||||
NODELENGTH = 20
|
||||
|
||||
# The indicator value in the index for a fulltext entry.
|
||||
@ -89,78 +82,6 @@ class datapackstore(basepack.basepackstore):
|
||||
revisionstore.repackincrementaldatapacks(self.path, self.path)
|
||||
|
||||
|
||||
class fastdatapack(basepack.basepack):
|
||||
INDEXSUFFIX = INDEXSUFFIX
|
||||
PACKSUFFIX = PACKSUFFIX
|
||||
|
||||
def __init__(self, path):
|
||||
self._path = path
|
||||
self._packpath = path + self.PACKSUFFIX
|
||||
self._indexpath = path + self.INDEXSUFFIX
|
||||
self.datapack = cstore.datapack(path)
|
||||
|
||||
def getmissing(self, keys):
|
||||
missing = []
|
||||
for name, node in keys:
|
||||
value = self.datapack._find(node)
|
||||
if not value:
|
||||
missing.append((name, node))
|
||||
|
||||
return missing
|
||||
|
||||
def get(self, name, node):
|
||||
raise RuntimeError(
|
||||
"must use getdeltachain with datapack (%s:%s)" % (name, hex(node))
|
||||
)
|
||||
|
||||
def getmeta(self, name, node):
|
||||
return self.datapack.getmeta(node)
|
||||
|
||||
def getdelta(self, name, node):
|
||||
result = self.datapack.getdelta(node)
|
||||
if result is None:
|
||||
raise KeyError((name, hex(node)))
|
||||
|
||||
delta, deltabasenode, meta = result
|
||||
return delta, name, deltabasenode, meta
|
||||
|
||||
def getdeltachain(self, name, node):
|
||||
result = self.datapack.getdeltachain(node)
|
||||
if result is None:
|
||||
raise KeyError((name, hex(node)))
|
||||
|
||||
return result
|
||||
|
||||
def add(self, name, node, data):
|
||||
raise RuntimeError("cannot add to datapack (%s:%s)" % (name, node))
|
||||
|
||||
def markledger(self, ledger, options=None):
|
||||
if options and options.get(constants.OPTION_LOOSEONLY):
|
||||
return
|
||||
|
||||
with ledger.location(self._path):
|
||||
for filename, node in self:
|
||||
ledger.markdataentry(self, filename, node)
|
||||
|
||||
def cleanup(self, ledger):
|
||||
entries = ledger.sources.get(self, [])
|
||||
allkeys = set(self)
|
||||
repackedkeys = set(
|
||||
(e.filename, e.node) for e in entries if e.datarepacked or e.gced
|
||||
)
|
||||
|
||||
if len(allkeys - repackedkeys) == 0:
|
||||
if self._path not in ledger.created:
|
||||
util.unlinkpath(self.indexpath(), ignoremissing=True)
|
||||
util.unlinkpath(self.packpath(), ignoremissing=True)
|
||||
|
||||
def __iter__(self):
|
||||
return self.datapack.__iter__()
|
||||
|
||||
def iterentries(self):
|
||||
return self.datapack.iterentries()
|
||||
|
||||
|
||||
class memdatapack(object):
|
||||
def __init__(self):
|
||||
self.data = {}
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
tests/fixtures/rename-closed-branch-dir.sh is not an executable but does have #!
|
||||
tests/infinitepush/library.sh is not an executable but does have #!
|
||||
tests/stresstest-atomicreplace.py is not an executable but does have #!
|
||||
tests/test-fb-hgext-cstore-datapackstore.py is a Python script but does not have Python interpreter specified
|
||||
tests/test-fb-hgext-cstore-treemanifest.py is a Python script but does not have Python interpreter specified
|
||||
tests/test-fb-hgext-cstore-uniondatapackstore.py is a Python script but does not have Python interpreter specified
|
||||
tests/test-fb-hgext-revisionstore-datastore.py is a Python script but does not have Python interpreter specified
|
||||
|
||||
@ -1,185 +0,0 @@
|
||||
#!/usr/bin/env python2.7
|
||||
from __future__ import absolute_import
|
||||
|
||||
import hashlib
|
||||
import random
|
||||
import shutil
|
||||
import tempfile
|
||||
import time
|
||||
import unittest
|
||||
|
||||
import edenscm.mercurial.ui as uimod
|
||||
import silenttestrunner
|
||||
from edenscm.hgext.remotefilelog.datapack import fastdatapack
|
||||
from edenscm.mercurial.node import bin, nullid
|
||||
from edenscmnative.bindings import revisionstore
|
||||
from edenscmnative.cstore import datapackstore
|
||||
|
||||
|
||||
class datapackstoretests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
random.seed(0)
|
||||
self.tempdirs = []
|
||||
|
||||
def tearDown(self):
|
||||
for d in self.tempdirs:
|
||||
shutil.rmtree(d)
|
||||
|
||||
def makeTempDir(self):
|
||||
tempdir = tempfile.mkdtemp()
|
||||
self.tempdirs.append(tempdir)
|
||||
return tempdir
|
||||
|
||||
def getHash(self, content):
|
||||
return hashlib.sha1(content).digest()
|
||||
|
||||
def getFakeHash(self):
|
||||
return "".join(chr(random.randint(0, 255)) for _ in range(20))
|
||||
|
||||
def createPack(self, packdir, revisions=None):
|
||||
if revisions is None:
|
||||
revisions = [("filename", self.getFakeHash(), nullid, "content")]
|
||||
|
||||
packer = revisionstore.mutabledeltastore(packfilepath=packdir)
|
||||
|
||||
for filename, node, base, content in revisions:
|
||||
packer.add(filename, node, base, content)
|
||||
|
||||
path = packer.flush()
|
||||
return fastdatapack(path)
|
||||
|
||||
def testGetDeltaChainSingleRev(self):
|
||||
"""Test getting a 1-length delta chain."""
|
||||
packdir = self.makeTempDir()
|
||||
|
||||
revisions = [("foo", self.getFakeHash(), nullid, "content")]
|
||||
self.createPack(packdir, revisions=revisions)
|
||||
|
||||
store = datapackstore(packdir)
|
||||
|
||||
chain = store.getdeltachain(revisions[0][0], revisions[0][1])
|
||||
self.assertEquals(1, len(chain))
|
||||
self.assertEquals("content", chain[0][4])
|
||||
|
||||
def testPackWithSameNodePrefixes(self):
|
||||
"""
|
||||
Test a pack with several nodes that all start with the same prefix.
|
||||
|
||||
Previously the cdatapack code had a bug reading packs where all nodes
|
||||
started with the same byte, causing it to fail to find most nodes in
|
||||
the pack file.
|
||||
"""
|
||||
packdir = self.makeTempDir()
|
||||
|
||||
node1 = bin("c4beedc1071590f5a0869a72efd80ce182bb1146")
|
||||
node2 = bin("c4beede6a252041e1d8c0e8410c5c37eb6568c49")
|
||||
node3 = bin("c4beed4045e49bf0c18e6aa3a4bdd00ff72ed99e")
|
||||
|
||||
packer = revisionstore.mutabledeltastore(packfilepath=packdir)
|
||||
packer.add("foo.c", node1, nullid, "stuff")
|
||||
packer.add("bar.c", node2, nullid, "other stuff")
|
||||
packer.add("test", node3, nullid, "things")
|
||||
path = packer.flush()
|
||||
|
||||
# We use fastdatapack.getmissing() to exercise the cdatapack find()
|
||||
# function
|
||||
pack = fastdatapack(path)
|
||||
self.assertEquals(pack.getmissing([("foo.c", node1)]), [])
|
||||
self.assertEquals(pack.getmissing([("bar.c", node2)]), [])
|
||||
self.assertEquals(pack.getmissing([("test", node3)]), [])
|
||||
|
||||
# Confirm that getmissing() does return a node that is actually missing
|
||||
node4 = bin("4e4a47e84ced76e1d30da10a59ad9e95c9d621d7")
|
||||
self.assertEquals(pack.getmissing([("other.c", node4)]), [("other.c", node4)])
|
||||
|
||||
def testGetDeltaChainMultiRev(self):
|
||||
"""Test getting a 2-length delta chain."""
|
||||
packdir = self.makeTempDir()
|
||||
|
||||
firsthash = self.getFakeHash()
|
||||
revisions = [
|
||||
("foo", firsthash, nullid, "content"),
|
||||
("foo", self.getFakeHash(), firsthash, "content2"),
|
||||
]
|
||||
self.createPack(packdir, revisions=revisions)
|
||||
|
||||
store = datapackstore(packdir)
|
||||
|
||||
chain = store.getdeltachain(revisions[1][0], revisions[1][1])
|
||||
self.assertEquals(2, len(chain))
|
||||
self.assertEquals("content2", chain[0][4])
|
||||
self.assertEquals("content", chain[1][4])
|
||||
|
||||
def testGetDeltaChainMultiPack(self):
|
||||
"""Test getting chains from multiple packs."""
|
||||
packdir = self.makeTempDir()
|
||||
|
||||
revisions1 = [("foo", self.getFakeHash(), nullid, "content")]
|
||||
self.createPack(packdir, revisions=revisions1)
|
||||
|
||||
revisions2 = [("foo", self.getFakeHash(), revisions1[0][1], "content2")]
|
||||
self.createPack(packdir, revisions=revisions2)
|
||||
|
||||
store = datapackstore(packdir)
|
||||
|
||||
chain1 = store.getdeltachain(revisions2[0][0], revisions2[0][1])
|
||||
self.assertEquals(1, len(chain1))
|
||||
self.assertEquals("content2", chain1[0][4])
|
||||
|
||||
chain2 = store.getdeltachain(chain1[0][2], chain1[0][3])
|
||||
self.assertEquals(1, len(chain2))
|
||||
self.assertEquals("content", chain2[0][4])
|
||||
|
||||
def testGetMissing(self):
|
||||
packdir = self.makeTempDir()
|
||||
|
||||
revisions = [("foo", self.getFakeHash(), nullid, "content")]
|
||||
self.createPack(packdir, revisions=revisions)
|
||||
|
||||
store = datapackstore(packdir)
|
||||
|
||||
missinghash1 = self.getFakeHash()
|
||||
missinghash2 = self.getFakeHash()
|
||||
missing = store.getmissing(
|
||||
[
|
||||
(revisions[0][0], revisions[0][1]),
|
||||
("foo", missinghash1),
|
||||
("foo2", missinghash2),
|
||||
]
|
||||
)
|
||||
self.assertEquals(2, len(missing))
|
||||
self.assertEquals(
|
||||
set([("foo", missinghash1), ("foo2", missinghash2)]), set(missing)
|
||||
)
|
||||
|
||||
def testRefreshPacks(self):
|
||||
packdir = self.makeTempDir()
|
||||
|
||||
revisions = [("foo", self.getFakeHash(), nullid, "content")]
|
||||
self.createPack(packdir, revisions=revisions)
|
||||
store = datapackstore(packdir)
|
||||
|
||||
missing = store.getmissing([(revisions[0][0], revisions[0][1])])
|
||||
self.assertEquals(0, len(missing))
|
||||
|
||||
revisions2 = [("foo2", self.getFakeHash(), nullid, "content")]
|
||||
self.createPack(packdir, revisions=revisions2)
|
||||
|
||||
# First miss should guarantee a refresh
|
||||
missing = store.getmissing([(revisions2[0][0], revisions2[0][1])])
|
||||
self.assertEquals(0, len(missing))
|
||||
|
||||
revisions3 = [("foo3", self.getFakeHash(), nullid, "content")]
|
||||
self.createPack(packdir, revisions=revisions3)
|
||||
|
||||
# Second miss should guarantee a refresh after 100ms.
|
||||
# Use a busy loop since we listen to the clock timer internally.
|
||||
now = time.time()
|
||||
while time.time() - now < 0.2:
|
||||
continue
|
||||
missing = store.getmissing([(revisions3[0][0], revisions3[0][1])])
|
||||
self.assertEquals(0, len(missing))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
silenttestrunner.main(__name__)
|
||||
Loading…
Reference in New Issue
Block a user