From 36c23fee82392014557ff06d4cf7ca42db39f2d3 Mon Sep 17 00:00:00 2001
From: "Brian S. O'Neill" <bronee@gmail.com>
Date: Mon, 7 Apr 2008 01:16:19 +0000
Subject: Clean up use of MergeSortBuffer.

---
 .../amazon/carbonado/qe/SortedQueryExecutor.java   | 36 +++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/amazon/carbonado/qe')

diff --git a/src/main/java/com/amazon/carbonado/qe/SortedQueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/SortedQueryExecutor.java
index 5419fe6..8202301 100644
--- a/src/main/java/com/amazon/carbonado/qe/SortedQueryExecutor.java
+++ b/src/main/java/com/amazon/carbonado/qe/SortedQueryExecutor.java
@@ -27,6 +27,7 @@ import com.amazon.carbonado.FetchException;
 import com.amazon.carbonado.Storable;
 
 import com.amazon.carbonado.cursor.ArraySortBuffer;
+import com.amazon.carbonado.cursor.MergeSortBuffer;
 import com.amazon.carbonado.cursor.SortBuffer;
 import com.amazon.carbonado.cursor.SortedCursor;
 
@@ -62,8 +63,12 @@ public class SortedQueryExecutor<S extends Storable> extends AbstractQueryExecut
                                OrderingList<S> handledOrdering,
                                OrderingList<S> remainderOrdering)
     {
-        if (support == null && this instanceof Support) {
-            support = (Support<S>) this;
+        if (support == null) {
+            if (this instanceof Support) {
+                support = (Support<S>) this;
+            } else {
+                support = new ArraySortSupport<S>();
+            }
         }
         if (executor == null) {
             throw new IllegalArgumentException();
@@ -97,8 +102,7 @@ public class SortedQueryExecutor<S extends Storable> extends AbstractQueryExecut
 
     public Cursor<S> fetch(FilterValues<S> values) throws FetchException {
         Cursor<S> cursor = mExecutor.fetch(values);
-        SortBuffer<S> buffer =
-            mSupport == null ? new ArraySortBuffer<S>() : mSupport.createSortBuffer();
+        SortBuffer<S> buffer = mSupport.createSortBuffer();
         return new SortedCursor<S>(cursor, buffer, mHandledComparator, mFinisherComparator);
     }
 
@@ -149,4 +153,28 @@ public class SortedQueryExecutor<S extends Storable> extends AbstractQueryExecut
          */
         SortBuffer<S> createSortBuffer();
     }
+
+    /**
+     * @since 1.2
+     */
+    public static class ArraySortSupport<S extends Storable> implements Support<S> {
+        /**
+         * Returns a new ArraySortBuffer.
+         */
+        public SortBuffer<S> createSortBuffer() {
+            return new ArraySortBuffer<S>();
+        }
+    }
+
+    /**
+     * @since 1.2
+     */
+    public static class MergeSortSupport<S extends Storable> implements Support<S> {
+        /**
+         * Returns a new MergeSortBuffer.
+         */
+        public SortBuffer<S> createSortBuffer() {
+            return new MergeSortBuffer<S>();
+        }
+    }
 }
-- 
cgit v1.2.3