Some bsddb changes
* allow to use bsddb3 as database via a config setting * set async write to disk to improve speed, eg import * 40 svn: r16446
This commit is contained in:
@@ -36,7 +36,12 @@ import tempfile
|
||||
from gen.ggettext import gettext as _
|
||||
import cPickle as pickle
|
||||
import time
|
||||
from bsddb import dbshelve, db
|
||||
|
||||
import config
|
||||
if config.get('preferences.use-bsddb3'):
|
||||
from bsddb3 import dbshelve, db
|
||||
else:
|
||||
from bsddb import dbshelve, db
|
||||
import logging
|
||||
LOG = logging.getLogger(".Db")
|
||||
|
||||
|
||||
@@ -86,6 +86,8 @@ EVENT_PERSON_STR = _("%(event_name)s of %(person)s")
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
def importData(database, filename, callback=None, cl=0):
|
||||
## return Utils.profile(importDataPro, database, filename, callback, cl)
|
||||
##def importDataPro(database, filename, callback=None, cl=0):
|
||||
|
||||
if DbMixin not in database.__class__.__bases__:
|
||||
database.__class__.__bases__ = (DbMixin,) + \
|
||||
|
||||
@@ -36,7 +36,11 @@ import random
|
||||
import locale
|
||||
import os
|
||||
from sys import maxint
|
||||
from bsddb import db
|
||||
import config
|
||||
if config.get('preferences.use-bsddb3'):
|
||||
from bsddb3 import db
|
||||
else:
|
||||
from bsddb import db
|
||||
from gen.ggettext import gettext as _
|
||||
|
||||
import logging
|
||||
|
||||
@@ -32,7 +32,11 @@ Show uncollected objects in a window.
|
||||
#
|
||||
#------------------------------------------------------------------------
|
||||
from gen.ggettext import gettext as _
|
||||
from bsddb.db import DBError
|
||||
import config
|
||||
if config.get('preferences.use-bsddb3'):
|
||||
from bsddb3.db import DBError
|
||||
else:
|
||||
from bsddb.db import DBError
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user