3 files changed, 108 insertions, 0 deletions
diff --git a/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryAnalyzer.java b/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryAnalyzer.java
index 524b532..5861023 100644
--- a/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryAnalyzer.java
+++ b/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryAnalyzer.java
@@ -495,18 +495,36 @@ public class TestIndexedQueryAnalyzer extends TestCase {
             return new ArraySortBuffer<S>();
         }
 
+        public SortBuffer<S> createSortBuffer(Query.Controller controller) {
+            return new ArraySortBuffer<S>();
+        }
+
         public long countAll() {
             throw new UnsupportedOperationException();
         }
 
+        public long countAll(Query.Controller controller) {
+            throw new UnsupportedOperationException();
+        }
+
         public Cursor<S> fetchAll() {
             throw new UnsupportedOperationException();
         }
 
+        public Cursor<S> fetchAll(Query.Controller controller) {
+            throw new UnsupportedOperationException();
+        }
+
         public Cursor<S> fetchOne(StorableIndex<S> index, Object[] identityValues) {
             throw new UnsupportedOperationException();
         }
 
+        public Cursor<S> fetchOne(StorableIndex<S> index, Object[] identityValues,
+                                  Query.Controller controller)
+        {
+            throw new UnsupportedOperationException();
+        }
+
         public Query<?> indexEntryQuery(StorableIndex<S> index) {
             return new EmptyQuery();
         }
@@ -516,6 +534,12 @@ public class TestIndexedQueryAnalyzer extends TestCase {
             throw new UnsupportedOperationException();
         }
 
+        public Cursor<S> fetchFromIndexEntryQuery(StorableIndex<S> index, Query<?> indexEntryQuery,
+                                                  Query.Controller controller)
+        {
+            throw new UnsupportedOperationException();
+        }
+
         public Cursor<S> fetchSubset(StorableIndex<S> index,
                                      Object[] identityValues,
                                      BoundaryType rangeStartBoundary,
@@ -527,5 +551,18 @@ public class TestIndexedQueryAnalyzer extends TestCase {
         {
             throw new UnsupportedOperationException();
         }
+
+        public Cursor<S> fetchSubset(StorableIndex<S> index,
+                                     Object[] identityValues,
+                                     BoundaryType rangeStartBoundary,
+                                     Object rangeStartValue,
+                                     BoundaryType rangeEndBoundary,
+                                     Object rangeEndValue,
+                                     boolean reverseRange,
+                                     boolean reverseOrder,
+                                     Query.Controller controller)
+        {
+            throw new UnsupportedOperationException();
+        }
     }
 }
diff --git a/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryExecutor.java b/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryExecutor.java
index 3b62971..0e59f44 100644
--- a/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryExecutor.java
+++ b/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryExecutor.java
@@ -741,6 +741,12 @@ public class TestIndexedQueryExecutor extends TestCase {
             throw new UnsupportedOperationException();
         }
 
+        public Cursor<S> fetchFromIndexEntryQuery(StorableIndex<S> index, Query<?> indexEntryQuery,
+                                                  Query.Controller controller)
+        {
+            throw new UnsupportedOperationException();
+        }
+
         public Cursor<S> fetchSubset(StorableIndex<S> index,
                                      Object[] identityValues,
                                      BoundaryType rangeStartBoundary,
@@ -761,5 +767,25 @@ public class TestIndexedQueryExecutor extends TestCase {
             Collection<S> empty = Collections.emptyList();
             return new IteratorCursor<S>(empty);
         }
+
+        public Cursor<S> fetchSubset(StorableIndex<S> index,
+                                     Object[] identityValues,
+                                     BoundaryType rangeStartBoundary,
+                                     Object rangeStartValue,
+                                     BoundaryType rangeEndBoundary,
+                                     Object rangeEndValue,
+                                     boolean reverseRange,
+                                     boolean reverseOrder,
+                                     Query.Controller controller)
+        {
+            return fetchSubset(index,
+                               identityValues,
+                               rangeStartBoundary,
+                               rangeStartValue,
+                               rangeEndBoundary,
+                               rangeEndValue,
+                               reverseRange,
+                               reverseOrder);
+        }
     }
 }
diff --git a/src/test/java/com/amazon/carbonado/qe/TestJoinedQueryExecutor.java b/src/test/java/com/amazon/carbonado/qe/TestJoinedQueryExecutor.java
index 4eaad57..b4b97d4 100644
--- a/src/test/java/com/amazon/carbonado/qe/TestJoinedQueryExecutor.java
+++ b/src/test/java/com/amazon/carbonado/qe/TestJoinedQueryExecutor.java
@@ -252,18 +252,36 @@ public class TestJoinedQueryExecutor extends TestQueryExecutor {
             return new ArraySortBuffer<S>();
         }
 
+        public SortBuffer<S> createSortBuffer(Query.Controller controller) {
+            return new ArraySortBuffer<S>();
+        }
+
         public long countAll() {
             throw new UnsupportedOperationException();
         }
 
+        public long countAll(Query.Controller controller) {
+            throw new UnsupportedOperationException();
+        }
+
         public Cursor<S> fetchAll() {
             throw new UnsupportedOperationException();
         }
 
+        public Cursor<S> fetchAll(Query.Controller controller) {
+            throw new UnsupportedOperationException();
+        }
+
         public Cursor<S> fetchOne(StorableIndex<S> index, Object[] identityValues) {
             throw new UnsupportedOperationException();
         }
 
+        public Cursor<S> fetchOne(StorableIndex<S> index, Object[] identityValues,
+                                  Query.Controller controller)
+        {
+            throw new UnsupportedOperationException();
+        }
+
         public Query<?> indexEntryQuery(StorableIndex<S> index) {
             return null;
         }
@@ -273,6 +291,12 @@ public class TestJoinedQueryExecutor extends TestQueryExecutor {
             throw new UnsupportedOperationException();
         }
 
+        public Cursor<S> fetchFromIndexEntryQuery(StorableIndex<S> index, Query<?> indexEntryQuery,
+                                                  Query.Controller controller)
+        {
+            throw new UnsupportedOperationException();
+        }
+
         public Cursor<S> fetchSubset(StorableIndex<S> index,
                                      Object[] identityValues,
                                      BoundaryType rangeStartBoundary,
@@ -284,6 +308,19 @@ public class TestJoinedQueryExecutor extends TestQueryExecutor {
         {
             throw new UnsupportedOperationException();
         }
+
+        public Cursor<S> fetchSubset(StorableIndex<S> index,
+                                     Object[] identityValues,
+                                     BoundaryType rangeStartBoundary,
+                                     Object rangeStartValue,
+                                     BoundaryType rangeEndBoundary,
+                                     Object rangeEndValue,
+                                     boolean reverseRange,
+                                     boolean reverseOrder,
+                                     Query.Controller controller)
+        {
+            throw new UnsupportedOperationException();
+        }
     }
 
     static class ScanQuerySupport<S extends Storable> implements FullScanQueryExecutor.Support<S> {
@@ -301,8 +338,16 @@ public class TestJoinedQueryExecutor extends TestQueryExecutor {
             return mQuery.count();
         }
 
+        public long countAll(Query.Controller controller) throws FetchException {
+            return mQuery.count(controller);
+        }
+
         public Cursor<S> fetchAll() throws FetchException {
             return mQuery.fetch();
         }
+
+        public Cursor<S> fetchAll(Query.Controller controller) throws FetchException {
+            return mQuery.fetch(controller);
+        }
     }
 }