Attachment 65906 Details for Bug 185509 – Patch to avoid unnecessary getCanonicalPath() on same parent

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch to avoid unnecessary getCanonicalPath() on same parent

unifiedTree_prevCanonical_patch.txt (text/plain), 2.27 KB, created by Martin Oberhuber

on 2007-05-04 07:22:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Oberhuber

Created: 2007-05-04 07:22:42 EDT

Size: 2.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.core.resources
>Index: src/org/eclipse/core/internal/localstore/UnifiedTree.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/localstore/UnifiedTree.java,v
>retrieving revision 1.44
>diff -u -r1.44 UnifiedTree.java
>--- src/org/eclipse/core/internal/localstore/UnifiedTree.java	30 Apr 2007 15:57:13 -0000	1.44
>+++ src/org/eclipse/core/internal/localstore/UnifiedTree.java	4 May 2007 11:19:13 -0000
>@@ -56,6 +56,10 @@
> 	
> 	/** path prefixes for checking symbolic link cycles */
> 	protected PrefixPool pathPrefixHistory, rootPathHistory;
>+	
>+	/** cache for avoiding unnecessary getCanonicalPath() calls on previous parent */
>+	private IFileStore prevFileStore;
>+	private String prevCanonicalPath;
> 
> 	/** tree's root */
> 	protected IResource root;
>@@ -353,6 +357,7 @@
> 		if (pathPrefixHistory != null) {
> 			pathPrefixHistory.clear();
> 			rootPathHistory.clear();
>+			prevFileStore = null;
> 		}
> 		addRootToQueue();
> 		addElementToQueue(levelMarker);
>@@ -439,8 +444,15 @@
> 			if (parentFile == null)
> 				return false;
> 			//get canonical path for both child and parent
>+			String parentPath;
>+			if (parentStore == prevFileStore) {
>+				parentPath = prevCanonicalPath;
>+			} else {
>+				parentPath = parentFile.getCanonicalPath()+'/';
>+				prevFileStore = parentStore;
>+				prevCanonicalPath = parentPath;
>+			}
> 			java.io.File childFile = new java.io.File(parentFile, localInfo.getName());
>-			String parentPath = parentFile.getCanonicalPath()+'/';
> 			String childPath = childFile.getCanonicalPath()+'/';
> 			//get or instantiate the prefix and root path histories.
> 			//Might be done earlier - for now, do it on demand.
>@@ -456,7 +468,7 @@
> 			} else if (rootPathHistory.hasPrefixOf(childPath)) {
> 				//child points into a different portion of the tree that we visited already before, or will certainly visit.
> 				//This does not introduce a loop yet, but introduces duplicate resources.
>-				//TODO Ideally, such duplicates should be modelled as linked resources. See bug 105534
>+				//TODO Ideally, such duplicates should be modeled as linked resources. See bug 105554
> 				return false;
> 			} else {
> 				//child neither introduces a loop nor points to a known tree.

Actions: View | Diff

Attachments on bug 185509: 65906