Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-09 11:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50 from metamx/postagg-dependencies

Browse Source 
postAggregators now return field dependencies
This commit is contained in:
cheddar 2013-01-03 10:05:14 -08:00
commit 6318abb0bd
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/main/java/com/metamx/druid/query/Queries.java
View File

@ -20,6 +20,7 @@
package com.metamx.druid.query; package com.metamx.druid.query;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@ -58,9 +59,12 @@ public class Queries
); );
for (PostAggregator postAgg : postAggs) { for (PostAggregator postAgg : postAggs) {
Set<String> dependencies = postAgg.getDependentFields();
Set<String> missing = Sets.difference(dependencies, combinedAggNames);
Preconditions.checkArgument( Preconditions.checkArgument(
postAgg.verifyFields(combinedAggNames), missing.isEmpty(),
String.format("Missing field[%s]", postAgg.getName()) "Missing fields [%s] for postAggregator [%s]", missing, postAgg.getName()
); );
combinedAggNames.add(postAgg.getName()); combinedAggNames.add(postAgg.getName());
} }

10
common/src/main/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregator.java
View File

@ -20,6 +20,7 @@
package com.metamx.druid.aggregation.post; package com.metamx.druid.aggregation.post;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.metamx.common.IAE; import com.metamx.common.IAE;
import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonProperty;
@ -69,14 +70,13 @@ public class ArithmeticPostAggregator implements PostAggregator
} }
@Override @Override
public boolean verifyFields(Set<String> fieldNames) public Set<String> getDependentFields()
{ {
Set<String> dependentFields = Sets.newHashSet();
for (PostAggregator field : fields) { for (PostAggregator field : fields) {
if (!field.verifyFields(fieldNames)) { dependentFields.addAll(field.getDependentFields());
return false;
}
} }
return true; return dependentFields;
} }
@Override @Override

5
common/src/main/java/com/metamx/druid/aggregation/post/ConstantPostAggregator.java
View File

@ -19,6 +19,7 @@
package com.metamx.druid.aggregation.post; package com.metamx.druid.aggregation.post;
import com.google.common.collect.Sets;
import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonProperty;
@ -44,9 +45,9 @@ public class ConstantPostAggregator implements PostAggregator
} }
@Override @Override
public boolean verifyFields(Set<String> fields) public Set<String> getDependentFields()
{ {
return true; return Sets.newHashSet();
} }
@Override @Override

5
common/src/main/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregator.java
View File

@ -19,6 +19,7 @@
package com.metamx.druid.aggregation.post; package com.metamx.druid.aggregation.post;
import com.google.common.collect.Sets;
import com.metamx.common.ISE; import com.metamx.common.ISE;
import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonProperty;
@ -45,9 +46,9 @@ public class FieldAccessPostAggregator implements PostAggregator
} }
@Override @Override
public boolean verifyFields(Set<String> fieldNames) public Set<String> getDependentFields()
{ {
return fieldNames.contains(fieldName); return Sets.newHashSet(fieldName);
} }
@Override @Override

2
common/src/main/java/com/metamx/druid/aggregation/post/PostAggregator.java
View File

@ -37,7 +37,7 @@ import java.util.Set;
}) })
public interface PostAggregator public interface PostAggregator
{ {
public boolean verifyFields(Set<String> fieldNames); public Set<String> getDependentFields();
public Comparator getComparator(); public Comparator getComparator();