[389665] Cache path->resourceNodeID mappings in AbstractCDOView

https://bugs.eclipse.org/bugs/show_bug.cgi?id=389665

2 files changed, 18 insertions, 3 deletions

diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java
index 77588ac82f..dfb8fbc169 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitNotificationIndication.java
@@ -34,6 +34,8 @@ public class CommitNotificationIndication extends CDOClientIndication
   {
     InternalCDOSession session = getSession();
     CDOCommitInfo commitInfo = in.readCDOCommitInfo();
-    session.handleCommitNotification(commitInfo);
+    boolean clearResourcePathCache = in.readBoolean();
+
+    session.handleCommitNotification(commitInfo, clearResourcePathCache);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
index 190bc92581..08c8bd482d 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.cdo.session.CDORepositoryInfo;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 import org.eclipse.emf.internal.cdo.object.CDOObjectReferenceImpl;
+import org.eclipse.emf.internal.cdo.view.AbstractCDOView;
 
 import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
@@ -83,6 +84,8 @@ public class CommitTransactionRequest extends CDOClientRequestWithMonitoring<Com
 
   private CDOTransaction transaction;
 
+  private boolean clearResourcePathCache;
+
   public CommitTransactionRequest(CDOClientProtocol protocol, InternalCDOCommitContext context)
   {
     this(protocol, CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION, context);
@@ -182,11 +185,20 @@ public class CommitTransactionRequest extends CDOClientRequestWithMonitoring<Com
       TRACER.format("Writing {0} dirty objects", changedObjects.size()); //$NON-NLS-1$
     }
 
+    CDOID rootResourceID = transaction.getSession().getRepositoryInfo().getRootResourceID();
     for (CDORevisionKey changedObject : changedObjects)
     {
-      out.writeCDORevisionDelta((CDORevisionDelta)changedObject);
+      CDORevisionDelta delta = (CDORevisionDelta)changedObject;
+      if (!clearResourcePathCache && AbstractCDOView.canHaveResourcePathImpact(delta, rootResourceID))
+      {
+        clearResourcePathCache = true;
+      }
+
+      out.writeCDORevisionDelta(delta);
     }
 
+    out.writeBoolean(clearResourcePathCache);
+
     if (TRACER.isEnabled())
     {
       TRACER.format("Writing {0} detached objects", detachedObjects.size()); //$NON-NLS-1$
@@ -301,7 +313,8 @@ public class CommitTransactionRequest extends CDOClientRequestWithMonitoring<Com
         }
       }
 
-      return new CommitTransactionResult(idProvider, rollbackMessage, branchPoint, previousTimeStamp, xRefs);
+      return new CommitTransactionResult(idProvider, rollbackMessage, branchPoint, previousTimeStamp, xRefs,
+          clearResourcePathCache);
     }
 
     return null;