Revision 5161c672
b/pithos/backends/lib/sqlalchemy/node.py | ||
---|---|---|
630 | 630 |
def version_remove(self, serial): |
631 | 631 |
"""Remove the serial specified.""" |
632 | 632 |
|
633 |
props = self.node_get_properties(serial)
|
|
633 |
props = self.version_get_properties(serial)
|
|
634 | 634 |
if not props: |
635 | 635 |
return |
636 | 636 |
node = props[NODE] |
637 |
hash = props[HASH] |
|
637 | 638 |
size = props[SIZE] |
638 | 639 |
cluster = props[CLUSTER] |
639 | 640 |
|
... | ... | |
642 | 643 |
|
643 | 644 |
s = self.versions.delete().where(self.versions.c.serial == serial) |
644 | 645 |
self.conn.execute(s).close() |
645 |
return True
|
|
646 |
return hash
|
|
646 | 647 |
|
647 | 648 |
def attribute_get(self, serial, keys=()): |
648 | 649 |
"""Return a list of (key, value) pairs of the version specified by serial. |
b/pithos/backends/lib/sqlite/node.py | ||
---|---|---|
529 | 529 |
def version_remove(self, serial): |
530 | 530 |
"""Remove the serial specified.""" |
531 | 531 |
|
532 |
props = self.node_get_properties(serial)
|
|
532 |
props = self.version_get_properties(serial)
|
|
533 | 533 |
if not props: |
534 | 534 |
return |
535 | 535 |
node = props[NODE] |
536 |
hash = props[HASH] |
|
536 | 537 |
size = props[SIZE] |
537 | 538 |
cluster = props[CLUSTER] |
538 | 539 |
|
... | ... | |
541 | 542 |
|
542 | 543 |
q = "delete from versions where serial = ?" |
543 | 544 |
self.execute(q, (serial,)) |
544 |
return True
|
|
545 |
return hash
|
|
545 | 546 |
|
546 | 547 |
def attribute_get(self, serial, keys=()): |
547 | 548 |
"""Return a list of (key, value) pairs of the version specified by serial. |
b/pithos/backends/modular.py | ||
---|---|---|
868 | 868 |
path, node = self._lookup_container(account, container) |
869 | 869 |
versioning = self._get_policy(node)['versioning'] |
870 | 870 |
if versioning != 'auto': |
871 |
self.node.version_remove(version_id) |
|
871 |
hash = self.node.version_remove(version_id) |
|
872 |
self.store.map_delete(hash) |
|
872 | 873 |
|
873 | 874 |
# Access control functions. |
874 | 875 |
|
Also available in: Unified diff