Merge remote-tracking branch 'h2database/master' into txcommit-atomic

h2/src/main/org/h2/command/dml/MergeUsing.java

@@ -240,44 +240,45 @@ public class MergeUsing extends Prepared {
     }
 
     private boolean isTargetRowFound() {
-        ResultInterface rows = targetMatchQuery.query(0);
-        int countTargetRowsFound = 0;
-        Value[] targetRowIdValue = null;
-
-        while (rows.next()) {
-            countTargetRowsFound++;
-            targetRowIdValue = rows.currentRow();
-
+        try (ResultInterface rows = targetMatchQuery.query(0)) {
+            if (!rows.next()) {
+                return false;
+            }
+            Value targetRowId = rows.currentRow()[0];
+            Integer number = targetRowidsRemembered.get(targetRowId);
             // throw and exception if we have processed this _ROWID_ before...
-            if (targetRowidsRemembered.containsKey(targetRowIdValue[0])) {
+            if (number != null) {
                 throw DbException.get(ErrorCode.DUPLICATE_KEY_1,
                         "Merge using ON column expression, " +
                         "duplicate _ROWID_ target record already updated, deleted or inserted:_ROWID_="
-                                + targetRowIdValue[0].toString() + ":in:"
+                                + targetRowId + ":in:"
                                 + targetTableFilter.getTable()
                                 + ":conflicting source row number:"
-                                + targetRowidsRemembered
-                                        .get(targetRowIdValue[0]));
-            } else {
+                                + number);
+            }
             // remember the source column values we have used before (they
             // are the effective ON clause keys
             // and should not be repeated
-                targetRowidsRemembered.put(targetRowIdValue[0],
-                        sourceQueryRowNumber);
+            targetRowidsRemembered.put(targetRowId, sourceQueryRowNumber);
+            if (rows.next()) {
+                int rowCount;
+                if (rows.isLazy()) {
+                    for (rowCount = 2; rows.next(); rowCount++) {
                     }
+                } else {
+                    rowCount = rows.getRowCount();
                 }
-        rows.close();
-        if (countTargetRowsFound > 1) {
                 throw DbException.get(ErrorCode.DUPLICATE_KEY_1,
-                    "Duplicate key updated " + countTargetRowsFound
+                        "Duplicate key updated "
+                                + rowCount
                                 + " rows at once, only 1 expected:_ROWID_="
-                            + targetRowIdValue[0].toString() + ":in:"
+                                + targetRowId + ":in:"
                                 + targetTableFilter.getTable()
                                 + ":conflicting source row number:"
-                            + targetRowidsRemembered.get(targetRowIdValue[0]));
-
+                                + targetRowidsRemembered.get(targetRowId));
+            }
+            return true;
         }
-        return countTargetRowsFound > 0;
     }
 
     private int addRowByCommandInsert(Row sourceRow) {
@@ -348,9 +349,7 @@ public class MergeUsing extends Prepared {
         onCondition.mapColumns(targetTableFilter, 1);
 
         if (keys == null) {
-            HashSet<Column> targetColumns = buildColumnListFromOnCondition(
-                    targetTableFilter);
-            keys = targetColumns.toArray(new Column[0]);
+            keys = buildColumnListFromOnCondition(targetTableFilter.getTable());
         }
         if (keys.length == 0) {
             throw DbException.get(ErrorCode.COLUMN_NOT_FOUND_1,
@@ -416,19 +415,11 @@ public class MergeUsing extends Prepared {
         targetMatchQuery.prepare();
     }
 
-    private HashSet<Column> buildColumnListFromOnCondition(
-            TableFilter anyTableFilter) {
-        HashSet<Column> filteredColumns = new HashSet<>();
+    private Column[] buildColumnListFromOnCondition(Table table) {
         HashSet<Column> columns = new HashSet<>();
-        ExpressionVisitor visitor = ExpressionVisitor
-                .getColumnsVisitor(columns);
+        ExpressionVisitor visitor = ExpressionVisitor.getColumnsVisitor(columns, table);
         onCondition.isEverything(visitor);
-        for (Column c : columns) {
-            if (c != null && c.getTable() == anyTableFilter.getTable()) {
-                filteredColumns.add(c);
-            }
-        }
-        return filteredColumns;
+        return columns.toArray(new Column[0]);
     }
 
     private Expression appendOnCondition(Update updateCommand) {

h2/src/main/org/h2/constraint/ConstraintCheck.java

@@ -6,7 +6,6 @@
 package org.h2.constraint;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import org.h2.api.ErrorCode;
 import org.h2.engine.Session;
 import org.h2.expression.Expression;
@@ -122,12 +121,7 @@ public class ConstraintCheck extends Constraint {
     @Override
     public HashSet<Column> getReferencedColumns(Table table) {
         HashSet<Column> columns = new HashSet<>();
-        expr.isEverything(ExpressionVisitor.getColumnsVisitor(columns));
-        for (Iterator<Column> it = columns.iterator(); it.hasNext();) {
-            if (it.next().getTable() != table) {
-                it.remove();
-            }
-        }
+        expr.isEverything(ExpressionVisitor.getColumnsVisitor(columns, table));
         return columns;
     }
 

h2/src/main/org/h2/expression/ExpressionVisitor.java

@@ -239,10 +239,11 @@ public class ExpressionVisitor {
      * Create a new visitor to get all referenced columns.
      *
      * @param columns the columns map
+     * @param table table to gather columns from, or {@code null} to gather all columns
      * @return the new visitor
      */
-    public static ExpressionVisitor getColumnsVisitor(HashSet<Column> columns) {
-        return new ExpressionVisitor(GET_COLUMNS2, 0, null, null, null, null, null, columns);
+    public static ExpressionVisitor getColumnsVisitor(HashSet<Column> columns, Table table) {
+        return new ExpressionVisitor(GET_COLUMNS2, 0, null, null, table, null, null, columns);
     }
 
     public static ExpressionVisitor getMaxModificationIdVisitor() {
@@ -269,9 +270,12 @@ public class ExpressionVisitor {
     void addColumn1(Column column) {
         columns1.add(column);
     }
+
     void addColumn2(Column column) {
+        if (table == null || table == column.getTable()) {
             columns2.add(column);
         }
+    }
 
     /**
      * Get the dependency set.