Merged batch find API from master

h2/src/main/org/h2/index/BaseIndex.java

@@ -5,8 +5,6 @@
  */
 package org.h2.index;
 
-import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Future;
 import org.h2.api.ErrorCode;
@@ -433,7 +431,7 @@ public abstract class BaseIndex extends SchemaObjectBase implements Index {
         // No batched lookups supported by default.
         return 0;
     }
-    
+
     @Override
     public List<Future<Cursor>> findBatched(TableFilter filter, List<SearchRow> firstLastPairs) {
         throw DbException.throwInternalError("Must not be called if getPreferedLookupBatchSize() is 0.");

h2/src/main/org/h2/index/Index.java

@@ -5,7 +5,6 @@
  */
 package org.h2.index;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Future;
 import org.h2.engine.Session;
@@ -258,16 +257,16 @@ public interface Index extends SchemaObject {
      * @param sortedInsertMode the new value
      */
     void setSortedInsertMode(boolean sortedInsertMode);
-    
+
     /**
      * If this index can do batched lookups, it may return it's preferred batch size,
      * otherwise it must return 0.
-     * 
+     *
      * @return preferred batch size or 0 if lookup batching is not supported
      * @see #findBatched(TableFilter, Collection)
      */
     int getPreferedLookupBatchSize();
-    
+
     /**
      * Do batched lookup over the given collection of {@link SearchRow} pairs as in
      * {@link #find(TableFilter, SearchRow, SearchRow)}.
@@ -275,9 +274,9 @@ public interface Index extends SchemaObject {
      * Correct implementation must always return number of future cursors equal to
      * {@code firstLastPairs.size() / 2}. Instead of {@link Future} containing empty
      * {@link Cursor} it is possible to put {@code null} in result list.
-     * 
+     *
      * @param filter the table filter
-     * @param firstLastPairs List of batched search row pairs as in 
+     * @param firstLastPairs List of batched search row pairs as in
      *          {@link #find(TableFilter, SearchRow, SearchRow)}, the collection will be reused by H2,
      *          thus it makes sense to defensively copy contents if needed.
      * @return batched cursors for respective search row pairs in the same order

h2/src/main/org/h2/index/MultiVersionIndex.java

@@ -6,8 +6,6 @@
 package org.h2.index;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Future;
 import org.h2.api.ErrorCode;
@@ -394,7 +392,7 @@ public class MultiVersionIndex implements Index {
     public int getPreferedLookupBatchSize() {
         return 0;
     }
-    
+
     @Override
     public List<Future<Cursor>> findBatched(TableFilter filter, List<SearchRow> firstLastPairs) {
         throw DbException.throwInternalError("Must never be called.");