mirror of https://github.com/apache/druid.git
Merge pull request #2482 from navis/lazy-init-boundfilter
Lazily initialize predicate for bound filter
This commit is contained in:
commit
5aa1164b1a
|
@ -33,6 +33,25 @@ public class BoundFilter extends DimensionPredicateFilter
|
||||||
{
|
{
|
||||||
super(
|
super(
|
||||||
boundDimFilter.getDimension(), new Predicate<String>()
|
boundDimFilter.getDimension(), new Predicate<String>()
|
||||||
|
{
|
||||||
|
private volatile Predicate<String> predicate;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean apply(String input)
|
||||||
|
{
|
||||||
|
return function().apply(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Predicate<String> function()
|
||||||
|
{
|
||||||
|
if (predicate == null) {
|
||||||
|
final Comparator<String> comparator;
|
||||||
|
if (boundDimFilter.isAlphaNumeric()) {
|
||||||
|
comparator = new AlphaNumericTopNMetricSpec(null).getComparator(null, null);
|
||||||
|
} else {
|
||||||
|
comparator = new LexicographicTopNMetricSpec(null).getComparator(null, null);
|
||||||
|
}
|
||||||
|
predicate = new Predicate<String>()
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public boolean apply(String input)
|
public boolean apply(String input)
|
||||||
|
@ -40,13 +59,6 @@ public class BoundFilter extends DimensionPredicateFilter
|
||||||
if (input == null) {
|
if (input == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
Comparator<String> comparator;
|
|
||||||
if (boundDimFilter.isAlphaNumeric()) {
|
|
||||||
comparator = new AlphaNumericTopNMetricSpec(null).getComparator(null, null);
|
|
||||||
} else {
|
|
||||||
comparator = new LexicographicTopNMetricSpec(null).getComparator(null, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
int lowerComparing = 1;
|
int lowerComparing = 1;
|
||||||
int upperComparing = 1;
|
int upperComparing = 1;
|
||||||
if (boundDimFilter.getLower() != null) {
|
if (boundDimFilter.getLower() != null) {
|
||||||
|
@ -56,7 +68,7 @@ public class BoundFilter extends DimensionPredicateFilter
|
||||||
upperComparing = comparator.compare(boundDimFilter.getUpper(), input);
|
upperComparing = comparator.compare(boundDimFilter.getUpper(), input);
|
||||||
}
|
}
|
||||||
if (boundDimFilter.isLowerStrict() && boundDimFilter.isUpperStrict()) {
|
if (boundDimFilter.isLowerStrict() && boundDimFilter.isUpperStrict()) {
|
||||||
return ((lowerComparing > 0)) && ( upperComparing > 0);
|
return ((lowerComparing > 0)) && (upperComparing > 0);
|
||||||
} else if (boundDimFilter.isLowerStrict()) {
|
} else if (boundDimFilter.isLowerStrict()) {
|
||||||
return (lowerComparing > 0) && (upperComparing >= 0);
|
return (lowerComparing > 0) && (upperComparing >= 0);
|
||||||
} else if (boundDimFilter.isUpperStrict()) {
|
} else if (boundDimFilter.isUpperStrict()) {
|
||||||
|
@ -64,6 +76,10 @@ public class BoundFilter extends DimensionPredicateFilter
|
||||||
}
|
}
|
||||||
return (lowerComparing >= 0) && (upperComparing >= 0);
|
return (lowerComparing >= 0) && (upperComparing >= 0);
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return predicate;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue