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/IndexI.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/IndexI.cpp')
| -rw-r--r-- | cpp/src/Freeze/IndexI.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/Freeze/IndexI.cpp b/cpp/src/Freeze/IndexI.cpp index 808a1ca3fde..7fb7c3c728f 100644 --- a/cpp/src/Freeze/IndexI.cpp +++ b/cpp/src/Freeze/IndexI.cpp @@ -15,6 +15,7 @@ #include <Freeze/IndexI.h> #include <Freeze/Util.h> #include <Freeze/ObjectStore.h> +#include <Freeze/EvictorI.h> using namespace Freeze; using namespace Ice; @@ -128,7 +129,7 @@ Freeze::IndexI::untypedFindFirst(const Key& bytes, Int firstN) const { Warning out(_store->communicator()->getLogger()); out << "Deadlock in Freeze::IndexI::untypedFindFirst while searching \"" - << _filename << "\"; retrying ..."; + << _store->evictor()->filename() + "/" + _dbName << "\"; retrying ..."; } // @@ -229,7 +230,7 @@ Freeze::IndexI::untypedCount(const Key& bytes) const { Warning out(_store->communicator()->getLogger()); out << "Deadlock in Freeze::IndexI::untypedCount while searching \"" - << _filename << "\"; retrying ..."; + << _store->evictor()->filename() + "/" + _dbName << "\"; retrying ..."; } // @@ -283,9 +284,9 @@ Freeze::IndexI::associate(ObjectStore* store, DbTxn* txn, flags = DB_CREATE; } - _filename = store->filename() + "." + _index.name(); + _dbName = EvictorI::indexPrefix + store->dbName() + "." + _index.name(); - _db->open(txn, _filename.c_str(), 0, DB_BTREE, flags, FREEZE_DB_MODE); + _db->open(txn, store->evictor()->filename().c_str(), _dbName.c_str(), DB_BTREE, flags, FREEZE_DB_MODE); flags = 0; if(populateIndex) |