diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | example.py | 5 | ||||
| -rw-r--r-- | larch/forest_tests.py | 3 | ||||
| -rw-r--r-- | larch/nodestore_disk.py | 3 | ||||
| -rw-r--r-- | larch/nodestore_memory.py | 3 | ||||
| -rw-r--r-- | larch/nodestore_memory_tests.py | 3 | ||||
| -rw-r--r-- | larch/tree_tests.py | 9 | ||||
| -rwxr-xr-x | speed-test | 10 |
8 files changed, 27 insertions, 13 deletions
@@ -11,6 +11,10 @@ Version UNRELEASED deleting references to them. * Node numbers are now reported in hexadecimal, to make it easier to find on disk. Patch by Damien Couroussé. +* The `speed-test` script now works again. The initialiser API for + `NodeStore` and `NodeStoreMemory` now have a new first argument, + `allow_writes`, to make them compatible with the `NodeStoreDisk` + initialiser. Patch by Antoine Brenner. Version 1.20121216 ------------------ @@ -37,8 +37,9 @@ def open_tree(allow_writes, dirname): key_size = len(compute('/dev/null')) node_size = 4096 - forest = larch.open_forest(allow_writes=allow_writes, key_size=key_size, node_size=node_size, - dirname=dirname) + forest = larch.open_forest( + allow_writes=allow_writes, key_size=key_size, node_size=node_size, + dirname=dirname) if forest.trees: tree = forest.trees[0] else: diff --git a/larch/forest_tests.py b/larch/forest_tests.py index a7c9677..b390844 100644 --- a/larch/forest_tests.py +++ b/larch/forest_tests.py @@ -26,7 +26,8 @@ class ForestTests(unittest.TestCase): def setUp(self): self.codec = larch.NodeCodec(3) - self.ns = larch.NodeStoreMemory(allow_writes=True, node_size=64, codec=self.codec) + self.ns = larch.NodeStoreMemory( + allow_writes=True, node_size=64, codec=self.codec) self.forest = larch.Forest(self.ns) def test_new_node_ids_grow(self): diff --git a/larch/nodestore_disk.py b/larch/nodestore_disk.py index 3cb8ee7..6e8cd2f 100644 --- a/larch/nodestore_disk.py +++ b/larch/nodestore_disk.py @@ -117,7 +117,8 @@ class NodeStoreDisk(larch.NodeStore): if format is not None: tracing.trace('forcing format_base: %s', format) self.format_base = format - larch.NodeStore.__init__(self, allow_writes=allow_writes, node_size=node_size, codec=codec) + larch.NodeStore.__init__( + self, allow_writes=allow_writes, node_size=node_size, codec=codec) self.dirname = dirname self.metadata_name = os.path.join(dirname, 'metadata') self.metadata = None diff --git a/larch/nodestore_memory.py b/larch/nodestore_memory.py index f0598be..9ba2b02 100644 --- a/larch/nodestore_memory.py +++ b/larch/nodestore_memory.py @@ -27,7 +27,8 @@ class NodeStoreMemory(larch.NodeStore): ''' def __init__(self,allow_writes, node_size, codec): - larch.NodeStore.__init__(self, allow_writes=allow_writes, node_size=node_size, codec=codec) + larch.NodeStore.__init__( + self, allow_writes=allow_writes, node_size=node_size, codec=codec) self.nodes = dict() self.refcounts = dict() self.metadata = dict() diff --git a/larch/nodestore_memory_tests.py b/larch/nodestore_memory_tests.py index 8c210db..56e3806 100644 --- a/larch/nodestore_memory_tests.py +++ b/larch/nodestore_memory_tests.py @@ -25,5 +25,6 @@ class NodeStoreMemoryTests(unittest.TestCase, larch.NodeStoreTests): def setUp(self): self.node_size = 4096 self.codec = larch.NodeCodec(self.key_bytes) - self.ns = nodestore_memory.NodeStoreMemory(allow_writes=True, node_size=self.node_size, codec=self.codec) + self.ns = nodestore_memory.NodeStoreMemory( + allow_writes=True, node_size=self.node_size, codec=self.codec) diff --git a/larch/tree_tests.py b/larch/tree_tests.py index 8a4a4e9..2fee2d5 100644 --- a/larch/tree_tests.py +++ b/larch/tree_tests.py @@ -67,7 +67,8 @@ class BTreeTests(unittest.TestCase): # We use a small node size so that all code paths are traversed # during testing. Use coverage.py to make sure they do. self.codec = larch.NodeCodec(3) - self.ns = DummyNodeStore(allow_writes=True, node_size=64, codec=self.codec) + self.ns = DummyNodeStore( + allow_writes=True, node_size=64, codec=self.codec) self.forest = DummyForest() self.tree = larch.BTree(self.forest, self.ns, None) self.dump = False @@ -549,7 +550,8 @@ class BTreeDecrementTests(unittest.TestCase): # We use a small node size so that all code paths are traversed # during testing. Use coverage.py to make sure they do. self.codec = larch.NodeCodec(3) - self.ns = DummyNodeStore(allow_writes=True, node_size=64, codec=self.codec) + self.ns = DummyNodeStore( + allow_writes=True, node_size=64, codec=self.codec) self.forest = DummyForest() self.tree = larch.BTree(self.forest, self.ns, None) self.tree.insert('foo', 'bar') @@ -574,7 +576,8 @@ class BTreeDecrementTests(unittest.TestCase): class BTreeBalanceTests(unittest.TestCase): def setUp(self): - ns = DummyNodeStore(allow_writes=True, node_size=4096, codec=larch.NodeCodec(2)) + ns = DummyNodeStore( + allow_writes=True, node_size=4096, codec=larch.NodeCodec(2)) forest = DummyForest() self.tree = larch.BTree(forest, ns, None) self.keys = ['%02d' % i for i in range(10)] @@ -73,14 +73,16 @@ class SpeedTest(cliapp.Application): raise Exception('You must set number of keys with --keys') if not location: - forest = larch.open_forest(allow_writes=True, key_size=key_size, node_size=node_size, - node_store=larch.NodeStoreMemory) + forest = larch.open_forest( + allow_writes=True, key_size=key_size, node_size=node_size, + node_store=larch.NodeStoreMemory) else: if os.path.exists(location): raise Exception('%s exists already' % location) os.mkdir(location) - forest = larch.open_forest(allow_writes=True, key_size=key_size, node_size=node_size, - dirname=location) + forest = larch.open_forest( + allow_writes=True, key_size=key_size, node_size=node_size, + dirname=location) tree = forest.new_tree() |