-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1871 from himanshug/backport_1855
backport #1855
- Loading branch information
Showing
6 changed files
with
139 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
processing/src/main/java/io/druid/query/groupby/having/HavingSpecMetricComparator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
processing/src/test/java/io/druid/query/groupby/having/HavingSpecMetricComparatorTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters