diff options
author | Brian S. O'Neill <bronee@gmail.com> | 2006-09-04 06:01:57 +0000 |
---|---|---|
committer | Brian S. O'Neill <bronee@gmail.com> | 2006-09-04 06:01:57 +0000 |
commit | b523f10dcac0a265edfd74ce78d83bf079ead8da (patch) | |
tree | 4ab3a8a21e1670542215dbbb6548dc1b412f1f64 /src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java | |
parent | d88b8c7708cdf8c4fb1ec78371490f282d5f945e (diff) |
More progress on union analysis.
Diffstat (limited to 'src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java')
-rw-r--r-- | src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java b/src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java index 23ec0d1..76fb5f5 100644 --- a/src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java +++ b/src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java @@ -412,17 +412,23 @@ public class IndexedQueryAnalyzer<S extends Storable> { /**
* Merges the remainder filter of this result with the given filter,
* returning a new result. If handlesAnything return true, then it
- * doesn't make sense to call this method.
+ * doesn't usually make sense to call this method.
*/
- public Result mergeRemainder(Filter<S> filter) {
+ public Result mergeRemainderFilter(Filter<S> filter) {
Filter<S> remainderFilter = getRemainderFilter();
if (remainderFilter == null) {
remainderFilter = filter;
} else if (filter != null) {
remainderFilter = remainderFilter.or(filter);
}
+ return setRemainderFilter(remainderFilter);
+ }
- return new Result(this, remainderFilter, getRemainderOrderings());
+ /**
+ * Returns a new result with the remainder filter replaced.
+ */
+ public Result setRemainderFilter(Filter<S> filter) {
+ return new Result(this, filter, getRemainderOrderings());
}
private boolean equals(Object a, Object b) {
|