Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[New] Implemented locking for Strolch elements 

Also cleaned up hierarchy of StrolchTransaction by moving up everything
into AbstractTransaction as made sense and added special delegation
methods for the actual commit() and rollback() ind the concrete
implementations.
This commit is contained in:
Robert von Burg 2014-02-24 21:48:59 +01:00
parent a7a4d4f5dd
commit 902a153043
3 changed files with 7 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/strolch/persistence/postgresql/PostgreSqlPersistenceHandler.java
View File

@ -28,7 +28,7 @@ import java.util.Set;
import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.StrolchComponent;
import li.strolch.agent.impl.StrolchRealm;
import li.strolch.agent.api.StrolchRealm;
import li.strolch.persistence.api.DbConnectionInfo;
import li.strolch.persistence.api.OrderDao;
import li.strolch.persistence.api.PersistenceHandler;

156
src/main/java/li/strolch/persistence/postgresql/PostgreSqlStrolchTransaction.java
View File

@ -16,128 +16,40 @@
package li.strolch.persistence.postgresql;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Date;
import java.util.Set;
import li.strolch.agent.impl.StrolchRealm;
import li.strolch.model.StrolchElement;
import li.strolch.agent.api.StrolchRealm;
import li.strolch.persistence.api.AbstractTransaction;
import li.strolch.persistence.api.ModificationResult;
import li.strolch.persistence.api.OrderDao;
import li.strolch.persistence.api.PersistenceHandler;
import li.strolch.persistence.api.ResourceDao;
import li.strolch.persistence.api.StrolchPersistenceException;
import li.strolch.persistence.api.TransactionCloseStrategy;
import li.strolch.persistence.api.TransactionResult;
import li.strolch.persistence.api.TransactionState;
import li.strolch.runtime.observer.ObserverHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ch.eitchnet.utils.helper.StringHelper;
public class PostgreSqlStrolchTransaction extends AbstractTransaction {
private static final Logger logger = LoggerFactory.getLogger(PostgreSqlStrolchTransaction.class);
private PostgreSqlPersistenceHandler persistenceHandler;
private TransactionCloseStrategy closeStrategy;
private ObserverHandler observerHandler;
private boolean suppressUpdates;
private PostgresqlDao<?> orderDao;
private PostgresqlDao<?> resourceDao;
private Connection connection;
private long startTime;
private Date startTimeDate;
private TransactionResult txResult;
private boolean open;
public PostgreSqlStrolchTransaction(StrolchRealm realm, PostgreSqlPersistenceHandler persistenceHandler) {
super(realm);
this.startTime = System.nanoTime();
this.startTimeDate = new Date();
this.persistenceHandler = persistenceHandler;
this.suppressUpdates = false;
this.closeStrategy = TransactionCloseStrategy.COMMIT;
}
/**
* @param observerHandler
* the observerHandler to set
*/
public void setObserverHandler(ObserverHandler observerHandler) {
this.observerHandler = observerHandler;
}
/**
* @param suppressUpdates
* the suppressUpdates to set
*/
public void setSuppressUpdates(boolean suppressUpdates) {
this.suppressUpdates = suppressUpdates;
}
/**
* @return the suppressUpdates
*/
public boolean isSuppressUpdates() {
return this.suppressUpdates;
}
@Override
public void setCloseStrategy(TransactionCloseStrategy closeStrategy) {
this.closeStrategy = closeStrategy;
}
@Override
public void autoCloseableCommit() {
if (logger.isDebugEnabled()) {
logger.info("Committing TX for realm " + getRealmName() + "..."); //$NON-NLS-1$
}
long start = System.nanoTime();
this.txResult = new TransactionResult();
protected void commit(TransactionResult txResult) throws Exception {
try {
if (this.orderDao != null)
this.orderDao.commit(this.txResult);
this.orderDao.commit(txResult);
if (this.resourceDao != null)
this.resourceDao.commit(this.txResult);
this.resourceDao.commit(txResult);
if (this.connection != null)
this.connection.commit();
this.txResult.setState(TransactionState.COMMITTED);
} catch (Exception e) {
if (this.connection != null) {
try {
this.connection.rollback();
} catch (SQLException e1) {
logger.error("Failed to rollback transation due to " + e.getMessage(), e); //$NON-NLS-1$
}
}
this.txResult.setState(TransactionState.FAILED);
long end = System.nanoTime();
long txDuration = end - this.startTime;
long closeDuration = end - start;
StringBuilder sb = new StringBuilder();
sb.append("TX for realm ");
sb.append(getRealmName());
sb.append(" has failed after "); //$NON-NLS-1$
sb.append(StringHelper.formatNanoDuration(txDuration));
sb.append(" with close operation taking "); //$NON-NLS-1$
sb.append(StringHelper.formatNanoDuration(closeDuration));
logger.info(sb.toString());
throw new StrolchPersistenceException(
"Strolch Transaction for realm " + getRealmName() + " failed due to " + e.getMessage(), e); //$NON-NLS-1$
} finally {
if (this.connection != null) {
try {
@ -147,47 +59,13 @@ public class PostgreSqlStrolchTransaction extends AbstractTransaction {
}
}
}
long end = System.nanoTime();
long txDuration = end - this.startTime;
long closeDuration = end - start;
this.txResult.setStartTime(this.startTimeDate);
this.txResult.setTxDuration(txDuration);
this.txResult.setCloseDuration(closeDuration);
this.txResult.setRealm(getRealm().getRealm());
StringBuilder sb = new StringBuilder();
sb.append("TX for realm ");
sb.append(getRealmName());
sb.append(" was completed after "); //$NON-NLS-1$
sb.append(StringHelper.formatNanoDuration(txDuration));
sb.append(" with close operation taking "); //$NON-NLS-1$
sb.append(StringHelper.formatNanoDuration(closeDuration));
logger.info(sb.toString());
if (!this.suppressUpdates && this.observerHandler != null) {
Set<String> keys = this.txResult.getKeys();
for (String key : keys) {
ModificationResult modificationResult = this.txResult.getModificationResult(key);
this.observerHandler.add(key, modificationResult.<StrolchElement> getCreated());
this.observerHandler.update(key, modificationResult.<StrolchElement> getUpdated());
this.observerHandler.remove(key, modificationResult.<StrolchElement> getDeleted());
}
}
}
@Override
public void autoCloseableRollback() {
long start = System.nanoTime();
protected void rollback(TransactionResult txResult) throws Exception {
if (this.connection != null) {
try {
this.connection.rollback();
} catch (SQLException e) {
throw new StrolchPersistenceException("Strolch Transaction failed due to " + e.getMessage(), e); //$NON-NLS-1$
} finally {
try {
this.connection.close();
@ -196,27 +74,6 @@ public class PostgreSqlStrolchTransaction extends AbstractTransaction {
}
}
}
long end = System.nanoTime();
long txDuration = end - this.startTime;
long closeDuration = end - start;
this.txResult = new TransactionResult();
this.txResult.setState(TransactionState.ROLLED_BACK);
this.txResult.setStartTime(this.startTimeDate);
this.txResult.setTxDuration(txDuration);
this.txResult.setCloseDuration(closeDuration);
this.txResult.setRealm(getRealm().getRealm());
}
@Override
public void close() throws StrolchPersistenceException {
this.closeStrategy.close(this);
}
@Override
public boolean isOpen() {
return this.open;
}
OrderDao getOrderDao() {
@ -231,9 +88,6 @@ public class PostgreSqlStrolchTransaction extends AbstractTransaction {
return (ResourceDao) this.resourceDao;
}
/**
* @return
*/
Connection getConnection() {
if (this.connection == null) {
this.connection = this.persistenceHandler.getConnection(getRealm().getRealm());

2
src/test/java/li/strolch/persistence/postgresql/dao/test/RealmTest.java
View File

@ -22,8 +22,8 @@ import static org.junit.Assert.assertNull;
import java.io.File;
import java.sql.SQLException;
import li.strolch.agent.api.StrolchRealm;
import li.strolch.agent.impl.DataStoreMode;
import li.strolch.agent.impl.StrolchRealm;
import li.strolch.model.ModelGenerator;
import li.strolch.model.Resource;
import li.strolch.persistence.api.StrolchTransaction;