Patch for recent Layered lookup changes.

Miscellaneous cleanups noticed on the way.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2007-05-01 17:23:17 +00:00
parent f91cedfd69
commit 656f297ebb
10 changed files with 166 additions and 22 deletions

View File

@@ -105,4 +105,18 @@ public interface AVMNodeDAO
* @return An iterator over all nodes.
*/
List<AVMNode> getEmptyGUIDS(int count);
/**
* Get a batch of LayeredDirectories which have null indirectionVersions.
* @param count
* @return
*/
List<LayeredDirectoryNode> getNullVersionLayeredDirectories(int count);
/**
* Get a batch of LayeredFiles which have null indirectionVersions.
* @param count
* @return
*/
List<LayeredFileNode> getNullVersionLayeredFiles(int count);
}

View File

@@ -36,5 +36,5 @@ interface Layered
* Set the indirection version for this layered node.
* @param version The indirection version to set.
*/
public void setIndirectionVersion(int version);
public void setIndirectionVersion(Integer version);
}

View File

@@ -71,17 +71,11 @@ public interface LayeredDirectoryNode extends DirectoryNode, Layered
*/
public void setIndirection(String indirection);
/**
* Set the indirection version.
* @param version The version to set.
*/
public void setIndirectionVersion(int version);
/**
* Get the indirection version.
* @return The indirection version.
*/
public int getIndirectionVersion();
public Integer getIndirectionVersion();
/**
* Set the opacity of this.

View File

@@ -937,16 +937,23 @@ class LayeredDirectoryNodeImpl extends DirectoryNodeImpl implements LayeredDirec
/* (non-Javadoc)
* @see org.alfresco.repo.avm.LayeredDirectoryNode#setIndirectionVersion(int)
*/
public void setIndirectionVersion(int version)
public void setIndirectionVersion(Integer version)
{
fIndirectionVersion = version;
if (version == null)
{
fIndirectionVersion = -1;
}
else
{
fIndirectionVersion = version;
}
}
/**
* Get the indirection version.
* @return The indirection version.
*/
public int getIndirectionVersion()
public Integer getIndirectionVersion()
{
return fIndirectionVersion;
}

View File

@@ -26,19 +26,13 @@ package org.alfresco.repo.avm;
* Interface for a layered file node.
* @author britt
*/
interface LayeredFileNode extends FileNode, Layered
public interface LayeredFileNode extends FileNode, Layered
{
/**
* Set the indirection version.
* @param version The version to set.
*/
public void setIndirectionVersion(int version);
/**
* Get the indirection version.
* @return The indirection version.
*/
public int getIndirectionVersion();
public Integer getIndirectionVersion();
/**
* Make a copy of this node that is a LayeredFileNode.

View File

@@ -308,7 +308,7 @@ class LayeredFileNodeImpl extends FileNodeImpl implements LayeredFileNode
/* (non-Javadoc)
* @see org.alfresco.repo.avm.LayeredFileNode#getIndirectionVersion()
*/
public int getIndirectionVersion()
public Integer getIndirectionVersion()
{
return fIndirectionVersion;
}
@@ -316,9 +316,16 @@ class LayeredFileNodeImpl extends FileNodeImpl implements LayeredFileNode
/* (non-Javadoc)
* @see org.alfresco.repo.avm.LayeredFileNode#setIndirectionVersion(int)
*/
public void setIndirectionVersion(int version)
public void setIndirectionVersion(Integer version)
{
fIndirectionVersion = version;
if (version == null)
{
fIndirectionVersion = -1;
}
else
{
fIndirectionVersion = version;
}
}
/* (non-Javadoc)

View File

@@ -31,6 +31,8 @@ import org.alfresco.repo.avm.AVMNodeImpl;
import org.alfresco.repo.avm.AVMNodeUnwrapper;
import org.alfresco.repo.avm.AVMStore;
import org.alfresco.repo.avm.DirectoryNode;
import org.alfresco.repo.avm.LayeredDirectoryNode;
import org.alfresco.repo.avm.LayeredFileNode;
import org.hibernate.Query;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -183,4 +185,28 @@ class AVMNodeDAOHibernate extends HibernateDaoSupport implements
query.setMaxResults(count);
return (List<AVMNode>)query.list();
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMNodeDAO#getNullVersionLayeredDirectories(int)
*/
@SuppressWarnings("unchecked")
public List<LayeredDirectoryNode> getNullVersionLayeredDirectories(int count)
{
Query query = getSession().createQuery("from LayeredDirectoryNodeImpl ldn " +
"where ldn.indirectionVersion is null");
query.setMaxResults(count);
return (List<LayeredDirectoryNode>)query.list();
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMNodeDAO#getNullVersionLayeredFiles(int)
*/
@SuppressWarnings("unchecked")
public List<LayeredFileNode> getNullVersionLayeredFiles(int count)
{
Query query = getSession().createQuery("from LayeredFileNodeImpl lfn " +
"where lfn.indirectionVersion is null");
query.setMaxResults(count);
return (List<LayeredFileNode>)query.list();
}
}