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

Patch for recent Layered lookup changes.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

89
source/java/org/alfresco/repo/admin/patch/impl/AVMLayeredSnapshotPatch.java Normal file
View File

@@ -0,0 +1,89 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing
*/
package org.alfresco.repo.admin.patch.impl;
import java.util.List;
import org.alfresco.i18n.I18NUtil;
import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.avm.AVMNodeDAO;
import org.alfresco.repo.avm.LayeredDirectoryNode;
import org.alfresco.repo.avm.LayeredFileNode;
/**
* Patch for changes to Layered Node path traversal.
* @author britt
*/
public class AVMLayeredSnapshotPatch extends AbstractPatch
{
private AVMNodeDAO fAVMNodeDAO;
private static final String MSG_SUCCESS = "patch.AVMLayeredSnapshotPatch.result";
public AVMLayeredSnapshotPatch()
{
}
public void setAvmNodeDAO(AVMNodeDAO dao)
{
fAVMNodeDAO = dao;
}
/* (non-Javadoc)
* @see org.alfresco.repo.admin.patch.AbstractPatch#applyInternal()
*/
@Override
protected String applyInternal() throws Exception
{
while (true)
{
List<LayeredDirectoryNode> batch = fAVMNodeDAO.getNullVersionLayeredDirectories(200);
for (LayeredDirectoryNode node : batch)
{
node.setIndirectionVersion(-1);
}
if (batch.size() == 0)
{
break;
}
fAVMNodeDAO.flush();
}
while (true)
{
List<LayeredFileNode> batch = fAVMNodeDAO.getNullVersionLayeredFiles(200);
for (LayeredFileNode node : batch)
{
node.setIndirectionVersion(-1);
}
if (batch.size() == 0)
{
break;
}
fAVMNodeDAO.flush();
}
return I18NUtil.getMessage(MSG_SUCCESS);
}
}

14
source/java/org/alfresco/repo/avm/AVMNodeDAO.java
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);
}

2
source/java/org/alfresco/repo/avm/Layered.java
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);
}

8
source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java
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.

13
source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java
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;
}

10
source/java/org/alfresco/repo/avm/LayeredFileNode.java
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.

13
source/java/org/alfresco/repo/avm/LayeredFileNodeImpl.java
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)

26
source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
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();
}
}