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

Merge pull request #1275 from infynyxx/update_deprecated_job_initialization 

use Job.getInstance() to fix deprecated warnings
This commit is contained in:
Xavier Léauté 2015-04-09 15:07:49 -07:00
parent a053e90e97 3044bf5592
commit 700dc6fbc0
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java
View File

@ -46,8 +46,6 @@ import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Partitioner; import org.apache.hadoop.mapreduce.Partitioner;
import org.apache.hadoop.mapreduce.Reducer; import org.apache.hadoop.mapreduce.Reducer;
import org.apache.hadoop.mapreduce.lib.input.CombineTextInputFormat;
import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat; import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat;
import org.joda.time.DateTime; import org.joda.time.DateTime;
@ -84,7 +82,7 @@ public class DetermineHashedPartitionsJob implements Jobby
* in the final segment. * in the final segment.
*/ */
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
final Job groupByJob = new Job( final Job groupByJob = Job.getInstance(
new Configuration(), new Configuration(),
String.format("%s-determine_partitions_hashed-%s", config.getDataSource(), config.getIntervals()) String.format("%s-determine_partitions_hashed-%s", config.getDataSource(), config.getIntervals())
); );

4
indexing-hadoop/src/main/java/io/druid/indexer/DeterminePartitionsJob.java
View File

@ -121,7 +121,7 @@ public class DeterminePartitionsJob implements Jobby
} }
if (!config.getPartitionsSpec().isAssumeGrouped()) { if (!config.getPartitionsSpec().isAssumeGrouped()) {
final Job groupByJob = new Job( final Job groupByJob = Job.getInstance(
new Configuration(), new Configuration(),
String.format("%s-determine_partitions_groupby-%s", config.getDataSource(), config.getIntervals()) String.format("%s-determine_partitions_groupby-%s", config.getDataSource(), config.getIntervals())
); );
@ -157,7 +157,7 @@ public class DeterminePartitionsJob implements Jobby
/* /*
* Read grouped data and determine appropriate partitions. * Read grouped data and determine appropriate partitions.
*/ */
final Job dimSelectionJob = new Job( final Job dimSelectionJob = Job.getInstance(
new Configuration(), new Configuration(),
String.format("%s-determine_partitions_dimselection-%s", config.getDataSource(), config.getIntervals()) String.format("%s-determine_partitions_dimselection-%s", config.getDataSource(), config.getIntervals())
); );

2
indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java
View File

@ -152,7 +152,7 @@ public class IndexGeneratorJob implements Jobby
public boolean run() public boolean run()
{ {
try { try {
Job job = new Job( Job job = Job.getInstance(
new Configuration(), new Configuration(),
String.format("%s-index-generator-%s", config.getDataSource(), config.getIntervals()) String.format("%s-index-generator-%s", config.getDataSource(), config.getIntervals())
); );

2
indexing-hadoop/src/main/java/io/druid/indexer/JobHelper.java
View File

@ -112,7 +112,7 @@ public class JobHelper
{ {
// config.addInputPaths() can have side-effects ( boo! :( ), so this stuff needs to be done before anything else // config.addInputPaths() can have side-effects ( boo! :( ), so this stuff needs to be done before anything else
try { try {
Job job = new Job( Job job = Job.getInstance(
new Configuration(), new Configuration(),
String.format("%s-determine_partitions-%s", config.getDataSource(), config.getIntervals()) String.format("%s-determine_partitions-%s", config.getDataSource(), config.getIntervals())
); );

2
indexing-hadoop/src/test/java/io/druid/indexer/path/StaticPathSpecTest.java
View File

@ -60,7 +60,7 @@ public class StaticPathSpecTest
StaticPathSpec pathSpec = (StaticPathSpec)jsonMapper.readValue(sb.toString(), PathSpec.class); StaticPathSpec pathSpec = (StaticPathSpec)jsonMapper.readValue(sb.toString(), PathSpec.class);
Assert.assertEquals(inputFormat, pathSpec.getInputFormat()); Assert.assertEquals(inputFormat, pathSpec.getInputFormat());
Job job = new Job(); Job job = Job.getInstance();
pathSpec.addInputPaths(null, job); pathSpec.addInputPaths(null, job);
Assert.assertEquals( Assert.assertEquals(
"file:" + path, "file:" + path,