Check before conversion
@@ -449,16 +449,15 @@ public final class OCellBTreeMultiValueIndexEngine
rangeFrom, fromInclusive, rangeTo, toInclusive, ascSortOrder);
}
assert svTree != null;
- final OCompositeKey fromKey = convertToCompositeKey(rangeFrom);
- final OCompositeKey toKey = convertToCompositeKey(rangeTo);
- if (toKey == null || (toKey.getKeys().size() == 1 && toKey.getKeys().get(0) == null)) {
+ final OCompositeKey fromKey = convertToCompositeKey(rangeFrom);
+ if (rangeTo == null) {
return mapSVStream(svTree.iterateEntriesMajor(fromKey, fromInclusive, ascSortOrder));
- } else {
+ }
+ final OCompositeKey toKey = convertToCompositeKey(rangeTo);
return mapSVStream(
svTree.iterateEntriesBetween(fromKey, fromInclusive, toKey, toInclusive, ascSortOrder));
}
- }
private static OCompositeKey convertToCompositeKey(Object rangeFrom) {
OCompositeKey firstKey;
