From 5ae5219f8a466531594fdf0b110ee721fb8fbe92 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Wed, 18 Jan 2006 21:00:02 +0000 Subject: [PATCH] * src/GrampsDb/_GrampsBSDDB.py (rebuild_secondary): Proper rebuild; convert surnames secondary index to DUPSORTed BTREE. svn: r5789 --- ChangeLog | 3 ++- src/GrampsDb/_GrampsBSDDB.py | 23 ++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4c8e5a08..9e560a701 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,8 @@ * src/GrampsDb/_GrampsBSDDB.py (load): Use BTREE for reference_map; sort reference_map_referenced_map index. * src/GrampsDb/_ReadGedcom.py (parse_record): Restore add def_src. - * src/GrampsDb/_GrampsBSDDB.py (rebuild_secondary): Proper rebuild. + * src/GrampsDb/_GrampsBSDDB.py (rebuild_secondary): Proper + rebuild; convert surnames secondary index to DUPSORTed BTREE. 2006-01-17 Don Allingham * src/DbPrompter.py: removed diff --git a/src/GrampsDb/_GrampsBSDDB.py b/src/GrampsDb/_GrampsBSDDB.py index 8ed1aed33..a483afe2e 100644 --- a/src/GrampsDb/_GrampsBSDDB.py +++ b/src/GrampsDb/_GrampsBSDDB.py @@ -122,15 +122,15 @@ class GrampsBSDDB(GrampsDbBase): GrampsDbBase.__init__(self) self.txn = None - def open_table(self,name,dbname,no_txn=False): + def open_table(self,name,dbname,no_txn=False,dbtype=db.DB_HASH): dbmap = dbshelve.DBShelf(self.env) dbmap.db.set_pagesize(16384) if self.readonly: - dbmap.open(name, dbname, db.DB_HASH, db.DB_RDONLY) + dbmap.open(name, dbname, dbtype, db.DB_RDONLY) elif no_txn: - dbmap.open(name, dbname, db.DB_HASH, db.DB_CREATE, 0666) + dbmap.open(name, dbname, dbtype, db.DB_CREATE, 0666) else: - dbmap.open(name, dbname, db.DB_HASH, + dbmap.open(name, dbname, dbtype, db.DB_CREATE|db.DB_AUTO_COMMIT, 0666) return dbmap @@ -282,11 +282,8 @@ class GrampsBSDDB(GrampsDbBase): self.metadata = self.open_table(self.full_name, "meta") self.person_map = self.open_table(self.full_name, "person") self.repository_map = self.open_table(self.full_name, "repository") - self.reference_map = dbshelve.DBShelf(self.env) - self.reference_map.db.set_pagesize(16384) - self.reference_map.open(self.full_name, 'reference_map', db.DB_BTREE, - db.DB_CREATE|db.DB_AUTO_COMMIT, 0666) - + self.reference_map = self.open_table(self.full_name, "reference_map", + dbtype=db.DB_BTREE) callback(37) # index tables used just for speeding up searches @@ -296,9 +293,9 @@ class GrampsBSDDB(GrampsDbBase): table_flags = db.DB_CREATE|db.DB_AUTO_COMMIT self.surnames = db.DB(self.env) - self.surnames.set_flags(db.DB_DUP) + self.surnames.set_flags(db.DB_DUP|db.DB_DUPSORT) self.surnames.open(self.full_name, "surnames", - db.DB_HASH, flags=table_flags) + db.DB_BTREE, flags=table_flags) self.name_group = db.DB(self.env) self.name_group.set_flags(db.DB_DUP) @@ -428,8 +425,8 @@ class GrampsBSDDB(GrampsDbBase): junk = db.DB(self.env) junk.remove(self.full_name,"surnames") self.surnames = db.DB(self.env) - self.surnames.set_flags(db.DB_DUP) - self.surnames.open(self.full_name, "surnames", db.DB_HASH, + self.surnames.set_flags(db.DB_DUP|db.DB_DUPSORT) + self.surnames.open(self.full_name, "surnames", db.DB_BTREE, flags=table_flags) self.person_map.associate(self.surnames, find_surname, table_flags)