avoid redundant path.normalize() calls in VFS

Author: tomasstupka

graalpython/com.oracle.graal.python.test/src/org/graalvm/python/embedding/utils/test/VirtualFileSystemTest.java

@@ -679,28 +679,23 @@ public void currentWorkingDirectory() throws Exception {
                 resetCWD(fs);
             }
 
-            if (fs == noHostIOVFS) {
-                checkException(SecurityException.class, () -> fs.setCurrentWorkingDirectory(realFSFile));
-                checkException(SecurityException.class, () -> fs.setCurrentWorkingDirectory(realFSDir));
-            } else {
-                checkException(IllegalArgumentException.class, () -> fs.setCurrentWorkingDirectory(realFSFile));
-                try {
-                    // support non existing working dir
-                    Path nonExistingDir = realFSDir.resolve("does-not-exist");
-                    fs.setCurrentWorkingDirectory(nonExistingDir);
-                    assertEquals(nonExistingDir, fs.toAbsolutePath(Path.of("dir")).getParent());
-
-                    fs.setCurrentWorkingDirectory(realFSDir);
-                    assertEquals(realFSDir, fs.toAbsolutePath(Path.of("dir")).getParent());
-
-                    fs.setCurrentWorkingDirectory(Path.of(VFS_ROOT + "../" + realFSDir.toString()));
-                    assertEquals(realFSDir, fs.toAbsolutePath(Path.of("dir")).getParent());
-
-                    fs.setCurrentWorkingDirectory(Path.of(realFSDir.toString() + "/..".repeat(realFSDir.getNameCount()) + VFS_ROOT));
-                    assertEquals(VFS_ROOT_PATH.resolve("dir1"), fs.toAbsolutePath(Path.of("dir1")));
-                } finally {
-                    resetCWD(fs);
-                }
+            checkException(IllegalArgumentException.class, () -> fs.setCurrentWorkingDirectory(realFSFile));
+            try {
+                // support non existing working dir
+                Path nonExistingDir = realFSDir.resolve("does-not-exist");
+                fs.setCurrentWorkingDirectory(nonExistingDir);
+                assertEquals(nonExistingDir, fs.toAbsolutePath(Path.of("dir")).getParent());
+
+                fs.setCurrentWorkingDirectory(realFSDir);
+                assertEquals(realFSDir, fs.toAbsolutePath(Path.of("dir")).getParent());
+
+                fs.setCurrentWorkingDirectory(Path.of(VFS_ROOT + "../" + realFSDir.toString()));
+                assertEquals(realFSDir, fs.toAbsolutePath(Path.of("dir")).getParent());
+
+                fs.setCurrentWorkingDirectory(Path.of(realFSDir.toString() + "/..".repeat(realFSDir.getNameCount()) + VFS_ROOT));
+                assertEquals(VFS_ROOT_PATH.resolve("dir1"), fs.toAbsolutePath(Path.of("dir1")));
+            } finally {
+                resetCWD(fs);
             }
         }
     }

graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/VirtualFileSystemImpl.java

@@ -439,12 +439,16 @@ private BaseEntry getEntry(Path inputPath) throws IOException {
                 warn("VFS.getEntry: no entries after init");
             }
         }
-        Path path = resolveVFSRelative(inputPath).normalize();
+        Path path = resolveVFSRelative(inputPath);
         return vfsEntries.get(toCaseComparable(path.toString()));
     }
 
+    /**
+     * Determines if the given path belongs to the VFS. The path should be already normalized
+     */
     private boolean pathIsInVfs(Path path) {
-        return toCaseComparable(path.normalize().toString()).startsWith(mountPointLowerCase);
+        assert path.toString().equals(path.normalize().toString());
+        return toCaseComparable(path.toString()).startsWith(mountPointLowerCase);
     }
 
     /**
@@ -909,9 +913,8 @@ public Path toRealPath(Path p, LinkOption... linkOptions) throws IOException {
                     result = path;
                 }
             }
-            Path ret = result.normalize();
-            finer("VFS.toRealPath '%s' -> '%s'", path, ret);
-            return ret;
+            finer("VFS.toRealPath '%s' -> '%s'", path, result);
+            return result;
         }
     }