Permalink
Browse files

renaming InputFileSizeReducerEstimator to InputSizeReducerEstimator

  • Loading branch information...
1 parent 1b630a2 commit 31dbedc5d6f4b1cfcc232089a269c17d8167915f @billonahill committed Mar 20, 2012
@@ -49,9 +49,7 @@
import org.apache.pig.ComparisonFunc;
import org.apache.pig.ExecType;
import org.apache.pig.LoadFunc;
-import org.apache.pig.LoadMetadata;
import org.apache.pig.PigException;
-import org.apache.pig.ResourceStatistics;
import org.apache.pig.StoreFuncInterface;
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.backend.hadoop.HDataType;
@@ -743,16 +741,16 @@ else if ((tmp = pigContext.getProperties().getProperty("pig.maxCombinedSplitSize
}
/**
-<<<<<<< HEAD
* Looks up the estimator from REDUCER_ESTIMATOR_KEY and invokes it to find the number of
- * reducers to use. If REDUCER_ESTIMATOR_KEY isn't set, defaults to InputFileSizeReducerEstimator
+ * reducers to use. If REDUCER_ESTIMATOR_KEY isn't set, defaults to InputSizeReducerEstimator
* @param conf
* @param lds
* @throws IOException
*/
- static int estimateNumberOfReducers(Configuration conf, List<POLoad> lds, org.apache.hadoop.mapreduce.Job job) throws IOException {
+ static int estimateNumberOfReducers(Configuration conf, List<POLoad> lds,
+ org.apache.hadoop.mapreduce.Job job) throws IOException {
PigReducerEstimator estimator = conf.get(REDUCER_ESTIMATOR_KEY) == null ?
- new InputFileSizeReducerEstimator() :
+ new InputSizeReducerEstimator() :
(PigReducerEstimator)PigContext.instantiateObjectFromParams(
conf, REDUCER_ESTIMATOR_KEY, REDUCER_ESTIMATOR_ARG_KEY);
@@ -28,7 +28,7 @@
* Interface to implement when you want to use a custom approach to estimating
* the number of reducers for a job.
*
- * @see InputFileSizeReducerEstimator
+ * @see InputSizeReducerEstimator
*/
public interface PigReducerEstimator {

0 comments on commit 31dbedc

Please sign in to comment.