diff options
| author | Bernard Normier <bernard@zeroc.com> | 2004-04-12 15:54:40 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2004-04-12 15:54:40 +0000 |
| commit | 8265872f9d1a761b5d7f91fd102087b84eb65b73 (patch) | |
| tree | 76e2c1a0b3cc9b0f7d131197aad27a4da0d2bf51 /cpp/src/Freeze/ObjectStore.cpp | |
| parent | minor fixes (diff) | |
| download | ice-8265872f9d1a761b5d7f91fd102087b84eb65b73.tar.bz2 ice-8265872f9d1a761b5d7f91fd102087b84eb65b73.tar.xz ice-8265872f9d1a761b5d7f91fd102087b84eb65b73.zip | |
Switched to a single database file with multiple databases
Diffstat (limited to 'cpp/src/Freeze/ObjectStore.cpp')
| -rw-r--r-- | cpp/src/Freeze/ObjectStore.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Freeze/ObjectStore.cpp b/cpp/src/Freeze/ObjectStore.cpp index a1b5d4105de..04823ef4fe8 100644 --- a/cpp/src/Freeze/ObjectStore.cpp +++ b/cpp/src/Freeze/ObjectStore.cpp @@ -22,7 +22,7 @@ using namespace Ice; using namespace Freeze; -Freeze::ObjectStore::ObjectStore(const string& dbName, const string& facet, +Freeze::ObjectStore::ObjectStore(const string& facet, bool createDb, EvictorI* evictor, const vector<IndexPtr>& indices, bool populateEmptyIndices) : @@ -33,11 +33,11 @@ Freeze::ObjectStore::ObjectStore(const string& dbName, const string& facet, { if(facet == "") { - _filename = dbName; + _dbName = EvictorI::defaultDb; } else { - _filename = dbName + "-" + facet; + _dbName = facet; } DbTxn* txn = 0; @@ -54,7 +54,7 @@ Freeze::ObjectStore::ObjectStore(const string& dbName, const string& facet, { flags |= DB_CREATE; } - _db->open(txn, _filename.c_str(), 0, DB_BTREE, flags, FREEZE_DB_MODE); + _db->open(txn, evictor->filename().c_str(), _dbName.c_str(), DB_BTREE, flags, FREEZE_DB_MODE); for(size_t i = 0; i < _indices.size(); ++i) { @@ -152,7 +152,7 @@ Freeze::ObjectStore::dbHasObject(const Identity& ident) const { Warning out(_communicator->getLogger()); out << "Deadlock in Freeze::ObjectStore::dbHasObject while searching \"" - << _filename << "\"; retrying ..."; + << _evictor->filename() + "/" + _dbName << "\"; retrying ..."; } // @@ -255,9 +255,9 @@ Freeze::ObjectStore::unmarshal(ObjectRecord& v, const Value& bytes, const Commun } const string& -Freeze::ObjectStore::filename() const +Freeze::ObjectStore::dbName() const { - return _filename; + return _dbName; } @@ -302,7 +302,7 @@ Freeze::ObjectStore::load(const Identity& ident) { Warning out(_communicator->getLogger()); out << "Deadlock in Freeze::ObjectStore::load while searching \"" - << _filename << "\"; retrying ..."; + << _evictor->filename() + "/" + _dbName << "\"; retrying ..."; } // // Ignored, try again |