Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

making [GreaterThan,LessThan,Equals] HavingSpecs more robust by carefully using long vs float for comparison

This commit is contained in:
Himanshu Gupta 2015-10-23 16:20:48 -05:00
parent f88d59b5c0
commit a71c7270b9
6 changed files with 136 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
processing/src/main/java/io/druid/query/groupby/having/EqualToHavingSpec.java
View File

@ -62,9 +62,7 @@ public class EqualToHavingSpec implements HavingSpec
@Override
public boolean eval(Row row)
{
float metricValue = row.getFloatMetric(aggregationName);
return Float.compare(value.floatValue(), metricValue) == 0;
return HavingSpecMetricComparator.compare(row, aggregationName, value) == 0;
}
@Override

4
processing/src/main/java/io/druid/query/groupby/having/GreaterThanHavingSpec.java
View File

@ -62,9 +62,7 @@ public class GreaterThanHavingSpec implements HavingSpec
@Override
public boolean eval(Row row)
{
float metricValue = row.getFloatMetric(aggregationName);
return Float.compare(metricValue, value.floatValue()) > 0;
return HavingSpecMetricComparator.compare(row, aggregationName, value) > 0;
}
@Override

53
processing/src/main/java/io/druid/query/groupby/having/HavingSpecMetricComparator.java Normal file
View File

@ -0,0 +1,53 @@
/*
* Licensed to Metamarkets Group Inc. (Metamarkets) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Metamarkets licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package io.druid.query.groupby.having;
import com.google.common.primitives.Floats;
import com.google.common.primitives.Longs;
import io.druid.data.input.Row;
import java.util.regex.Pattern;
/**
*/
class HavingSpecMetricComparator
{
static final Pattern LONG_PAT = Pattern.compile("[-|+]?\\d+");
static int compare(Row row, String aggregationName, Number value)
{
Object metricValueObj = row.getRaw(aggregationName);
if (metricValueObj != null) {
if (metricValueObj instanceof Long) {
long l = ((Long) metricValueObj).longValue();
return Longs.compare(l, value.longValue());
} else if (metricValueObj instanceof String) {
String metricValueStr = (String) metricValueObj;
if (LONG_PAT.matcher(metricValueStr).matches()) {
long l = row.getLongMetric(aggregationName);
return Longs.compare(l, value.longValue());
}
}
}
float f = row.getFloatMetric(aggregationName);
return Floats.compare(f, value.floatValue());
}
}

4
processing/src/main/java/io/druid/query/groupby/having/LessThanHavingSpec.java
View File

@ -60,9 +60,7 @@ public class LessThanHavingSpec implements HavingSpec
@Override
public boolean eval(Row row)
{
float metricValue = row.getFloatMetric(aggregationName);
return Float.compare(metricValue, value.floatValue()) < 0;
return HavingSpecMetricComparator.compare(row, aggregationName, value) < 0;
}
@Override

44
processing/src/test/java/io/druid/query/groupby/having/HavingSpecMetricComparatorTest.java Normal file
View File

@ -0,0 +1,44 @@
/*
* Licensed to Metamarkets Group Inc. (Metamarkets) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Metamarkets licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package io.druid.query.groupby.having;
import org.junit.Assert;
import org.junit.Test;
/**
*/
public class HavingSpecMetricComparatorTest
{
@Test
public void testLongRegex()
{
Assert.assertTrue(HavingSpecMetricComparator.LONG_PAT.matcher("1").matches());
Assert.assertTrue(HavingSpecMetricComparator.LONG_PAT.matcher("12").matches());
Assert.assertFalse(HavingSpecMetricComparator.LONG_PAT.matcher("1.").matches());
Assert.assertFalse(HavingSpecMetricComparator.LONG_PAT.matcher("1.2").matches());
Assert.assertFalse(HavingSpecMetricComparator.LONG_PAT.matcher("1.23").matches());
Assert.assertFalse(HavingSpecMetricComparator.LONG_PAT.matcher("1E5").matches());
Assert.assertFalse(HavingSpecMetricComparator.LONG_PAT.matcher("1.23E5").matches());
Assert.assertFalse(HavingSpecMetricComparator.LONG_PAT.matcher("").matches());
Assert.assertFalse(HavingSpecMetricComparator.LONG_PAT.matcher("xyz").matches());
}
}

65
processing/src/test/java/io/druid/query/groupby/having/HavingSpecTest.java
View File

