ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-21 02:01:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

storage.py: factor out a common compare() routine

Browse Source
This commit is contained in:
Brian Warner 2007-12-05 00:20:34 -07:00
parent 51af1fa2e3
commit 841c1a8509
1 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/allmydata/storage.py
View File

@ -572,7 +572,7 @@ class MutableShareFile:
f = open(self.home, 'rb+')
for (offset, length, operator, specimen) in testv:
data = self._read_share_data(f, offset, length)
if not self.compare(data, operator, specimen):
if not testv_compare(data, operator, specimen):
test_good = False
break
f.close()
@ -588,21 +588,21 @@ class MutableShareFile:
f.write(struct.pack(">Q", new_length))
f.close()
def compare(self, a, op, b):
assert op in ("lt", "le", "eq", "ne", "ge", "gt")
if op == "lt":
return a < b
if op == "le":
return a <= b
if op == "eq":
return a == b
if op == "ne":
return a != b
if op == "ge":
return a >= b
if op == "gt":
return a > b
# never reached
def testv_compare(a, op, b):
assert op in ("lt", "le", "eq", "ne", "ge", "gt")
if op == "lt":
return a < b
if op == "le":
return a <= b
if op == "eq":
return a == b
if op == "ne":
return a != b
if op == "ge":
return a >= b
if op == "gt":
return a > b
# never reached
class EmptyShare:
@ -610,27 +610,11 @@ class EmptyShare:
test_good = True
for (offset, length, operator, specimen) in testv:
data = ""
if not self.compare(data, operator, specimen):
if not testv_compare(data, operator, specimen):
test_good = False
break
return test_good
def compare(self, a, op, b):
assert op in ("lt", "le", "eq", "ne", "ge", "gt")
if op == "lt":
return a < b
if op == "le":
return a <= b
if op == "eq":
return a == b
if op == "ne":
return a != b
if op == "ge":
return a >= b
if op == "gt":
return a > b
# never reached
def create_mutable_sharefile(filename, my_nodeid, write_enabler):
ms = MutableShareFile(filename)
ms.create(my_nodeid, write_enabler)