File system: getting the file name from a path is now faster.

h2/src/main/org/h2/store/fs/FileSystem.java

@@ -280,7 +280,7 @@ public abstract class FileSystem {
      * @param name the directory and file name
      * @return just the file name
      */
-    public abstract String getFileName(String name) throws SQLException;
+    public abstract String getFileName(String name);
 
     /**
      * Check if a file starts with a given prefix.

h2/src/main/org/h2/store/fs/FileSystemDisk.java

@@ -359,19 +359,9 @@ public class FileSystemDisk extends FileSystem {
         }
     }
 
-    public String getFileName(String name) throws SQLException {
+    public String getFileName(String name) {
         name = translateFileName(name);
-        String separator = SysProperties.FILE_SEPARATOR;
-        String path = getParent(name);
-        if (!path.endsWith(separator)) {
-            path += separator;
-        }
-        String fullFileName = normalize(name);
-        if (!fullFileName.startsWith(path)) {
-            Message.throwInternalError("file utils error: " + fullFileName + " does not start with " + path);
-        }
-        String fileName = fullFileName.substring(path.length());
-        return fileName;
+        return new File(name).getName();
     }
 
     public boolean fileStartsWith(String fileName, String prefix) {

h2/src/main/org/h2/store/fs/FileSystemSplit.java

@@ -99,7 +99,7 @@ public class FileSystemSplit extends FileSystem {
         return FileSystem.PREFIX_SPLIT + getFileSystem(fileName).getAbsolutePath(fileName);
     }
 
-    public String getFileName(String name) throws SQLException {
+    public String getFileName(String name) {
         name = translateFileName(name);
         return getFileSystem(name).getFileName(name);
     }

h2/src/test/org/h2/test/utils/FileSystemDebug.java

@@ -120,7 +120,7 @@ public class FileSystemDebug extends FileSystem {
         return PREFIX + FileSystem.getInstance(fileName).getAbsolutePath(fileName);
     }
 
-    public String getFileName(String name) throws SQLException {
+    public String getFileName(String name) {
         name = translateFileName(name);
         trace("getFileName", name);
         return FileSystem.getInstance(name).getFileName(name);