@ -20,7 +20,6 @@ package io.druid.query.groupby.having;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import io.druid.data.input.MapBasedInputRow;
import io.druid.data.input.Row;
import io.druid.jackson.DefaultObjectMapper;
@ -88,46 +87,54 @@ public class HavingSpecTest
@Test
public void testGreaterThanHavingSpec() {
GreaterThanHavingSpec spec = new GreaterThanHavingSpec("metric", 10.003);
assertFalse(spec.eval(ROW));
GreaterThanHavingSpec spec = new GreaterThanHavingSpec("metric", Long.valueOf(Long.MAX_VALUE - 10));
assertFalse(spec.eval(getTestRow(Long.valueOf(Long.MAX_VALUE - 10))));
assertFalse(spec.eval(getTestRow(Long.valueOf(Long.MAX_VALUE - 15))));
assertTrue(spec.eval(getTestRow(Long.valueOf(Long.MAX_VALUE - 5))));
assertTrue(spec.eval(getTestRow(String.valueOf(Long.MAX_VALUE - 5))));
assertFalse(spec.eval(getTestRow(100.05f)));
spec = new GreaterThanHavingSpec("metric", 10);
assertFalse(spec.eval(ROW));
spec = new GreaterThanHavingSpec("metric", 9);
assertTrue(spec.eval(ROW));
}
private MapBasedInputRow makeRow(long ts, String dim, int value)
{
List<String> dimensions = Lists.newArrayList(dim);
Map<String, Object> metrics = ImmutableMap.of("metric", (Object) Float.valueOf(value));
return new MapBasedInputRow(ts, dimensions, metrics);
spec = new GreaterThanHavingSpec("metric", 100.56f);
assertFalse(spec.eval(getTestRow(100.56f)));
assertFalse(spec.eval(getTestRow(90.53f)));
assertFalse(spec.eval(getTestRow("90.53f")));
assertTrue(spec.eval(getTestRow(101.34f)));
assertTrue(spec.eval(getTestRow(Long.MAX_VALUE)));
}
@Test
public void testLessThanHavingSpec() {
LessThanHavingSpec spec = new LessThanHavingSpec("metric", 10);
assertFalse(spec.eval(ROW));
LessThanHavingSpec spec = new LessThanHavingSpec("metric", Long.valueOf(Long.MAX_VALUE - 10));
assertFalse(spec.eval(getTestRow(Long.valueOf(Long.MAX_VALUE - 10))));
assertTrue(spec.eval(getTestRow(Long.valueOf(Long.MAX_VALUE - 15))));
assertTrue(spec.eval(getTestRow(String.valueOf(Long.MAX_VALUE - 15))));
assertFalse(spec.eval(getTestRow(Long.valueOf(Long.MAX_VALUE - 5))));
assertTrue(spec.eval(getTestRow(100.05f)));
spec = new LessThanHavingSpec("metric", 11);
assertTrue(spec.eval(ROW));
spec = new LessThanHavingSpec("metric", 100.56f);
assertFalse(spec.eval(getTestRow(100.56f)));
assertTrue(spec.eval(getTestRow(90.53f)));
assertFalse(spec.eval(getTestRow(101.34f)));
assertFalse(spec.eval(getTestRow("101.34f")));
assertFalse(spec.eval(getTestRow(Long.MAX_VALUE)));
}
spec = new LessThanHavingSpec("metric", 9);
assertFalse(spec.eval(ROW));
private Row getTestRow(Object metricValue)
{
return new MapBasedInputRow(0, new ArrayList<String>(), ImmutableMap.of("metric", metricValue));
}
@Test
public void testEqualHavingSpec() {
EqualToHavingSpec spec = new EqualToHavingSpec("metric", 10);
assertTrue(spec.eval(ROW));
EqualToHavingSpec spec = new EqualToHavingSpec("metric", Long.valueOf(Long.MAX_VALUE - 10));
assertTrue(spec.eval(getTestRow(Long.valueOf(Long.MAX_VALUE - 10))));
assertFalse(spec.eval(getTestRow(Long.valueOf(Long.MAX_VALUE - 5))));
assertFalse(spec.eval(getTestRow(100.05f)));
spec = new EqualToHavingSpec("metric", 9);
assertFalse(spec.eval(ROW));
spec = new EqualToHavingSpec("metric", 11);
assertFalse(spec.eval(ROW));
spec = new EqualToHavingSpec("metric", 100.56f);
assertTrue(spec.eval(getTestRow(100.56f)));
assertFalse(spec.eval(getTestRow(90.53f)));
assertFalse(spec.eval(getTestRow(Long.MAX_VALUE)));
}
private static class CountingHavingSpec implements HavingSpec {