java: increase efficiency with java internals

java.device: nearly twice as fast by using Java internally

java.inode: nearly twice as fast by using Java internally

Author: scivision

+stdlib/+java/device.m

@@ -1,19 +1,21 @@
 function i = device(file)
-arguments
-  file (1,1) string
-end
 
 i = uint64([]);
-if ~stdlib.exists(file), return, end
 
-opt = java.nio.file.LinkOption.values();
+if stdlib.strempty(file)
+  return
+end
 
-jp = javaPathObject(stdlib.absolute(file));
 % Java 1.8 benefits from the absolute() for stability
 % seen on older Matlab versions on HPC
+opt = java.nio.file.LinkOption.values();
 
-try %#ok<TRYNC>
-  i = java.nio.file.Files.getAttribute(jp, 'unix:dev', opt);
+try
+  i = java.nio.file.Files.getAttribute(javaAbsolutePath(file), "unix:dev", opt);
+catch e
+  if class(e.ExceptionObject) ~= "java.nio.file.NoSuchFileException"
+    rethrow(e)
+  end
 end
 
 i = uint64(i);

+stdlib/+java/get_owner.m

@@ -7,9 +7,6 @@
 % this try-catch is faster and more robust
 
 function n = get_owner(file)
-arguments
-  file (1,1) string
-end
 
 % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/nio/file/Files.html#getOwner(java.nio.file.Path,java.nio.file.LinkOption...)
 % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/nio/file/LinkOption.html

+stdlib/+java/hard_link_count.m

@@ -1,12 +1,12 @@
-function c = hard_link_count(file)
-arguments
-  file (1,1) string
-end
+function i = hard_link_count(file)
 
 opt = java.nio.file.LinkOption.values();
 try
-  c = java.nio.file.Files.getAttribute(javaPathObject(file), "unix:nlink", opt);
-catch
-  c = [];
+  i = java.nio.file.Files.getAttribute(javaAbsolutePath(file), "unix:nlink", opt);
+catch e
+  if class(e.ExceptionObject) ~= "java.nio.file.NoSuchFileException"
+    rethrow(e)
+  end
+  i = [];
 end
 end

+stdlib/+java/inode.m

@@ -1,19 +1,21 @@
 function i = inode(file)
-arguments
-  file (1,1) string
-end
 
 i = uint64([]);
-if ~stdlib.exists(file), return, end
 
-opt = java.nio.file.LinkOption.values();
+if stdlib.strempty(file)
+  return
+end
 
-jp = javaPathObject(stdlib.absolute(file));
-% Java 1.8 benefits from the absolute() for stability--it's not an issue
-% on every computer.
+% Java 1.8 benefits from the absolute() for stability
+% seen on older Matlab versions on HPC
+opt = java.nio.file.LinkOption.values();
 
-try %#ok<TRYNC>
-  i = java.nio.file.Files.getAttribute(jp, "unix:ino", opt);
+try
+  i = java.nio.file.Files.getAttribute(javaAbsolutePath(file), "unix:ino", opt);
+catch e
+  if class(e.ExceptionObject) ~= "java.nio.file.NoSuchFileException"
+    rethrow(e)
+  end
 end
 
 i = uint64(i);

+stdlib/+java/private/javaAbsolutePath.m

@@ -0,0 +1,13 @@
+function javaPath = javaAbsolutePath(file)
+% java.lang.System.getProperty('user.path') is stuck to where Java started
+
+if ischar(file) || isstring(file)
+  file = java.io.File(file);
+end
+javaPath = file.toPath();
+
+if ~javaPath.isAbsolute()
+  javaPath = javaPathObject(pwd()).resolve(javaPath);
+end
+
+end

+stdlib/+java/samepath.m

@@ -6,23 +6,9 @@
 f2 = java.io.File(path2);
 
 if f1.exists() && f2.exists()
-  p1 = file2absPath(f1);
-  p2 = file2absPath(f2);
-  y = java.nio.file.Files.isSameFile(p1, p2);
+  y = java.nio.file.Files.isSameFile(javaAbsolutePath(f1), javaAbsolutePath(f2));
 else
   y = false;
 end
 
 end
-
-
-function jpath = file2absPath(jfile)
-% java.lang.System.getProperty('user.path') is stuck to where Java started
-
-jpath = jfile.toPath();
-
-if ~jfile.isAbsolute()
-  jpath = javaPathObject(pwd()).resolve(jpath);
-end
-
-end