diff options
| author | Mark Spruiell <mes@zeroc.com> | 2003-11-20 18:03:33 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2003-11-20 18:03:33 +0000 |
| commit | 2001714254f1679997bbd66871ee47647a90701e (patch) | |
| tree | 21d31afc679d9674be781140d2acde936c430747 /cpp/src/Transform/Transformer.cpp | |
| parent | open old database with transaction (diff) | |
| download | ice-2001714254f1679997bbd66871ee47647a90701e.tar.bz2 ice-2001714254f1679997bbd66871ee47647a90701e.tar.xz ice-2001714254f1679997bbd66871ee47647a90701e.zip | |
transform to new database environment
Diffstat (limited to 'cpp/src/Transform/Transformer.cpp')
| -rw-r--r-- | cpp/src/Transform/Transformer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Transform/Transformer.cpp b/cpp/src/Transform/Transformer.cpp index c514193f6e1..037afb87e05 100644 --- a/cpp/src/Transform/Transformer.cpp +++ b/cpp/src/Transform/Transformer.cpp @@ -346,7 +346,7 @@ public: virtual Slice::UnitPtr newUnit() const; virtual ErrorReporterPtr errorReporter() const; - void transform(const Ice::CommunicatorPtr&, Db*, Db*, DbTxn*, bool); + void transform(const Ice::CommunicatorPtr&, Db*, DbTxn*, Db*, DbTxn*, bool); private: @@ -1699,8 +1699,8 @@ Transform::TransformerDescriptor::errorReporter() const } void -Transform::TransformerDescriptor::transform(const Ice::CommunicatorPtr& communicator, Db* db, Db* dbNew, - DbTxn* txn, bool purgeObjects) +Transform::TransformerDescriptor::transform(const Ice::CommunicatorPtr& communicator, Db* db, DbTxn* txn, Db* dbNew, + DbTxn* txnNew, bool purgeObjects) { Dbc* dbc = 0; @@ -1734,7 +1734,7 @@ Transform::TransformerDescriptor::transform(const Ice::CommunicatorPtr& communic { outValue.endWriteEncaps(); Dbt dbNewKey(&outKey.b[0], outKey.b.size()), dbNewValue(&outValue.b[0], outValue.b.size()); - if(dbNew->put(0, &dbNewKey, &dbNewValue, DB_NOOVERWRITE) == DB_KEYEXIST) + if(dbNew->put(txnNew, &dbNewKey, &dbNewValue, DB_NOOVERWRITE) == DB_KEYEXIST) { errorReporter()->error("duplicate key encountered"); } @@ -2300,7 +2300,7 @@ Transform::Transformer::analyze(ostream& descriptors, Ice::StringSeq& missingTyp } void -Transform::Transformer::transform(istream& is, Db* db, Db* dbNew, DbTxn* txn, ostream& errors) +Transform::Transformer::transform(istream& is, Db* db, DbTxn* txn, Db* dbNew, DbTxn* txnNew, ostream& errors) { ErrorReporterPtr errorReporter = new ErrorReporter(errors); @@ -2312,7 +2312,7 @@ Transform::Transformer::transform(istream& is, Db* db, Db* dbNew, DbTxn* txn, os TransformerDescriptorPtr descriptor = dh.descriptor(); descriptor->validate(); - descriptor->transform(_communicator, db, dbNew, txn, _purgeObjects); + descriptor->transform(_communicator, db, txn, dbNew, txnNew, _purgeObjects); } catch(const IceXML::ParserException& ex) { |