summaryrefslogtreecommitdiff
path: root/src/main/java/com/amazon/carbonado/qe
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/amazon/carbonado/qe')
-rw-r--r--src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java
index d947ed7..b1d47e9 100644
--- a/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java
+++ b/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java
@@ -395,7 +395,12 @@ public class JoinedQueryExecutor<S extends Storable, T extends Storable>
private static <T extends Storable> OrderingList<T>
expectedOrdering(StorageAccess<T> access, Filter<T> filter, OrderingList<T> ordering)
{
- List<Filter<T>> split = filter.disjunctiveNormalFormSplit();
+ List<Filter<T>> split;
+ if (filter == null) {
+ split = Filter.getOpenFilter(access.getStorableType()).disjunctiveNormalFormSplit();
+ } else {
+ split = filter.disjunctiveNormalFormSplit();
+ }
Comparator comparator = CompositeScore.fullComparator();