diff options
Diffstat (limited to 'src/main/java/com/amazon/carbonado/repo')
3 files changed, 4 insertions, 32 deletions
diff --git a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java index 246a433..dbd6e4f 100644 --- a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java +++ b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java @@ -41,7 +41,6 @@ import com.amazon.carbonado.Trigger; import com.amazon.carbonado.capability.IndexInfo;
import com.amazon.carbonado.capability.IndexInfoCapability;
-import com.amazon.carbonado.cursor.ArraySortBuffer;
import com.amazon.carbonado.cursor.MergeSortBuffer;
import com.amazon.carbonado.filter.Filter;
@@ -81,8 +80,6 @@ class IndexedStorage<S extends Storable> implements Storage<S>, StorageAccess<S> private final QueryEngine<S> mQueryEngine;
- private Storage<S> mRootStorage;
-
@SuppressWarnings("unchecked")
IndexedStorage(IndexedRepository repository, Storage<S> masterStorage)
throws RepositoryException
@@ -404,18 +401,7 @@ class IndexedStorage<S extends Storable> implements Storage<S>, StorageAccess<S> }
public SortBuffer<S> createSortBuffer() {
- // FIXME: This is messy. If Storables had built-in serialization
- // support, then MergeSortBuffer would not need a root storage.
- if (mRootStorage == null) {
- try {
- mRootStorage = mRepository.getRootRepository().storageFor(getStorableType());
- } catch (RepositoryException e) {
- LogFactory.getLog(IndexedStorage.class).warn(null, e);
- return new ArraySortBuffer<S>();
- }
- }
-
- return new MergeSortBuffer<S>(mRootStorage);
+ return new MergeSortBuffer<S>();
}
public long countAll() throws FetchException {
diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java index 598f9f6..54ff24a 100644 --- a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java +++ b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java @@ -472,9 +472,9 @@ class JDBCStorage<S extends Storable> extends StandardQueryFactory<S> }
if (remainderOrdering != null && remainderOrdering.size() > 0) {
- // FIXME: use MergeSortBuffer
executor = new SortedQueryExecutor<S>
- (null, executor, sqlOrdering, remainderOrdering);
+ (new SortedQueryExecutor.MergeSortSupport(),
+ executor, sqlOrdering, remainderOrdering);
}
return executor;
diff --git a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBStorage.java b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBStorage.java index 126e40f..6c4d4e0 100644 --- a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBStorage.java +++ b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBStorage.java @@ -42,7 +42,6 @@ import com.amazon.carbonado.UniqueConstraintException; import com.amazon.carbonado.capability.IndexInfo;
-import com.amazon.carbonado.cursor.ArraySortBuffer;
import com.amazon.carbonado.cursor.EmptyCursor;
import com.amazon.carbonado.cursor.MergeSortBuffer;
import com.amazon.carbonado.cursor.SingletonCursor;
@@ -119,8 +118,6 @@ abstract class BDBStorage<Txn, S extends Storable> implements Storage<S>, Storag /** Reference to query engine, defined later in this class */
private QueryEngine<S> mQueryEngine;
- private Storage<S> mRootStorage;
-
final TriggerManager<S> mTriggerManager;
/**
@@ -260,18 +257,7 @@ abstract class BDBStorage<Txn, S extends Storable> implements Storage<S>, Storag }
public SortBuffer<S> createSortBuffer() {
- // FIXME: This is messy. If Storables had built-in serialization
- // support, then MergeSortBuffer would not need a root storage.
- if (mRootStorage == null) {
- try {
- mRootStorage = mRepository.getRootRepository().storageFor(getStorableType());
- } catch (RepositoryException e) {
- LogFactory.getLog(BDBStorage.class).warn(null, e);
- return new ArraySortBuffer<S>();
- }
- }
-
- return new MergeSortBuffer<S>(mRootStorage);
+ return new MergeSortBuffer<S>();
}
public long countAll() throws FetchException {
|