inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.9 to HEAD

Browse Source 
9241: Merged V2.2 to V2.9
      9119: Merged V2.1 to V2.2
         8671: Fix for AR-2221 - JavaScript scriptable Map objects recursively converted to Freemarker accessable maps
   9256: Merged V2.2 to V2.9 
      9100: Merged V2.1 to V2.2 
         8728 <Not required>: Latest AMP changes for AR-2212 
         8731: Faster content store cleaner 
         8738: Fix for AWC 1930 - support simple bind when building DNs that contain a comma 
         8835: Fix regression issue as discussed in ACT 2019 
         8861: Fix WCM-1158 
         8866: Fixed AR-2272: Module Management Tool distribution is broken 
         8872: Fixed distribution of benchmark executable jar after EHCache upgrade 
         8933: Fix for ACT-2469


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-05-23 21:41:53 +00:00
parent bb3c776130
commit db95d287ee
12 changed files with 515 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/java/org/alfresco/repo/domain/hibernate/HibernateContentUrlDAOImpl.java
View File

@@ -4,9 +4,10 @@ import java.util.Set;
import org.alfresco.repo.domain.ContentUrl;
import org.alfresco.repo.domain.ContentUrlDAO;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.CacheMode;
import org.hibernate.FlushMode;
import org.hibernate.Query;
import org.hibernate.ScrollMode;
import org.hibernate.ScrollableResults;
@@ -28,10 +29,29 @@ public class HibernateContentUrlDAOImpl extends HibernateDaoSupport implements C
private static final String UPDATE_DELETE_IN_LIST = "contentUrl.DeleteInList";
private static final String UPDATE_DELETE_ALL = "contentUrl.DeleteAll";
/** Txn resource key to check for required flushes */
private static final String KEY_REQUIRES_FLUSH = "HibernateContentUrlDAOImpl.requiresFlush";
private static Log logger = LogFactory.getLog(HibernateContentUrlDAOImpl.class);
private void flushIfRequired()
{
Boolean requiresFlush = (Boolean) AlfrescoTransactionSupport.getResource(KEY_REQUIRES_FLUSH);
if (requiresFlush == null)
{
requiresFlush = Boolean.FALSE;
AlfrescoTransactionSupport.bindResource(KEY_REQUIRES_FLUSH, Boolean.FALSE);
}
else if (requiresFlush.booleanValue() == true)
{
getSession().flush();
AlfrescoTransactionSupport.bindResource(KEY_REQUIRES_FLUSH, Boolean.FALSE);
}
}
public ContentUrl createContentUrl(String contentUrl)
{
AlfrescoTransactionSupport.bindResource(KEY_REQUIRES_FLUSH, Boolean.TRUE);
ContentUrl entity = new ContentUrlImpl();
entity.setContentUrl(contentUrl);
getSession().save(entity);
@@ -40,13 +60,16 @@ public class HibernateContentUrlDAOImpl extends HibernateDaoSupport implements C
public void getAllContentUrls(final ContentUrlHandler handler)
{
// Force a flush if there are pending changes
flushIfRequired();
HibernateCallback callback = new HibernateCallback()
{
public Object doInHibernate(Session session)
{
Query query = session
.getNamedQuery(HibernateContentUrlDAOImpl.QUERY_GET_ALL)
.setCacheMode(CacheMode.IGNORE);
;
return query.scroll(ScrollMode.FORWARD_ONLY);
}
};
@@ -60,20 +83,21 @@ public class HibernateContentUrlDAOImpl extends HibernateDaoSupport implements C
public void deleteContentUrl(final String contentUrl)
{
// Force a flush if there are pending changes
flushIfRequired();
HibernateCallback callback = new HibernateCallback()
{
public Object doInHibernate(Session session)
{
session.flush();
Query query = session
.getNamedQuery(HibernateContentUrlDAOImpl.UPDATE_DELETE_BY_URL)
.setCacheMode(CacheMode.IGNORE)
.setFlushMode(FlushMode.MANUAL)
.setString("contentUrl", contentUrl);
return (Integer) query.executeUpdate();
}
};
Integer deletedCount = (Integer) getHibernateTemplate().execute(callback);
int entityCount = getSession().getStatistics().getEntityCount();
if (logger.isDebugEnabled())
{
logger.debug("Deleted " + deletedCount + " ContentUrl entities.");
@@ -82,14 +106,16 @@ public class HibernateContentUrlDAOImpl extends HibernateDaoSupport implements C
public void deleteContentUrls(final Set<String> contentUrls)
{
// Force a flush if there are pending changes
flushIfRequired();
HibernateCallback callback = new HibernateCallback()
{
public Object doInHibernate(Session session)
{
session.flush();
Query query = session
.getNamedQuery(HibernateContentUrlDAOImpl.UPDATE_DELETE_IN_LIST)
.setCacheMode(CacheMode.IGNORE)
.setFlushMode(FlushMode.MANUAL)
.setParameterList("contentUrls", contentUrls, TypeFactory.basic("string"));
return (Integer) query.executeUpdate();
}
@@ -103,6 +129,9 @@ public class HibernateContentUrlDAOImpl extends HibernateDaoSupport implements C
public void deleteAllContentUrls()
{
// Force a flush if there are pending changes
flushIfRequired();
HibernateCallback callback = new HibernateCallback()
{
public Object doInHibernate(Session session)
@@ -110,7 +139,8 @@ public class HibernateContentUrlDAOImpl extends HibernateDaoSupport implements C
session.flush();
Query query = session
.getNamedQuery(HibernateContentUrlDAOImpl.UPDATE_DELETE_ALL)
.setCacheMode(CacheMode.IGNORE);
.setFlushMode(FlushMode.MANUAL)
;
return (Integer) query.executeUpdate();
}
};

2
source/java/org/alfresco/repo/domain/hibernate/SessionSizeResourceManager.java
View File

@@ -175,7 +175,7 @@ public class SessionSizeResourceManager extends HibernateDaoSupport implements M
{
if (logger.isDebugEnabled())
{
logger.error(stats);
logger.debug(stats);
}
Set<EntityKey> keys = new HashSet<EntityKey>((Set<EntityKey>)stats.getEntityKeys());
for (EntityKey key : keys)