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

Refactor of the file state cache code. (Part 2 of 2).

Browse Source 
Removed the repo specific file state cache code.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19949 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2010-04-22 12:16:04 +00:00
parent ebc24ad0e0
commit c18a123228
22 changed files with 287 additions and 2310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/filesys/avm/AVMContext.java
View File

@@ -25,12 +25,12 @@ import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.filesys.alfresco.AlfrescoContext;
import org.alfresco.filesys.alfresco.AlfrescoDiskDriver;
import org.alfresco.filesys.alfresco.IOControlHandler;
import org.alfresco.filesys.state.FileState;
import org.alfresco.filesys.state.FileStateTable;
import org.alfresco.jlan.server.filesys.DiskInterface;
import org.alfresco.jlan.server.filesys.FileName;
import org.alfresco.jlan.server.filesys.FileSystem;
import org.alfresco.jlan.server.filesys.NotifyChange;
import org.alfresco.jlan.server.filesys.cache.FileState;
import org.alfresco.jlan.server.filesys.cache.FileStateCache;
import org.alfresco.jlan.util.StringList;
import org.alfresco.repo.avm.CreateStoreCallback;
import org.alfresco.repo.avm.CreateVersionCallback;
@@ -440,13 +440,13 @@ public class AVMContext extends AlfrescoContext
// Make sure the file state cache is enabled
FileStateTable fsTable = getStateTable();
FileStateCache fsTable = getStateCache();
if ( fsTable == null)
return;
// Find the file state for the root folder
FileState rootState = fsTable.findFileState( FileName.DOS_SEPERATOR_STR, true, true);
FileState rootState = fsTable.findFileState( FileName.DOS_SEPERATOR_STR, true);
if ( rootState != null)
{
@@ -481,7 +481,7 @@ public class AVMContext extends AlfrescoContext
// Make sure the file state cache is enabled
FileStateTable fsTable = getStateTable();
FileStateCache fsTable = getStateCache();
if ( fsTable == null)
return;
@@ -542,7 +542,7 @@ public class AVMContext extends AlfrescoContext
// Make sure the file state cache is enabled
FileStateTable fsTable = getStateTable();
FileStateCache fsTable = getStateCache();
if ( fsTable == null)
return;
@@ -612,7 +612,7 @@ public class AVMContext extends AlfrescoContext
// Make sure the file state cache is enabled
FileStateTable fsTable = getStateTable();
FileStateCache fsTable = getStateCache();
if ( fsTable == null)
return;

32
source/java/org/alfresco/filesys/avm/AVMDiskDriver.java
View File

@@ -29,7 +29,6 @@ import javax.transaction.UserTransaction;
import org.springframework.extensions.config.ConfigElement;
import org.alfresco.filesys.alfresco.AlfrescoDiskDriver;
import org.alfresco.filesys.state.FileState;
import org.alfresco.jlan.server.SrvSession;
import org.alfresco.jlan.server.auth.ClientInfo;
import org.alfresco.jlan.server.core.DeviceContext;
@@ -47,6 +46,7 @@ import org.alfresco.jlan.server.filesys.NetworkFile;
import org.alfresco.jlan.server.filesys.PathNotFoundException;
import org.alfresco.jlan.server.filesys.SearchContext;
import org.alfresco.jlan.server.filesys.TreeConnection;
import org.alfresco.jlan.server.filesys.cache.FileState;
import org.alfresco.jlan.server.filesys.pseudo.PseudoFile;
import org.alfresco.jlan.server.filesys.pseudo.PseudoFileList;
import org.alfresco.jlan.server.filesys.pseudo.PseudoFolderNetworkFile;
@@ -394,7 +394,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
// Enable file state caching
context.enableStateTable(true, getStateReaper());
context.enableStateCache( true);
}
}
@@ -452,7 +452,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
{
// Enable file state caching
context.enableStateTable(true, getStateReaper());
context.enableStateCache(true);
// Plug the virtualization view context into the various store/version call back listeners
// so that store/version pseudo folders can be kept in sync with AVM
@@ -584,7 +584,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
// Enable file state caching
context.enableStateTable(true, getStateReaper());
context.enableStateCache(true);
}
// Commit the transaction
@@ -2111,7 +2111,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
// Get the root folder file state
fstate = avmCtx.getStateTable().findFileState(FileName.DOS_SEPERATOR_STR);
fstate = avmCtx.getStateCache().findFileState(FileName.DOS_SEPERATOR_STR);
if (fstate != null && fstate.hasPseudoFiles())
psFile = fstate.getPseudoFileList().findFile(avmPath.getStoreName(), false);
@@ -2329,7 +2329,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
// Get the root path file state
fstate = avmCtx.getStateTable().findFileState( FileName.DOS_SEPERATOR_STR);
fstate = avmCtx.getStateCache().findFileState( FileName.DOS_SEPERATOR_STR);
// Check if the root file state is valid
@@ -2337,7 +2337,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
{
// Create a file state for the root folder
fstate = avmCtx.getStateTable().findFileState( FileName.DOS_SEPERATOR_STR, true, true);
fstate = avmCtx.getStateCache().findFileState( FileName.DOS_SEPERATOR_STR, true);
fstate.setExpiryTime( FileState.NoTimeout);
// Get a list of the available AVM stores
@@ -2565,13 +2565,13 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
// Search for the file state for the store pseudo folder
relPath = str.toString();
fstate = avmCtx.getStateTable().findFileState( relPath);
fstate = avmCtx.getStateCache().findFileState( relPath);
if ( fstate == null)
{
// Create a file state for the store path
fstate = avmCtx.getStateTable().findFileState( str.toString(), true, true);
fstate = avmCtx.getStateCache().findFileState( str.toString(), true);
// Add a pseudo file for the head version
@@ -2606,13 +2606,13 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
relPath = str.toString();
fstate = avmCtx.getStateTable().findFileState( relPath);
fstate = avmCtx.getStateCache().findFileState( relPath);
if ( fstate == null)
{
// Create a file state for the store head folder path
fstate = avmCtx.getStateTable().findFileState( str.toString(), true, true);
fstate = avmCtx.getStateCache().findFileState( str.toString(), true);
// Add a pseudo file for the data pseudo folder
@@ -2650,7 +2650,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
// Create a file state for the store path
relPath = str.toString();
fstate = avmCtx.getStateTable().findFileState( relPath, true, true);
fstate = avmCtx.getStateCache().findFileState( relPath, true);
// Add pseudo folders if the list is empty
@@ -2720,13 +2720,13 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
// Search for the file state for the version pseudo folder
relPath = str.toString();
fstate = avmCtx.getStateTable().findFileState( relPath);
fstate = avmCtx.getStateCache().findFileState( relPath);
if ( fstate == null)
{
// Create a file state for the version folder path
fstate = avmCtx.getStateTable().findFileState( str.toString(), true, true);
fstate = avmCtx.getStateCache().findFileState( str.toString(), true);
// Add a pseudo file for the data pseudo folder
@@ -2852,7 +2852,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
// Get root file state, get the store pseudo folder details
FileState rootState = avmCtx.getStateTable().findFileState( FileName.DOS_SEPERATOR_STR);
FileState rootState = avmCtx.getStateCache().findFileState( FileName.DOS_SEPERATOR_STR);
if ( rootState == null){
// Recreate the root file state, new stores may have been added
@@ -3073,7 +3073,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
// Get the root folder file state
FileState fstate = avmCtx.getStateTable().findFileState( FileName.DOS_SEPERATOR_STR, true, false);
FileState fstate = avmCtx.getStateCache().findFileState( FileName.DOS_SEPERATOR_STR, true);
if ( fstate == null)
return;

2
source/java/org/alfresco/filesys/avm/AVMShareMapper.java
View File

@@ -284,7 +284,7 @@ public class AVMShareMapper implements ShareMapper, InitializingBean {
// Create a dynamic share mapped to the AVM store/version
AVMContext avmCtx = new AVMContext( name, storePath, storeVersion);
avmCtx.enableStateTable( true, m_driver.getStateReaper());
avmCtx.enableStateCache( true);
// Create a dynamic shared device for the store version