Slightly simplified FileSystem copy

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

@@ -214,14 +214,6 @@ public abstract class FileSystem {
      */
     public abstract boolean canWrite(String fileName);
 
-    /**
-     * Copy a file from one directory to another, or to another file.
-     *
-     * @param source the name of the original file
-     * @param target the file name of the copy
-     */
-    public abstract void copy(String source, String target);
-
     /**
      * Create all required directories that are required for this file.
      *

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

@@ -309,23 +309,6 @@ public class FileSystemDisk extends FileSystem {
         }
     }
 
-    public void copy(String source, String target) {
-        source = translateFileName(source);
-        target = translateFileName(target);
-        OutputStream out = null;
-        InputStream in = null;
-        try {
-            in = IOUtils.openFileInputStream(source);
-            out = IOUtils.openFileOutputStream(target, false);
-            IOUtils.copy(in, out);
-        } catch (IOException e) {
-            throw DbException.convertIOException(e, "original: " + source + " copy: " + target);
-        } finally {
-            IOUtils.closeSilently(in);
-            IOUtils.closeSilently(out);
-        }
-    }
-
     public void createDirs(String fileName) {
         fileName = translateFileName(fileName);
         File f = new File(fileName);

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

@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.TreeMap;
 import org.h2.message.DbException;
-import org.h2.util.IOUtils;
 import org.h2.util.New;
 
 /**
@@ -163,16 +162,6 @@ public class FileSystemMemory extends FileSystem {
         return true;
     }
 
-    public void copy(String source, String target) {
-        try {
-            OutputStream out = openFileOutputStream(target, false);
-            InputStream in = openFileInputStream(source);
-            IOUtils.copyAndClose(in, out);
-        } catch (IOException e) {
-            throw DbException.convertIOException(e, "Can not copy " + source + " to " + target);
-        }
-    }
-
     public void createDirs(String fileName) {
         // TODO directories are not really supported
     }

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

@@ -49,21 +49,6 @@ public class FileSystemSplit extends FileSystemWrapper {
         return result;
     }
 
-    public void copy(String source, String target) {
-        source = unwrap(source);
-        target = unwrap(target);
-        getInstance(source).copy(source, target);
-        for (int i = 1;; i++) {
-            String o = getFileName(source, i);
-            if (getInstance(o).exists(o)) {
-                String c = getFileName(target, i);
-                getInstance(o).copy(o, c);
-            } else {
-                break;
-            }
-        }
-    }
-
     public void delete(String fileName) {
         fileName = unwrap(fileName);
         for (int i = 0;; i++) {

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

@@ -33,10 +33,6 @@ public abstract class FileSystemWrapper extends FileSystem {
         return IOUtils.setReadOnly(unwrap(fileName));
     }
 
-    public void copy(String source, String target) {
-        IOUtils.copy(unwrap(source), unwrap(target));
-    }
-
     public void createDirs(String fileName) {
         IOUtils.createDirs(unwrap(fileName));
     }

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

@@ -33,10 +33,6 @@ public class FileSystemZip extends FileSystem {
         return false;
     }
 
-    public void copy(String original, String copy) {
-        throw DbException.getUnsupportedException("write");
-    }
-
     public void createDirs(String fileName) {
         // ignore
     }

h2/src/main/org/h2/util/IOUtils.java

@@ -433,7 +433,7 @@ public class IOUtils {
      * @param s the string
      * @return the input stream
      */
-    public static InputStream getInputStream(String s) {
+    public static InputStream getInputStreamFromString(String s) {
         if (s == null) {
             return null;
         }
@@ -447,7 +447,7 @@ public class IOUtils {
      * @param s the string or null
      * @return the reader
      */
-    public static Reader getReader(String s) {
+    public static Reader getReaderFromString(String s) {
         return s == null ? null : new StringReader(s);
     }
 
@@ -556,8 +556,10 @@ public class IOUtils {
      * @param original the original file name
      * @param copy the file name of the copy
      */
-    public static void copy(String original, String copy) {
-        getFileSystem(original).copy(original, copy);
+    public static void copy(String original, String copy) throws IOException {
+        InputStream in = openFileInputStream(original);
+        OutputStream out = openFileOutputStream(copy, false);
+        copyAndClose(in, out);
     }
 
     /**

h2/src/test/org/h2/test/unit/FileSystemDatabase.java

@@ -175,17 +175,6 @@ public class FileSystemDatabase extends FileSystem {
         return true;
     }
 
-    public void copy(String source, String target) {
-        try {
-            OutputStream out = openFileOutputStream(target, false);
-            InputStream in = openFileInputStream(source);
-            IOUtils.copyAndClose(in, out);
-        } catch (IOException e) {
-            rollback();
-            throw DbException.convertIOException(e, "Can not copy " + source + " to " + target);
-        }
-    }
-
     public void createDirs(String fileName) {
         fileName = unwrap(fileName);
         try {

h2/src/test/org/h2/test/unit/TestFileSystem.java

@@ -242,7 +242,7 @@ public class TestFileSystem extends TestBase {
         String[] list = fs.listFiles(fsBase);
         assertEquals(1, list.length);
         assertTrue(list[0].endsWith("test"));
-        fs.copy(fsBase + "/test", fsBase + "/test3");
+        IOUtils.copy(fsBase + "/test", fsBase + "/test3");
         fs.rename(fsBase + "/test3", fsBase + "/test2");
         assertTrue(!fs.exists(fsBase + "/test3"));
         assertTrue(fs.exists(fsBase + "/test2"));

h2/src/test/org/h2/test/unit/TestReopen.java

@@ -15,7 +15,6 @@ import org.h2.engine.Constants;
 import org.h2.engine.Database;
 import org.h2.engine.Session;
 import org.h2.message.DbException;
-import org.h2.store.fs.FileSystem;
 import org.h2.test.TestBase;
 import org.h2.test.utils.Recorder;
 import org.h2.test.utils.RecordingFileSystem;
@@ -98,8 +97,8 @@ public class TestReopen extends TestBase implements Recorder {
             // System.out.println(fileName + " " + IOUtils.length(fileName));
             return;
         }
-        FileSystem.getInstance(fileName).copy(fileName, testDatabase + Constants.SUFFIX_PAGE_FILE);
         try {
+            IOUtils.copy(fileName, testDatabase + Constants.SUFFIX_PAGE_FILE);
             verifyCount++;
             // avoid using the Engine class to avoid deadlocks
             Properties p = new Properties();
@@ -143,8 +142,8 @@ public class TestReopen extends TestBase implements Recorder {
             // ignore
         }
         testDatabase += "X";
-        FileSystem.getInstance(fileName).copy(fileName, testDatabase + Constants.SUFFIX_PAGE_FILE);
         try {
+            IOUtils.copy(fileName, testDatabase + Constants.SUFFIX_PAGE_FILE);
             // avoid using the Engine class to avoid deadlocks
             Properties p = new Properties();
             ConnectionInfo ci = new ConnectionInfo("jdbc:h2:" + testDatabase + ";FILE_LOCK=NO", p);

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

@@ -6,6 +6,7 @@
  */
 package org.h2.test.utils;
 
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -64,11 +65,6 @@ public class DebugFileSystem extends FileSystemWrapper {
         return super.canWrite(fileName);
     }
 
-    public void copy(String source, String target) {
-        trace(source, "copy", unwrap(target));
-        super.copy(source, target);
-    }
-
     public void createDirs(String fileName) {
         trace(fileName, "createDirs");
         super.createDirs(fileName);
@@ -155,9 +151,28 @@ public class DebugFileSystem extends FileSystemWrapper {
         return super.getCanonicalPath(fileName);
     }
 
-    public InputStream openFileInputStream(String fileName) throws IOException {
+    public InputStream openFileInputStream(final String fileName) throws IOException {
         trace(fileName, "openFileInputStream");
-        return super.openFileInputStream(fileName);
+        InputStream in = super.openFileInputStream(fileName);
+        if (!trace) {
+            return in;
+        }
+        return new FilterInputStream(in) {
+            public int read(byte[] b) throws IOException {
+                trace(fileName, "in.read(b)");
+                return super.read(b);
+            }
+
+            public int read(byte[] b, int off, int len) throws IOException {
+                trace(fileName, "in.read(b, " + off + ", " + len + ")");
+                return super.read(b, off, len);
+            }
+
+            public long skip(long n) throws IOException {
+                trace(fileName, "in.skip(" + n + ")");
+                return super.skip(n);
+            }
+        };
     }
 
     public FileObject openFileObject(String fileName, String mode) throws IOException {

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

@@ -44,11 +44,6 @@ public class RecordingFileSystem extends FileSystemWrapper {
         RecordingFileSystem.recorder = recorder;
     }
 
-    public void copy(String source, String target) {
-        log(Recorder.COPY, unwrap(source) + ":" + unwrap(target));
-        super.copy(source, target);
-    }
-
     public void createDirs(String fileName) {
         log(Recorder.CREATE_DIRS, unwrap(fileName));
         super.createDirs(fileName);