#1405 Introduce LocalResult factory: fix review issues

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

@@ -35,9 +35,9 @@ public class Call extends Prepared {
         LocalResult result;
         if (isResultSet) {
             Expression[] expr = expression.getExpressionColumns(session);
-            result = LocalResultFactory.createRow(session, expr, expr.length);
+            result = session.getDatabase().getResultFactory().create(session, expr, expr.length);
         } else {
-            result = LocalResultFactory.createRow(session, expressions, 1);
+            result = session.getDatabase().getResultFactory().create(session, expressions, 1);
         }
         result.done();
         return result;
@@ -69,7 +69,7 @@ public class Call extends Prepared {
             ResultSet rs = v.getResultSet();
             return LocalResultFactory.read(session, rs, maxrows);
         }
-        LocalResult result = LocalResultFactory.createRow(session, expressions, 1);
+        LocalResult result = session.getDatabase().getResultFactory().create(session, expressions, 1);
         Value[] row = { v };
         result.addRow(row);
         result.done();

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

@@ -16,7 +16,6 @@ import org.h2.expression.Expression;
 import org.h2.expression.ExpressionColumn;
 import org.h2.mvstore.db.MVTableEngine.Store;
 import org.h2.result.LocalResult;
-import org.h2.result.LocalResultFactory;
 import org.h2.result.ResultInterface;
 import org.h2.store.PageStore;
 import org.h2.table.Column;
@@ -73,7 +72,7 @@ public class Explain extends Prepared {
         Database db = session.getDatabase();
         ExpressionColumn expr = new ExpressionColumn(db, column);
         Expression[] expressions = { expr };
-        result = LocalResultFactory.createRow(session, expressions, 1);
+        result = session.getDatabase().getResultFactory().create(session, expressions, 1);
         if (maxrows >= 0) {
             String plan;
             if (executeCommand) {

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

@@ -43,7 +43,6 @@ import org.h2.index.Cursor;
 import org.h2.index.Index;
 import org.h2.message.DbException;
 import org.h2.result.LocalResult;
-import org.h2.result.LocalResultFactory;
 import org.h2.result.ResultInterface;
 import org.h2.result.Row;
 import org.h2.schema.Constant;
@@ -138,7 +137,7 @@ public class ScriptCommand extends ScriptBase {
     private LocalResult createResult() {
         Expression[] expressions = { new ExpressionColumn(
                 session.getDatabase(), new Column("SCRIPT", Value.STRING)) };
-        return LocalResultFactory.createRow(session, expressions, 1);
+        return session.getDatabase().getResultFactory().create(session, expressions, 1);
     }
 
     @Override

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

@@ -32,7 +32,6 @@ import org.h2.index.IndexType;
 import org.h2.message.DbException;
 import org.h2.result.LazyResult;
 import org.h2.result.LocalResult;
-import org.h2.result.LocalResultFactory;
 import org.h2.result.ResultInterface;
 import org.h2.result.ResultTarget;
 import org.h2.result.Row;
@@ -688,7 +687,7 @@ public class Select extends Query {
 
     @Override
     public ResultInterface queryMeta() {
-        LocalResult result = LocalResultFactory.createRow(session, expressionArray,
+        LocalResult result = session.getDatabase().getResultFactory().create(session, expressionArray,
                 visibleColumnCount);
         result.done();
         return result;
@@ -859,12 +858,13 @@ public class Select extends Query {
     }
 
     private LocalResult createLocalResult(LocalResult old) {
-        return old != null ? old : LocalResultFactory.createRow(session, expressionArray,
+        return old != null ? old : session.getDatabase().getResultFactory().create(session, expressionArray,
                 visibleColumnCount);
     }
 
     private LocalResult convertToDistinct(ResultInterface result) {
-        LocalResult distinctResult = LocalResultFactory.createRow(session, expressionArray, visibleColumnCount);
+        LocalResult distinctResult = session.getDatabase().getResultFactory().create(session,
+            expressionArray, visibleColumnCount);
         distinctResult.setDistinct();
         result.reset();
         while (result.next()) {

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

@@ -20,7 +20,6 @@ import org.h2.expression.ValueExpression;
 import org.h2.message.DbException;
 import org.h2.result.LazyResult;
 import org.h2.result.LocalResult;
-import org.h2.result.LocalResultFactory;
 import org.h2.result.ResultInterface;
 import org.h2.result.ResultTarget;
 import org.h2.table.Column;
@@ -131,14 +130,14 @@ public class SelectUnion extends Query {
     @Override
     public ResultInterface queryMeta() {
         int columnCount = left.getColumnCount();
-        LocalResult result = LocalResultFactory.createRow(session, expressionArray, columnCount);
+        LocalResult result = session.getDatabase().getResultFactory().create(session, expressionArray, columnCount);
         result.done();
         return result;
     }
 
     public LocalResult getEmptyResult() {
         int columnCount = left.getColumnCount();
-        return LocalResultFactory.createRow(session, expressionArray, columnCount);
+        return session.getDatabase().getResultFactory().create(session, expressionArray, columnCount);
     }
 
     @Override
@@ -190,7 +189,7 @@ public class SelectUnion extends Query {
                 return lazyResult;
             }
         }
-        LocalResult result = LocalResultFactory.createRow(session, expressionArray, columnCount);
+        LocalResult result = session.getDatabase().getResultFactory().create(session, expressionArray, columnCount);
         if (sort != null) {
             result.setSortOrder(sort);
         }
@@ -240,7 +239,7 @@ public class SelectUnion extends Query {
             break;
         }
         case INTERSECT: {
-            LocalResult temp = LocalResultFactory.createRow(session, expressionArray, columnCount);
+            LocalResult temp = session.getDatabase().getResultFactory().create(session, expressionArray, columnCount);
             temp.setDistinct();
             while (l.next()) {
                 temp.addRow(convert(l.currentRow(), columnCount));

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

@@ -566,7 +566,7 @@ public class Set extends Prepared {
             LocalResultFactory localResultFactory;
             try {
                 localResultFactory = localResultFactoryClass.getDeclaredConstructor().newInstance();
-                database.setLocalResultFactory(localResultFactory);
+                database.setResultFactory(localResultFactory);
             } catch (Exception e) {
                 throw DbException.convert(e);
             }

h2/src/main/org/h2/engine/Database.java

@@ -41,7 +41,6 @@ import org.h2.message.Trace;
 import org.h2.message.TraceSystem;
 import org.h2.mvstore.MVStore;
 import org.h2.mvstore.db.MVTableEngine;
-import org.h2.result.LocalResult;
 import org.h2.result.LocalResultFactory;
 import org.h2.result.Row;
 import org.h2.result.RowFactory;
@@ -372,11 +371,11 @@ public class Database implements DataHandler {
         this.rowFactory = rowFactory;
     }
 
-    public LocalResultFactory getLocalResultFactory() {
+    public LocalResultFactory getResultFactory() {
         return resultFactory;
     }
 
-    public void setLocalResultFactory(LocalResultFactory resultFactory) {
+    public void setResultFactory(LocalResultFactory resultFactory) {
         this.resultFactory = resultFactory;
     }
 

h2/src/main/org/h2/engine/GeneratedKeys.java

@@ -13,7 +13,6 @@ import java.util.Map;
 import org.h2.expression.Expression;
 import org.h2.expression.ExpressionColumn;
 import org.h2.result.LocalResult;
-import org.h2.result.LocalResultFactory;
 import org.h2.result.Row;
 import org.h2.table.Column;
 import org.h2.table.Table;
@@ -129,7 +128,7 @@ public final class GeneratedKeys {
         Database db = session.getDatabase();
         if (Boolean.FALSE.equals(generatedKeysRequest)) {
             clear(null);
-            return LocalResultFactory.createRow(session);
+            return session.getDatabase().getResultFactory().create();
         }
         ArrayList<ExpressionColumn> expressionColumns;
         if (Boolean.TRUE.equals(generatedKeysRequest)) {
@@ -153,7 +152,7 @@ public final class GeneratedKeys {
                 }
             } else {
                 clear(null);
-                return LocalResultFactory.createRow(session);
+                return session.getDatabase().getResultFactory().create();
             }
         } else if (generatedKeysRequest instanceof String[]) {
             if (table != null) {
@@ -183,18 +182,19 @@ public final class GeneratedKeys {
                 }
             } else {
                 clear(null);
-                return LocalResultFactory.createRow(session);
+                return session.getDatabase().getResultFactory().create();
             }
         } else {
             clear(null);
-            return LocalResultFactory.createRow(session);
+            return session.getDatabase().getResultFactory().create();
         }
         int columnCount = expressionColumns.size();
         if (columnCount == 0) {
             clear(null);
-            return LocalResultFactory.createRow(session);
+            return session.getDatabase().getResultFactory().create();
         }
-        LocalResult result = LocalResultFactory.createRow(session, expressionColumns.toArray(new Expression[0]), columnCount);
+        LocalResult result = session.getDatabase().getResultFactory().create(session,
+            expressionColumns.toArray(new Expression[0]), columnCount);
         for (Map<Column, Value> map : data) {
             Value[] row = new Value[columnCount];
             for (Map.Entry<Column, Value> entry : map.entrySet()) {

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

@@ -12,7 +12,6 @@ import org.h2.engine.Database;
 import org.h2.engine.Session;
 import org.h2.message.DbException;
 import org.h2.result.LocalResult;
-import org.h2.result.LocalResultFactory;
 import org.h2.table.Column;
 import org.h2.tools.SimpleResultSet;
 import org.h2.util.MathUtils;
@@ -87,7 +86,7 @@ public class TableFunction extends Function {
             ExpressionColumn col = new ExpressionColumn(db, c);
             header[i] = col;
         }
-        LocalResult result = LocalResultFactory.createRow(session, header, len);
+        LocalResult result = session.getDatabase().getResultFactory().create(session, header, len);
         if (distinctRows) {
             result.setDistinct();
         }

h2/src/main/org/h2/result/LocalResultFactory.java

@@ -38,43 +38,6 @@ public abstract class LocalResultFactory {
      */
     public abstract LocalResult create();
 
-    /**
-     * Default implementation of local result factory.
-     */
-    static final class DefaultLocalResultFactory extends LocalResultFactory {
-        @Override
-        public LocalResult create(Session session, Expression[] expressions, int visibleColumnCount) {
-            return new LocalResultImpl(session, expressions, visibleColumnCount);
-        }
-
-        @Override
-        public LocalResult create() {
-            return new LocalResultImpl();
-        }
-    }
-
-    /**
-     * Create a local result object by factory registered at the database.
-     *
-     * @param session the session
-     * @param expressions the expression array
-     * @param visibleColumnCount the number of visible columns
-     * @return objetc to collect local result.
-     */
-    public static LocalResult createRow(Session session, Expression[] expressions, int visibleColumnCount) {
-        return session.getDatabase().getLocalResultFactory().create(session, expressions, visibleColumnCount);
-    }
-
-    /**
-     * Create a local result object by factory registered at the database.
-     *
-     * @param session the session
-     * @return objetc to collect local result.
-     */
-    public static LocalResult createRow(Session session) {
-        return session.getDatabase().getLocalResultFactory().create();
-    }
-
     /**
      * Construct a local result set by reading all data from a regular result
      * set.
@@ -87,7 +50,7 @@ public abstract class LocalResultFactory {
     public static LocalResult read(Session session, ResultSet rs, int maxrows) {
         Expression[] cols = Expression.getExpressionColumns(session, rs);
         int columnCount = cols.length;
-        LocalResult result = session.getDatabase().getLocalResultFactory().create(session, cols, columnCount);
+        LocalResult result = session.getDatabase().getResultFactory().create(session, cols, columnCount);
         try {
             for (int i = 0; (maxrows == 0 || i < maxrows) && rs.next(); i++) {
                 Value[] list = new Value[columnCount];
@@ -104,4 +67,25 @@ public abstract class LocalResultFactory {
         return result;
     }
 
+    /**
+     * Default implementation of local result factory.
+     */
+    private static final class DefaultLocalResultFactory extends LocalResultFactory {
+        /**
+         *
+         */
+        DefaultLocalResultFactory() {
+            //No-op.
+        }
+
+        @Override
+        public LocalResult create(Session session, Expression[] expressions, int visibleColumnCount) {
+            return new LocalResultImpl(session, expressions, visibleColumnCount);
+        }
+
+        @Override
+        public LocalResult create() {
+            return new LocalResultImpl();
+        }
+    }
 }

h2/src/main/org/h2/result/LocalResultImpl.java

@@ -24,7 +24,7 @@ import org.h2.value.ValueArray;
  * and it is also used directly by the ResultSet class in the embedded mode.
  * If the result does not fit in memory, it is written to a temporary file.
  */
-public class LocalResultImpl implements LocalResult, ResultInterface, ResultTarget {
+public class LocalResultImpl implements LocalResult {
 
     private int maxMemoryRows;
     private Session session;

h2/src/test/org/h2/test/TestAll.java

@@ -47,7 +47,6 @@ import org.h2.test.db.TestLargeBlob;
 import org.h2.test.db.TestLinkedTable;
 import org.h2.test.db.TestListener;
 import org.h2.test.db.TestLob;
-import org.h2.test.db.TestLocalResultFactory;
 import org.h2.test.db.TestMemoryUsage;
 import org.h2.test.db.TestMergeUsing;
 import org.h2.test.db.TestMultiConn;
@@ -194,6 +193,7 @@ import org.h2.test.unit.TestIntIntHashMap;
 import org.h2.test.unit.TestIntPerfectHash;
 import org.h2.test.unit.TestInterval;
 import org.h2.test.unit.TestJmx;
+import org.h2.test.unit.TestLocalResultFactory;
 import org.h2.test.unit.TestLocale;
 import org.h2.test.unit.TestMathUtils;
 import org.h2.test.unit.TestMemoryUnmapper;
@@ -796,7 +796,6 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
         addTest(new TestViewDropView());
         addTest(new TestSynonymForTable());
         addTest(new TestColumnNamer());
-        addTest(new TestLocalResultFactory());
 
         // jdbc
         addTest(new TestBatchUpdates());
@@ -982,6 +981,7 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
         addTest(new TestTraceSystem());
         addTest(new TestUtils());
         addTest(new TestValueHashMap());
+        addTest(new TestLocalResultFactory());
 
         runAddedTests();
 

h2/src/test/org/h2/test/db/TestLocalResultFactory.java → h2/src/test/org/h2/test/unit/TestLocalResultFactory.java

@@ -3,9 +3,10 @@
  * and the EPL 1.0 (http://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
-package org.h2.test.db;
+package org.h2.test.unit;
 
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.Statement;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.h2.engine.Session;
@@ -13,12 +14,11 @@ import org.h2.expression.Expression;
 import org.h2.result.LocalResult;
 import org.h2.result.LocalResultFactory;
 import org.h2.test.TestBase;
-import org.h2.test.TestDb;
 
 /**
  * Test {@link LocalResultFactory} setting.
  */
-public class TestLocalResultFactory extends TestDb {
+public class TestLocalResultFactory extends TestBase {
 
     /**
      * Run just this test.
@@ -31,9 +31,8 @@ public class TestLocalResultFactory extends TestDb {
 
     @Override
     public void test() throws Exception {
-        deleteDb("localResultFactory");
-        Connection conn = getConnection("localResultFactory;LOCAL_RESULT_FACTORY=\"" +
-            MyTestLocalResultFactory.class.getName() + '"');
+        try (Connection conn = DriverManager.getConnection("jdbc:h2:mem:localResultFactory;LOCAL_RESULT_FACTORY=\""
+            + MyTestLocalResultFactory.class.getName() + '"')) {
             Statement stat = conn.createStatement();
 
             stat.execute("create table t1(id int, name varchar)");
@@ -44,9 +43,7 @@ public class TestLocalResultFactory extends TestDb {
 
             stat.execute("select * from t1");
             assertEquals(MyTestLocalResultFactory.COUNTER.get(), 1);
-
-        conn.close();
-        deleteDb("localResultFactory");
+        }
     }
 
     /**