Author: tack
Date: Tue Oct 25 19:27:16 2005
New Revision: 878
Modified:
trunk/vfs/test/testdb.py
trunk/vfs/test/testdb2.py
Log:
Update examples to reflect kaa.base.db API changes
Modified: trunk/vfs/test/testdb.py
==============================================================================
--- trunk/vfs/test/testdb.py (original)
+++ trunk/vfs/test/testdb.py Tue Oct 25 19:27:16 2005
@@ -29,7 +29,7 @@
is_removable = (int, ATTR_SEARCHABLE)
)
-dir = db.query_normalized(type="dir", name="/home/freevo/mp3")
+dir = db.query(type="dir", name="/home/freevo/mp3")
if not dir:
t0=time.time()
print "* Creating (database) directory with 20000 objects"
@@ -54,11 +54,11 @@
dir = dir[0]
t0=time.time()
-rows = db.query_normalized(keywords="anna", limit=100)
+rows = db.query(keywords="anna", limit=100)
print "* Keyword query took %.03f seconds, %d rows" % (time.time()-t0,
len(rows))
t0=time.time()
-rows = db.query_normalized(keywords="birthday vacation", limit=100)
+rows = db.query(keywords="birthday vacation", limit=100)
print "* Keyword query (worst case) took %.03f seconds, %d rows" %
(time.time()-t0, len(rows))
t0=time.time()
@@ -66,12 +66,8 @@
print "* Update object (with keyword reindex) took %.03f seconds" %
(time.time()-t0)
t0=time.time()
-rows = db.query(parent = ("dir", dir["id"]))
-print "* Query by parent took %.03f seconds" % (time.time()-t0)
-
-t0=time.time()
-files = db.list_query_results_names(rows)
-print "* Simple sorted file list took %.03f seconds, %d rows" %
(time.time()-t0, len(files))
+rows = db.query_raw(parent = ("dir", dir["id"]))
+print "* Query (raw) by parent took %.03f seconds" % (time.time()-t0)
t0=time.time()
rows = db.normalize_query_results(rows)
@@ -85,7 +81,7 @@
print "* Modify type took %.03f seconds" % (time.time()-t0)
t0=time.time()
-db.query(parent = ("dir", dir["id"]), name="foobar2499.jpg")
+db.query_raw(parent = ("dir", dir["id"]), name="foobar2499.jpg")
print "* Query for single filename took %.05f seconds" % (time.time()-t0)
t0=time.time()
Modified: trunk/vfs/test/testdb2.py
==============================================================================
--- trunk/vfs/test/testdb2.py (original)
+++ trunk/vfs/test/testdb2.py Tue Oct 25 19:27:16 2005
@@ -7,6 +7,9 @@
#AUDIO_PATH = "/data/mp3/Enya - Watermark"
db = Database("testdb2.sqlite")
+db.register_object_type_attrs("dir",
+ name = (str, ATTR_KEYWORDS | ATTR_KEYWORDS_FILENAME | ATTR_INDEXED)
+)
db.register_object_type_attrs("audio",
name = (str, ATTR_KEYWORDS | ATTR_KEYWORDS_FILENAME | ATTR_INDEXED),
title = (unicode, ATTR_KEYWORDS),
@@ -49,7 +52,7 @@
samplerate=md.get("samplerate"), length=md.get("length"),
bitrate=md.get("bitrate"), trackno=md.get("trackno"))
-dir = db.query_normalized(type="dir", name=AUDIO_PATH)
+dir = db.query(type="dir", name=AUDIO_PATH)
if not dir:
t0 = time.time()
index(AUDIO_PATH)
@@ -57,8 +60,8 @@
print "Indexed %d files in %.02f seconds." % (count[0], time.time()-t0)
t0=time.time()
-artists = db.query(attrs=["artist"], type="audio", distinct = True)
-albums = db.query(attrs=["album"], type="audio", distinct = True)
+artists = db.query_raw(attrs=["artist"], type="audio", distinct = True)
+albums = db.query_raw(attrs=["album"], type="audio", distinct = True)
print "There are %d artists and %d albums in database (query took %.02f
seconds)" % \
(len(artists[1]), len(albums[1]), time.time()-t0)
print "Type some query words, CTRL-C quits:"
@@ -79,7 +82,7 @@
kwargs["keywords"] += " " + term
t0=time.time()
- rows = db.query_normalized(**kwargs)
+ rows = db.query(**kwargs)
print "* Keyword query took %.03f seconds, %d rows" % (time.time()-t0,
len(rows))
for row in rows:
if row["type"] == "audio":
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
