[Zodb-checkins] CVS: Zope/utilities/ZODBTools - space.py:1.5 zeoup.py:1.15

[Jim Fulton]

Update of /cvs-repository/Zope/utilities/ZODBTools
In directory cvs.zope.org:/tmp/cvs-serv3783/utilities/ZODBTools

Modified Files:
	zeoup.py 
Added Files:
	space.py 
Log Message:
Merged Jeremy and Tim's changes from the zodb33-devel-branch.


=== Zope/utilities/ZODBTools/space.py 1.4 => 1.5 ===
--- /dev/null	Fri Nov 28 11:45:28 2003
+++ Zope/utilities/ZODBTools/space.py	Fri Nov 28 11:44:57 2003
@@ -0,0 +1,62 @@
+#! /usr/bin/env python
+
+"""Report on the space used by objects in a storage.
+
+usage: space.py data.fs
+
+The current implementation only supports FileStorage.
+
+Current limitations / simplifications: Ignores revisions and versions.
+"""
+
+import ZODB
+from ZODB.FileStorage import FileStorage
+from ZODB.utils import U64
+from ZODB.fsdump import get_pickle_metadata
+
+def run(path, v=0):
+    fs = FileStorage(path, read_only=1)
+    # break into the file implementation
+    if hasattr(fs._index, 'iterkeys'):
+        iter = fs._index.iterkeys()
+    else:
+        iter = fs._index.keys()
+    totals = {}
+    for oid in iter:
+        data, serialno = fs.load(oid, '')
+        mod, klass = get_pickle_metadata(data)
+        key = "%s.%s" % (mod, klass)
+        bytes, count = totals.get(key, (0, 0))
+        bytes += len(data)
+        count += 1
+        totals[key] = bytes, count
+        if v:
+            print "%8s %5d %s" % (U64(oid), len(data), key)
+    L = totals.items()
+    L.sort(lambda a, b: cmp(a[1], b[1]))
+    L.reverse()
+    print "Totals per object class:"
+    for key, (bytes, count) in L:
+        print "%8d %8d %s" % (count, bytes, key)
+
+def main():
+    import sys
+    import getopt
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "v")
+    except getopt.error, msg:
+        print msg
+        print "usage: space.py [-v] Data.fs"
+        sys.exit(2)
+    if len(args) != 1:
+        print "usage: space.py [-v] Data.fs"
+        sys.exit(2)
+    v = 0
+    for o, a in opts:
+        if o == "-v":
+            v += 1
+    path = args[0]
+    run(path, v)
+
+if __name__ == "__main__":
+    main()


=== Zope/utilities/ZODBTools/zeoup.py 1.14 => 1.15 ===
--- Zope/utilities/ZODBTools/zeoup.py:1.14	Mon Sep 15 12:29:19 2003
+++ Zope/utilities/ZODBTools/zeoup.py	Fri Nov 28 11:44:57 2003
@@ -34,7 +34,7 @@
 from ZODB.POSException import ConflictError
 from ZODB.tests.MinPO import MinPO
 from ZEO.ClientStorage import ClientStorage
-from ZODB.PersistentMapping import PersistentMapping
+from persistent.mapping import PersistentMapping
 
 ZEO_VERSION = 2