Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-02-04 05:47:41 -0500
committerEike Stepper2016-02-04 05:47:41 -0500
commitba0af90a7adbc7e364b37f1489674f8f8e69389e (patch)
tree8f9f3f898c442cf6670f97339d5ab237b0c64d25
parent3ea9bbbaeaa292396b7bf295daff700b629dba8b (diff)
downloadcdo-committers/estepper/unit-manager.tar.gz
cdo-committers/estepper/unit-manager.tar.xz
cdo-committers/estepper/unit-manager.zip
486458: Provide support for optimized loading and notifying of object units committers/estepper/unit-manager
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=486458
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java4
2 files changed, 1 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
index 62b19a9641..90514b8911 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
@@ -896,13 +896,6 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
IMappingStrategy mappingStrategy = store.getMappingStrategy();
mappingStrategy.createMapping(connection, packageUnits, monitor.fork());
-
- int writePackageUnits; // TODO Extra commit needed for Mysql between DDL and DML.
- connection.commit();
- }
- catch (SQLException ex)
- {
- throw new DBException(ex);
}
finally
{
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
index c054b27bc6..1cdbe40908 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
@@ -77,10 +77,8 @@ public abstract class StoreAccessor extends StoreAccessorBase
{
monitor.begin(1 + newPackageUnits.length + 2 + newObjects.length + detachedObjects.length + dirtyCount + 1);
- int writePackageUnits; // TODO Extra commit needed for Mysql between DDL and DML.
- writePackageUnits(newPackageUnits, monitor.fork(newPackageUnits.length));
-
writeCommitInfo(branch, timeStamp, previousTimeStamp, userID, commitComment, monitor.fork());
+ writePackageUnits(newPackageUnits, monitor.fork(newPackageUnits.length));
IDGenerationLocation idGenerationLocation = store.getRepository().getIDGenerationLocation();
if (idGenerationLocation == IDGenerationLocation.STORE)

Back to the top