diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroParquetInputFormat.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroParquetInputFormat.java index ce625f20ed..28c9480595 100644 --- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroParquetInputFormat.java +++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroParquetInputFormat.java @@ -21,7 +21,6 @@ import org.apache.avro.Schema; import org.apache.hadoop.mapreduce.Job; import org.apache.parquet.hadoop.ParquetInputFormat; -import org.apache.parquet.hadoop.util.ContextUtil; /** * A Hadoop {@link org.apache.hadoop.mapreduce.InputFormat} for Parquet files. @@ -53,7 +52,7 @@ public AvroParquetInputFormat() { * @see org.apache.parquet.avro.AvroParquetOutputFormat#setSchema(org.apache.hadoop.mapreduce.Job, org.apache.avro.Schema) */ public static void setRequestedProjection(Job job, Schema requestedProjection) { - AvroReadSupport.setRequestedProjection(ContextUtil.getConfiguration(job), requestedProjection); + AvroReadSupport.setRequestedProjection(job.getConfiguration(), requestedProjection); } /** @@ -69,7 +68,7 @@ public static void setRequestedProjection(Job job, Schema requestedProjection) { * @see org.apache.parquet.avro.AvroParquetOutputFormat#setSchema(org.apache.hadoop.mapreduce.Job, org.apache.avro.Schema) */ public static void setAvroReadSchema(Job job, Schema avroReadSchema) { - AvroReadSupport.setAvroReadSchema(ContextUtil.getConfiguration(job), avroReadSchema); + AvroReadSupport.setAvroReadSchema(job.getConfiguration(), avroReadSchema); } /** @@ -81,6 +80,6 @@ public static void setAvroReadSchema(Job job, Schema avroReadSchema) { * @param supplierClass an avro data supplier class */ public static void setAvroDataSupplier(Job job, Class supplierClass) { - AvroReadSupport.setAvroDataSupplier(ContextUtil.getConfiguration(job), supplierClass); + AvroReadSupport.setAvroDataSupplier(job.getConfiguration(), supplierClass); } } diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroParquetOutputFormat.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroParquetOutputFormat.java index de80be5aa4..10453aeb41 100644 --- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroParquetOutputFormat.java +++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroParquetOutputFormat.java @@ -21,7 +21,6 @@ import org.apache.avro.Schema; import org.apache.hadoop.mapreduce.Job; import org.apache.parquet.hadoop.ParquetOutputFormat; -import org.apache.parquet.hadoop.util.ContextUtil; /** * A Hadoop {@link org.apache.hadoop.mapreduce.OutputFormat} for Parquet files. @@ -39,7 +38,7 @@ public class AvroParquetOutputFormat extends ParquetOutputFormat { * @see org.apache.parquet.avro.AvroParquetInputFormat#setAvroReadSchema(org.apache.hadoop.mapreduce.Job, org.apache.avro.Schema) */ public static void setSchema(Job job, Schema schema) { - AvroWriteSupport.setSchema(ContextUtil.getConfiguration(job), schema); + AvroWriteSupport.setSchema(job.getConfiguration(), schema); } public AvroParquetOutputFormat() { @@ -55,6 +54,6 @@ public AvroParquetOutputFormat() { * @param supplierClass a supplier class */ public static void setAvroDataSupplier(Job job, Class supplierClass) { - AvroWriteSupport.setAvroDataSupplier(ContextUtil.getConfiguration(job), supplierClass); + AvroWriteSupport.setAvroDataSupplier(job.getConfiguration(), supplierClass); } } diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetInputFormat.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetInputFormat.java index 288e1d241e..784a7d1695 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetInputFormat.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetInputFormat.java @@ -64,7 +64,6 @@ import org.apache.parquet.hadoop.metadata.GlobalMetaData; import org.apache.parquet.hadoop.metadata.ParquetMetadata; import org.apache.parquet.hadoop.util.ConfigurationUtil; -import org.apache.parquet.hadoop.util.ContextUtil; import org.apache.parquet.hadoop.util.HiddenFileFilter; import org.apache.parquet.hadoop.util.SerializationUtil; import org.apache.parquet.io.ParquetDecodingException; @@ -173,7 +172,7 @@ public class ParquetInputFormat extends FileInputFormat { public static final boolean HADOOP_VECTORED_IO_DEFAULT = true; public static void setTaskSideMetaData(Job job, boolean taskSideMetadata) { - ContextUtil.getConfiguration(job).setBoolean(TASK_SIDE_METADATA, taskSideMetadata); + job.getConfiguration().setBoolean(TASK_SIDE_METADATA, taskSideMetadata); } public static boolean isTaskSideMetaData(Configuration configuration) { @@ -181,11 +180,11 @@ public static boolean isTaskSideMetaData(Configuration configuration) { } public static void setReadSupportClass(Job job, Class readSupportClass) { - ContextUtil.getConfiguration(job).set(READ_SUPPORT_CLASS, readSupportClass.getName()); + job.getConfiguration().set(READ_SUPPORT_CLASS, readSupportClass.getName()); } public static void setUnboundRecordFilter(Job job, Class filterClass) { - Configuration conf = ContextUtil.getConfiguration(job); + Configuration conf = job.getConfiguration(); checkArgument( getFilterPredicate(conf) == null, "You cannot provide an UnboundRecordFilter after providing a FilterPredicate"); @@ -295,7 +294,7 @@ public > ParquetInputFormat(Class readSupportClass) @Override public RecordReader createRecordReader(InputSplit inputSplit, TaskAttemptContext taskAttemptContext) throws IOException, InterruptedException { - Configuration conf = ContextUtil.getConfiguration(taskAttemptContext); + Configuration conf = taskAttemptContext.getConfiguration(); ReadSupport readSupport = getReadSupport(conf); return new ParquetRecordReader(readSupport, getFilter(conf)); } @@ -340,7 +339,7 @@ static ReadSupport getReadSupportInstance(Class> @Override protected boolean isSplitable(JobContext context, Path filename) { - return ContextUtil.getConfiguration(context).getBoolean(SPLIT_FILES, true); + return context.getConfiguration().getBoolean(SPLIT_FILES, true); } /** @@ -348,7 +347,7 @@ protected boolean isSplitable(JobContext context, Path filename) { */ @Override public List getSplits(JobContext jobContext) throws IOException { - Configuration configuration = ContextUtil.getConfiguration(jobContext); + Configuration configuration = jobContext.getConfiguration(); List splits = new ArrayList(); if (isTaskSideMetaData(configuration)) { @@ -396,7 +395,7 @@ public List getSplits(Configuration configuration, List listStatus(JobContext jobContext) throws IOException { - return getAllFileRecursively(super.listStatus(jobContext), ContextUtil.getConfiguration(jobContext)); + return getAllFileRecursively(super.listStatus(jobContext), jobContext.getConfiguration()); } private static List getAllFileRecursively(List files, Configuration conf) @@ -436,7 +435,7 @@ public List