Merge branch 'master' of https://github.com/h2database/h2database into issue_435

h2/src/main/org/h2/command/ddl/AlterTableAddConstraint.java

@@ -244,20 +244,20 @@ public class AlterTableAddConstraint extends SchemaCommand {
             }
             int id = getObjectId();
             String name = generateConstraintName(table);
-            ConstraintReferential ref = new ConstraintReferential(getSchema(),
+            ConstraintReferential refConstraint = new ConstraintReferential(getSchema(),
                     id, name, table);
-            ref.setColumns(indexColumns);
-            ref.setIndex(index, isOwner);
-            ref.setRefTable(refTable);
-            ref.setRefColumns(refIndexColumns);
-            ref.setRefIndex(refIndex, isRefOwner);
+            refConstraint.setColumns(indexColumns);
+            refConstraint.setIndex(index, isOwner);
+            refConstraint.setRefTable(refTable);
+            refConstraint.setRefColumns(refIndexColumns);
+            refConstraint.setRefIndex(refIndex, isRefOwner);
             if (checkExisting) {
-                ref.checkExistingData(session);
+                refConstraint.checkExistingData(session);
             }
-            constraint = ref;
-            refTable.addConstraint(constraint);
-            ref.setDeleteAction(deleteAction);
-            ref.setUpdateAction(updateAction);
+            refTable.addConstraint(refConstraint);
+            refConstraint.setDeleteAction(deleteAction);
+            refConstraint.setUpdateAction(updateAction);
+            constraint = refConstraint;
             break;
         }
         default:

h2/src/main/org/h2/jdbc/JdbcConnection.java

@@ -30,9 +30,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.concurrent.Executor;
 import java.util.regex.Pattern;
+
 import org.h2.api.ErrorCode;
 import org.h2.command.CommandInterface;
 import org.h2.engine.ConnectionInfo;
@@ -1737,6 +1739,12 @@ public class JdbcConnection extends TraceObject
                         + ");");
             }
             checkClosed();
+            
+            // no change to property: Ignore call. This early exit fixes a problem with websphere liberty
+            // resetting the client info of a pooled connection to its initial values.
+            if (Objects.equals(value, getClientInfo(name))) {
+            	return;
+            }
 
             if (isInternalProperty(name)) {
                 throw new SQLClientInfoException(

h2/src/main/org/h2/tools/CreateCluster.java

@@ -13,14 +13,15 @@ import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import org.h2.api.ErrorCode;
-import org.h2.engine.Constants;
-import org.h2.util.IOUtils;
-import org.h2.util.JdbcUtils;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
 import org.h2.util.Tool;
 
 /**
- * Creates a cluster from a standalone database.
+ * Creates a cluster from a stand-alone database.
  * <br />
  * Copies a database to another location if required.
  * @h2.resource
@@ -100,116 +101,98 @@ public class CreateCluster extends Tool {
 
     private static void process(String urlSource, String urlTarget,
             String user, String password, String serverList) throws SQLException {
-        Connection connSource = null, connTarget = null;
-        Statement statSource = null, statTarget = null;
-        PipedReader pipeReader = null;
-
-        try {
-            org.h2.Driver.load();
-
-            // verify that the database doesn't exist,
-            // or if it exists (an old cluster instance), it is deleted
-            boolean exists = true;
-            try {
-                connTarget = DriverManager.getConnection(urlTarget +
-                        ";IFEXISTS=TRUE;CLUSTER=" + Constants.CLUSTERING_ENABLED,
-                        user, password);
-                Statement stat = connTarget.createStatement();
-                stat.execute("DROP ALL OBJECTS DELETE FILES");
-                stat.close();
-                exists = false;
-                connTarget.close();
-            } catch (SQLException e) {
-                if (e.getErrorCode() == ErrorCode.DATABASE_NOT_FOUND_1) {
-                    // database does not exists yet - ok
-                    exists = false;
-                } else {
-                    throw e;
-                }
-            }
-            if (exists) {
-                throw new SQLException(
-                        "Target database must not yet exist. Please delete it first: " +
-                        urlTarget);
-            }
-
-            // use cluster='' so connecting is possible
-            // even if the cluster is enabled
-            connSource = DriverManager.getConnection(urlSource +
-                    ";CLUSTER=''", user, password);
-            statSource = connSource.createStatement();
-
+        org.h2.Driver.load();
+
+        try (Connection connSource = DriverManager.getConnection(
+                     // use cluster='' so connecting is possible
+                     // even if the cluster is enabled
+                     urlSource + ";CLUSTER=''", user, password);
+             Statement statSource = connSource.createStatement())
+        {
             // enable the exclusive mode and close other connections,
             // so that data can't change while restoring the second database
             statSource.execute("SET EXCLUSIVE 2");
 
-            pipeReader = new PipedReader();
-
             try {
-                /*
-                 * Pipe writer is used + closed in the inner class, in a
-                 * separate thread (needs to be final). It should be initialized
-                 * within try{} so an exception could be caught if creation
-                 * fails. In that scenario, the the writer should be null and
-                 * needs no closing, and the main goal is that finally{} should
-                 * bring the source DB out of exclusive mode, and close the
-                 * reader.
-                 */
-                final PipedWriter pipeWriter = new PipedWriter(pipeReader);
-
-                // Backup data from source database in script form.
-                // Start writing to pipe writer in separate thread.
-                final ResultSet rs = statSource.executeQuery("SCRIPT");
-
-                // Delete the target database first.
-                connTarget = DriverManager.getConnection(
-                        urlTarget + ";CLUSTER=''", user, password);
-                statTarget = connTarget.createStatement();
-                statTarget.execute("DROP ALL OBJECTS DELETE FILES");
-                connTarget.close();
-
-
-                new Thread(
-                    new Runnable(){
-                        @Override
-                        public void run() {
-                            try {
-                                while (rs.next()) {
-                                    pipeWriter.write(rs.getString(1) + "\n");
-                                }
-                            } catch (SQLException ex) {
-                                throw new IllegalStateException("Producing script from the source DB is failing.",ex);
-                            } catch (IOException ex) {
-                                throw new IllegalStateException("Producing script from the source DB is failing.",ex);
-                            } finally {
-                                IOUtils.closeSilently(pipeWriter);
-                            }
-                        }
-                    }
-                ).start();
+                performTransfer(statSource, urlTarget, user, password, serverList);
+            } finally {
+                // switch back to the regular mode
+                statSource.execute("SET EXCLUSIVE FALSE");
+            }
+        }
+    }
 
