mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 14:55:41 +02:00
Code Issues Wiki Activity

[190010] dstore search perf improvement

Browse source
This commit is contained in:
David McKnight 2007-07-13 17:55:31 +00:00
parent 2b1eeb69bf
commit da78470ce5
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java
View file

@ -15,10 +15,12 @@
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
* Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem * Martin Oberhuber (Wind River) - [183824] Forward SystemMessageException from IRemoteFileSubsystem
* Kevin Doyle (IBM) - [190010] Added cancel() method that will call the search service to cancel * Kevin Doyle (IBM) - [190010] Added cancel() method that will call the search service to cancel
* David McKnight (IBM) - [190010] performance improvement to use caching for dstore search
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.subsystems.files.dstore; package org.eclipse.rse.internal.subsystems.files.dstore;
import java.util.HashMap;
import java.util.List; import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
@ -45,12 +47,14 @@ public class DStoreFileSubSystemSearchResultConfiguration extends DStoreSearchRe
{ {
private FileServiceSubSystem _fileSubSystem; private FileServiceSubSystem _fileSubSystem;
private IRemoteFile _searchObject; private IRemoteFile _searchObject;
private HashMap _parentCache;
public DStoreFileSubSystemSearchResultConfiguration(IHostSearchResultSet set, Object searchObject, SystemSearchString searchString, ISearchService searchService, IHostFileToRemoteFileAdapter fileAdapter) public DStoreFileSubSystemSearchResultConfiguration(IHostSearchResultSet set, Object searchObject, SystemSearchString searchString, ISearchService searchService, IHostFileToRemoteFileAdapter fileAdapter)
{ {
super(set, searchObject, searchString, searchService); super(set, searchObject, searchString, searchService);
_searchObject = (IRemoteFile)searchObject; _searchObject = (IRemoteFile)searchObject;
_fileSubSystem = (FileServiceSubSystem)_searchObject.getParentRemoteFileSubSystem(); _fileSubSystem = (FileServiceSubSystem)_searchObject.getParentRemoteFileSubSystem();
_parentCache = new HashMap();
} }
/** /**
@ -83,14 +87,27 @@ public class DStoreFileSubSystemSearchResultConfiguration extends DStoreSearchRe
{ {
IRemoteFile parentRemoteFile = null; IRemoteFile parentRemoteFile = null;
try try
{
parentRemoteFile = (IRemoteFile)_parentCache.get(fileNode.getValue());
if (parentRemoteFile == null)
{ {
parentRemoteFile = _fileSubSystem.getRemoteFileObject(fileNode.getValue(),monitor); parentRemoteFile = _fileSubSystem.getRemoteFileObject(fileNode.getValue(),monitor);
_parentCache.put(fileNode.getValue(), parentRemoteFile);
if (!parentRemoteFile.hasContents(RemoteChildrenContentsType.getInstance())) if (!parentRemoteFile.hasContents(RemoteChildrenContentsType.getInstance()))
{ {
// query all files to save time (so we can retrieve cached files // query all files to save time (so we can retrieve cached files
_fileSubSystem.listFiles(parentRemoteFile, null); IRemoteFile[] children = _fileSubSystem.listFoldersAndFiles(parentRemoteFile, monitor);
for (int c = 0; c < children.length; c++)
{
if (!children[c].isFile())
{
_parentCache.put(children[c].getAbsolutePath(), children[c]);
}
}
}
} }
String path = fileNode.getValue() + "/" + fileNode.getName(); //$NON-NLS-1$ String path = fileNode.getValue() + "/" + fileNode.getName(); //$NON-NLS-1$
IRemoteFile remoteFile = _fileSubSystem.getRemoteFileObject(path, monitor); IRemoteFile remoteFile = _fileSubSystem.getRemoteFileObject(path, monitor);
@ -141,13 +158,18 @@ public class DStoreFileSubSystemSearchResultConfiguration extends DStoreSearchRe
public void domainChanged(DomainEvent e) public void domainChanged(DomainEvent e)
{ {
System.out.println("domain Changed: "+_status.getValue());
if (_status.getValue().equals("done")) //$NON-NLS-1$ if (_status.getValue().equals("done")) //$NON-NLS-1$
{ {
setStatus(IHostSearchConstants.FINISHED); setStatus(IHostSearchConstants.FINISHED);
_status.getDataStore().getDomainNotifier().removeDomainListener(this); _status.getDataStore().getDomainNotifier().removeDomainListener(this);
} }
else if (_status.getValue().equals("cancelled"))
{
setStatus(IHostSearchConstants.CANCELLED);
_status.getDataStore().getDomainNotifier().removeDomainListener(this);
}
OutputRefresh refresh = new OutputRefresh(this); OutputRefresh refresh = new OutputRefresh(this);
Display.getDefault().asyncExec(refresh); Display.getDefault().asyncExec(refresh);
} }