rename method

processing/src/main/java/io/druid/query/aggregation/AggregatorFactory.java

@@ -65,11 +65,11 @@ public interface AggregatorFactory
   public AggregatorFactory getCombiningFactory();
 
   /**
-   * Gets a list of aggregator factories using the actual column names of the data
+   * Gets a list of all columns that this AggregatorFactory will scan
    *
-   * @return Base AggregatorFactories for different fields of this AggregatorFactory
+   * @return AggregatorFactories for the columns to scan of the parent AggregatorFactory
    */
-  public List<AggregatorFactory> getBaseFactories();
+  public List<AggregatorFactory> getRequiredColumns();
 
   /**
    * A method that knows how to "deserialize" the object from whatever form it might have been put into

processing/src/main/java/io/druid/query/aggregation/CountAggregatorFactory.java

@@ -78,7 +78,7 @@ public class CountAggregatorFactory implements AggregatorFactory
   }
 
   @Override
-  public List<AggregatorFactory> getBaseFactories()
+  public List<AggregatorFactory> getRequiredColumns()
   {
     return Arrays.<AggregatorFactory>asList(new CountAggregatorFactory(name));
   }

processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java

@@ -86,7 +86,7 @@ public class DoubleSumAggregatorFactory implements AggregatorFactory
   }
 
   @Override
-  public List<AggregatorFactory> getBaseFactories()
+  public List<AggregatorFactory> getRequiredColumns()
   {
     return Arrays.<AggregatorFactory>asList(new DoubleSumAggregatorFactory(fieldName, fieldName));
   }

processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java

@@ -101,7 +101,7 @@ public class HistogramAggregatorFactory implements AggregatorFactory
   }
 
   @Override
-  public List<AggregatorFactory> getBaseFactories()
+  public List<AggregatorFactory> getRequiredColumns()
   {
     return Arrays.<AggregatorFactory>asList(new HistogramAggregatorFactory(fieldName, fieldName, breaksList));
   }

processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java

@@ -141,7 +141,7 @@ public class JavaScriptAggregatorFactory implements AggregatorFactory
   }
 
   @Override
-  public List<AggregatorFactory> getBaseFactories()
+  public List<AggregatorFactory> getRequiredColumns()
   {
     return Lists.transform(
         fieldNames,

processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java

@@ -86,7 +86,7 @@ public class LongSumAggregatorFactory implements AggregatorFactory
   }
 
   @Override
-  public List<AggregatorFactory> getBaseFactories()
+  public List<AggregatorFactory> getRequiredColumns()
   {
     return Arrays.<AggregatorFactory>asList(new LongSumAggregatorFactory(fieldName, fieldName));
   }

processing/src/main/java/io/druid/query/aggregation/MaxAggregatorFactory.java

@@ -83,7 +83,7 @@ public class MaxAggregatorFactory implements AggregatorFactory
   }
 
   @Override
-  public List<AggregatorFactory> getBaseFactories()
+  public List<AggregatorFactory> getRequiredColumns()
   {
     return Arrays.<AggregatorFactory>asList(new MaxAggregatorFactory(fieldName, fieldName));
   }

processing/src/main/java/io/druid/query/aggregation/MinAggregatorFactory.java

@@ -83,7 +83,7 @@ public class MinAggregatorFactory implements AggregatorFactory
   }
 
   @Override
-  public List<AggregatorFactory> getBaseFactories()
+  public List<AggregatorFactory> getRequiredColumns()
   {
     return Arrays.<AggregatorFactory>asList(new MinAggregatorFactory(fieldName, fieldName));
   }

processing/src/main/java/io/druid/query/aggregation/ToLowerCaseAggregatorFactory.java

@@ -66,9 +66,9 @@ public class ToLowerCaseAggregatorFactory implements AggregatorFactory
   }
 
   @Override
-  public List<AggregatorFactory> getBaseFactories()
+  public List<AggregatorFactory> getRequiredColumns()
   {
-    return baseAggregatorFactory.getBaseFactories();
+    return baseAggregatorFactory.getRequiredColumns();
   }
 
   @Override

processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java

@@ -147,7 +147,7 @@ public class CardinalityAggregatorFactory implements AggregatorFactory
   }
 
   @Override
-  public List<AggregatorFactory> getBaseFactories()
+  public List<AggregatorFactory> getRequiredColumns()
   {
     return Lists.transform(
         fieldNames,

processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java

@@ -132,7 +132,7 @@ public class HyperUniquesAggregatorFactory implements AggregatorFactory
   }
 
   @Override
-  public List<AggregatorFactory> getBaseFactories()
+  public List<AggregatorFactory> getRequiredColumns()
   {
     return Arrays.<AggregatorFactory>asList(new HyperUniquesAggregatorFactory(fieldName, fieldName));
   }

processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java

@@ -111,7 +111,7 @@ public class GroupByQueryQueryToolChest extends QueryToolChest<Row, GroupByQuery
       final Sequence<Row> subqueryResult = mergeGroupByResults(subquery, runner);
       final List<AggregatorFactory> aggs = Lists.newArrayList();
       for (AggregatorFactory aggregatorFactory : query.getAggregatorSpecs()) {
-        aggs.addAll(aggregatorFactory.getBaseFactories());
+        aggs.addAll(aggregatorFactory.getRequiredColumns());
       }
 
       // We need the inner incremental index to have all the columns required by the outer query