-                // Read data from pipe reader, restore on target.
-                connTarget = DriverManager.getConnection(urlTarget, user, password);
-                RunScript.execute(connTarget,pipeReader);
-                statTarget = connTarget.createStatement();
+    private static void performTransfer(Statement statSource, String urlTarget,
+            String user, String password, String serverList) throws SQLException {
+
+        // Delete the target database first.
+        try (Connection connTarget = DriverManager.getConnection(
+                     urlTarget + ";CLUSTER=''", user, password);
+             Statement statTarget = connTarget.createStatement())
+        {
+            statTarget.execute("DROP ALL OBJECTS DELETE FILES");
+        }
+
+        try (PipedReader pipeReader = new PipedReader()) {
+            Future<?> threadFuture = startWriter(pipeReader, statSource);
+
+            // Read data from pipe reader, restore on target.
+            try (Connection connTarget = DriverManager.getConnection(
+                         urlTarget, user, password);
+                 Statement statTarget = connTarget.createStatement())
+            {
+                RunScript.execute(connTarget, pipeReader);
+
+                // Check if the writer encountered any exception
+                try {
+                    threadFuture.get();
+                } catch (ExecutionException ex) {
+                    throw new SQLException(ex.getCause());
+                } catch (InterruptedException ex) {
+                    throw new SQLException(ex);
+                }
 
                 // set the cluster to the serverList on both databases
                 statSource.executeUpdate("SET CLUSTER '" + serverList + "'");
                 statTarget.executeUpdate("SET CLUSTER '" + serverList + "'");
-
-            } catch (IOException ex) {
-                throw new SQLException(ex);
-            } finally {
-                // switch back to the regular mode
-                statSource.execute("SET EXCLUSIVE FALSE");
             }
-        } finally {
-            IOUtils.closeSilently(pipeReader);
-            JdbcUtils.closeSilently(statSource);
-            JdbcUtils.closeSilently(statTarget);
-            JdbcUtils.closeSilently(connSource);
-            JdbcUtils.closeSilently(connTarget);
+        } catch (IOException ex) {
+            throw new SQLException(ex);
         }
     }
 
+    private static Future<?> startWriter(final PipedReader pipeReader,
+            final Statement statSource) throws SQLException, IOException {
+        final ExecutorService thread = Executors.newFixedThreadPool(1);
+
+        // Since exceptions cannot be thrown across thread boundaries, return
+        // the task's future so we can check manually
+        Future<?> threadFuture = thread.submit(new Runnable() {
+            @Override
+            public void run() {
+                /*
+                 * If the creation of the piped writer fails, the reader will
+                 * throw an IOException as soon as read() is called:
+                 * IOException - if the pipe is broken, unconnected, closed,
+                 * or an I/O error occurs.
+                 * The reader's IOException will then trigger the finally{} that
+                 * releases exclusive mode on the source DB.
+                 */
+                try (final PipedWriter pipeWriter = new PipedWriter(pipeReader);
+                     final ResultSet rs = statSource.executeQuery("SCRIPT"))
+                {
+                    while (rs.next()) {
+                        pipeWriter.write(rs.getString(1) + "\n");
+                    }
+                } catch (SQLException | IOException ex) {
+                    throw new IllegalStateException("Producing script from the source DB is failing.", ex);
+                }
+            }
+        });
+
+        thread.shutdown();
+
+        return threadFuture;
+    }
+
 }

h2/src/test/org/h2/test/jdbc/TestConnection.java

@@ -13,6 +13,8 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
+
+
 /**
  * Tests the client info
  */
@@ -35,6 +37,7 @@ public class TestConnection extends TestBase {
         testSetSupportedClientInfoProperties();
         testSetUnsupportedClientInfoProperties();
         testSetInternalProperty();
+        testSetInternalPropertyToInitialValue();
         testSetGetSchema();
     }
 
@@ -47,6 +50,29 @@ public class TestConnection extends TestBase {
         assertThrows(SQLClientInfoException.class, conn).setClientInfo("server23", "SomeValue");
         conn.close();
     }
+    
+    /**
+     * Test that no exception is thrown if the client info of a connection managed in a connection pool is reset
+     * to its initial values.
+     * 
+     * This is needed when using h2 in websphere liberty.
+     */
+    private void testSetInternalPropertyToInitialValue() throws SQLException {
+      // Use MySQL-mode since this allows all property names
+      // (apart from h2 internal names).
+      Connection conn = getConnection("clientInfoMySQL;MODE=MySQL");
+      
+      String numServersPropertyName = "numServers";
+      
+      String numServers = conn.getClientInfo(numServersPropertyName);
+      
+      conn.setClientInfo(numServersPropertyName, numServers);
+      
+      assertEquals(conn.getClientInfo(numServersPropertyName), numServers);
+
+      conn.close();
+  }
+
 
     private void testSetUnsupportedClientInfoProperties() throws SQLException {
         Connection conn = getConnection("clientInfo");