Skip to content

Commit d4aa8bb

Browse files
pjfanningpjfanning
committed
HADOOP-18950. Use shaded avro jar
replace org.apache.avro in generated source code use temp version of hadoop-shaded-avro Update JobQueueChangeEvent.java more avro related code that needs changes more exclusions use thirdparty avro staging jar use thirdparty release Update pom.xml Update pom.xml
1 parent 7651afd commit d4aa8bb

File tree

45 files changed

+174
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+174
-129
lines changed

‎LICENSE-binary

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ javax.inject:javax.inject:1
297297
log4j:log4j:1.2.17
298298
net.java.dev.jna:jna:5.2.0
299299
net.minidev:accessors-smart:1.2
300-
org.apache.avro:avro:1.9.2
301300
org.apache.commons:commons-collections4:4.2
302301
org.apache.commons:commons-compress:1.24.0
303302
org.apache.commons:commons-configuration2:2.8.0

‎hadoop-client-modules/hadoop-client-minicluster/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@
136136
<groupId>org.apache.avro</groupId>
137137
<artifactId>avro</artifactId>
138138
</exclusion>
139+
<exclusion>
140+
<groupId>org.apache.hadoop.thirdparty</groupId>
141+
<artifactId>hadoop-shaded-avro_1_11</artifactId>
142+
</exclusion>
139143
<exclusion>
140144
<groupId>org.apache.curator</groupId>
141145
<artifactId>curator-client</artifactId>

‎hadoop-client-modules/hadoop-client/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@
114114
<groupId>org.apache.avro</groupId>
115115
<artifactId>avro</artifactId>
116116
</exclusion>
117+
<exclusion>
118+
<groupId>org.apache.hadoop.thirdparty</groupId>
119+
<artifactId>hadoop-shaded-avro_1_11</artifactId>
120+
</exclusion>
117121
<exclusion>
118122
<groupId>org.eclipse.jetty</groupId>
119123
<artifactId>jetty-server</artifactId>
@@ -166,6 +170,10 @@
166170
<groupId>org.apache.avro</groupId>
167171
<artifactId>avro</artifactId>
168172
</exclusion>
173+
<exclusion>
174+
<groupId>org.apache.hadoop.thirdparty</groupId>
175+
<artifactId>hadoop-shaded-avro_1_11</artifactId>
176+
</exclusion>
169177
<exclusion>
170178
<groupId>com.sun.jersey</groupId>
171179
<artifactId>jersey-core</artifactId>
@@ -278,6 +286,10 @@
278286
<groupId>org.apache.avro</groupId>
279287
<artifactId>avro</artifactId>
280288
</exclusion>
289+
<exclusion>
290+
<groupId>org.apache.hadoop.thirdparty</groupId>
291+
<artifactId>hadoop-shaded-avro_1_11</artifactId>
292+
</exclusion>
281293
<exclusion>
282294
<groupId>org.apache.hadoop</groupId>
283295
<artifactId>hadoop-annotations</artifactId>
@@ -319,6 +331,10 @@
319331
<groupId>org.apache.avro</groupId>
320332
<artifactId>avro</artifactId>
321333
</exclusion>
334+
<exclusion>
335+
<groupId>org.apache.hadoop.thirdparty</groupId>
336+
<artifactId>hadoop-shaded-avro_1_11</artifactId>
337+
</exclusion>
322338
<exclusion>
323339
<groupId>org.apache.hadoop</groupId>
324340
<artifactId>hadoop-annotations</artifactId>

‎hadoop-common-project/hadoop-common/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@
249249
<scope>test</scope>
250250
</dependency>
251251
<dependency>
252-
<groupId>org.apache.avro</groupId>
253-
<artifactId>avro</artifactId>
252+
<groupId>org.apache.hadoop.thirdparty</groupId>
253+
<artifactId>hadoop-shaded-avro_1_11</artifactId>
254254
<scope>compile</scope>
255255
</dependency>
256256
<dependency>
@@ -617,6 +617,8 @@
617617
<copy toDir="${project.build.directory}/test-classes">
618618
<fileset dir="${basedir}/src/main/conf"/>
619619
</copy>
620+
621+
<replace dir="${project.build.directory}/generated-test-sources/java" token="org.apache.avro" value="org.apache.hadoop.thirdparty.avro"/>
620622
</target>
621623
</configuration>
622624
</execution>

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AvroFSInput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.io.Closeable;
2222
import java.io.IOException;
2323

24-
import org.apache.avro.file.SeekableInput;
24+
import org.apache.hadoop.thirdparty.avro.file.SeekableInput;
2525
import org.apache.hadoop.classification.InterfaceAudience;
2626
import org.apache.hadoop.classification.InterfaceStability;
2727

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.Optional;
2828
import java.util.regex.Pattern;
2929

30-
import org.apache.avro.reflect.Stringable;
30+
import org.apache.hadoop.thirdparty.avro.reflect.Stringable;
3131
import org.apache.commons.lang3.StringUtils;
3232
import org.apache.hadoop.HadoopIllegalArgumentException;
3333
import org.apache.hadoop.classification.InterfaceAudience;

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Display.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
import java.util.LinkedList;
2626
import java.util.zip.GZIPInputStream;
2727

28-
import org.apache.avro.Schema;
29-
import org.apache.avro.file.DataFileReader;
30-
import org.apache.avro.file.FileReader;
31-
import org.apache.avro.generic.GenericDatumReader;
32-
import org.apache.avro.generic.GenericDatumWriter;
33-
import org.apache.avro.io.DatumWriter;
34-
import org.apache.avro.io.EncoderFactory;
35-
import org.apache.avro.io.JsonEncoder;
28+
import org.apache.hadoop.thirdparty.avro.Schema;
29+
import org.apache.hadoop.thirdparty.avro.file.DataFileReader;
30+
import org.apache.hadoop.thirdparty.avro.file.FileReader;
31+
import org.apache.hadoop.thirdparty.avro.generic.GenericDatumReader;
32+
import org.apache.hadoop.thirdparty.avro.generic.GenericDatumWriter;
33+
import org.apache.hadoop.thirdparty.avro.io.DatumWriter;
34+
import org.apache.hadoop.thirdparty.avro.io.EncoderFactory;
35+
import org.apache.hadoop.thirdparty.avro.io.JsonEncoder;
3636
import org.apache.hadoop.classification.InterfaceAudience;
3737
import org.apache.hadoop.classification.InterfaceStability;
3838
import org.apache.hadoop.conf.Configuration;

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/Text.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.text.StringCharacterIterator;
3434
import java.util.Arrays;
3535

36-
import org.apache.avro.reflect.Stringable;
36+
import org.apache.hadoop.thirdparty.avro.reflect.Stringable;
3737
import org.apache.hadoop.classification.InterfaceAudience;
3838
import org.apache.hadoop.classification.InterfaceStability;
3939

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroReflectSerialization.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import java.util.HashSet;
2222
import java.util.Set;
2323

24-
import org.apache.avro.Schema;
25-
import org.apache.avro.io.DatumReader;
26-
import org.apache.avro.io.DatumWriter;
27-
import org.apache.avro.reflect.ReflectData;
28-
import org.apache.avro.reflect.ReflectDatumReader;
29-
import org.apache.avro.reflect.ReflectDatumWriter;
24+
import org.apache.hadoop.thirdparty.avro.Schema;
25+
import org.apache.hadoop.thirdparty.avro.io.DatumReader;
26+
import org.apache.hadoop.thirdparty.avro.io.DatumWriter;
27+
import org.apache.hadoop.thirdparty.avro.reflect.ReflectData;
28+
import org.apache.hadoop.thirdparty.avro.reflect.ReflectDatumReader;
29+
import org.apache.hadoop.thirdparty.avro.reflect.ReflectDatumWriter;
3030
import org.apache.hadoop.classification.InterfaceAudience;
3131
import org.apache.hadoop.classification.InterfaceStability;
3232

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroSerialization.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
import java.io.InputStream;
2323
import java.io.OutputStream;
2424

25-
import org.apache.avro.Schema;
26-
import org.apache.avro.io.BinaryDecoder;
27-
import org.apache.avro.io.BinaryEncoder;
28-
import org.apache.avro.io.DatumReader;
29-
import org.apache.avro.io.DatumWriter;
30-
import org.apache.avro.io.DecoderFactory;
31-
import org.apache.avro.io.EncoderFactory;
25+
import org.apache.hadoop.thirdparty.avro.Schema;
26+
import org.apache.hadoop.thirdparty.avro.io.BinaryDecoder;
27+
import org.apache.hadoop.thirdparty.avro.io.BinaryEncoder;
28+
import org.apache.hadoop.thirdparty.avro.io.DatumReader;
29+
import org.apache.hadoop.thirdparty.avro.io.DatumWriter;
30+
import org.apache.hadoop.thirdparty.avro.io.DecoderFactory;
31+
import org.apache.hadoop.thirdparty.avro.io.EncoderFactory;
3232
import org.apache.hadoop.classification.InterfaceAudience;
3333
import org.apache.hadoop.classification.InterfaceStability;
3434
import org.apache.hadoop.conf.Configured;

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroSpecificSerialization.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
package org.apache.hadoop.io.serializer.avro;
2020

21-
import org.apache.avro.Schema;
22-
import org.apache.avro.io.DatumReader;
23-
import org.apache.avro.io.DatumWriter;
24-
import org.apache.avro.specific.SpecificDatumReader;
25-
import org.apache.avro.specific.SpecificDatumWriter;
26-
import org.apache.avro.specific.SpecificRecord;
21+
import org.apache.hadoop.thirdparty.avro.Schema;
22+
import org.apache.hadoop.thirdparty.avro.io.DatumReader;
23+
import org.apache.hadoop.thirdparty.avro.io.DatumWriter;
24+
import org.apache.hadoop.thirdparty.avro.specific.SpecificDatumReader;
25+
import org.apache.hadoop.thirdparty.avro.specific.SpecificDatumWriter;
26+
import org.apache.hadoop.thirdparty.avro.specific.SpecificRecord;
2727
import org.apache.hadoop.classification.InterfaceAudience;
2828
import org.apache.hadoop.classification.InterfaceStability;
2929

‎hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/DelegationKey.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import javax.crypto.SecretKey;
2727

28-
import org.apache.avro.reflect.Nullable;
28+
import org.apache.hadoop.thirdparty.avro.reflect.Nullable;
2929
import org.apache.hadoop.classification.InterfaceAudience;
3030
import org.apache.hadoop.classification.InterfaceStability;
3131
import org.apache.hadoop.io.Writable;

‎hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import java.io.ByteArrayOutputStream;
2222
import java.lang.reflect.Type;
2323

24-
import org.apache.avro.Schema;
25-
import org.apache.avro.io.EncoderFactory;
26-
import org.apache.avro.reflect.ReflectData;
27-
import org.apache.avro.reflect.ReflectDatumWriter;
28-
import org.apache.avro.reflect.ReflectDatumReader;
29-
import org.apache.avro.io.DecoderFactory;
24+
import org.apache.hadoop.thirdparty.avro.Schema;
25+
import org.apache.hadoop.thirdparty.avro.io.EncoderFactory;
26+
import org.apache.hadoop.thirdparty.avro.reflect.ReflectData;
27+
import org.apache.hadoop.thirdparty.avro.reflect.ReflectDatumWriter;
28+
import org.apache.hadoop.thirdparty.avro.reflect.ReflectDatumReader;
29+
import org.apache.hadoop.thirdparty.avro.io.DecoderFactory;
3030

3131
import static org.junit.Assert.assertEquals;
3232

‎hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/serializer/avro/TestAvroSerialization.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class TestAvroSerialization {
3333
@Test
3434
public void testSpecific() throws Exception {
3535
AvroRecord before = new AvroRecord();
36-
before.intField = 5;
36+
before.setIntField(5);
3737
AvroRecord after = SerializationTestUtil.testSerialization(conf, before);
3838
assertEquals(before, after);
3939
}

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,19 @@
131131
<artifactId>maven-antrun-plugin</artifactId>
132132
<executions>
133133
<execution>
134+
<id>generate-sources-ant-replace</id>
135+
<phase>generate-sources</phase>
136+
<goals>
137+
<goal>run</goal>
138+
</goals>
139+
<configuration>
140+
<tasks>
141+
<replace dir="${project.build.directory}/generated-sources/avro" token="org.apache.avro" value="org.apache.hadoop.thirdparty.avro"/>
142+
</tasks>
143+
</configuration>
144+
</execution>
145+
<execution>
146+
<id>pre-site-ant-copy</id>
134147
<phase>pre-site</phase>
135148
<goals>
136149
<goal>run</goal>

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/AMStartedEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.Set;
2222

23-
import org.apache.avro.util.Utf8;
23+
import org.apache.hadoop.thirdparty.avro.util.Utf8;
2424
import org.apache.hadoop.classification.InterfaceAudience;
2525
import org.apache.hadoop.classification.InterfaceStability;
2626
import org.apache.hadoop.util.StringUtils;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/AvroArrayUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import java.util.Iterator;
2323
import java.util.List;
2424

25-
import org.apache.avro.Schema;
26-
import org.apache.avro.generic.GenericData;
25+
import org.apache.hadoop.thirdparty.avro.Schema;
26+
import org.apache.hadoop.thirdparty.avro.generic.GenericData;
2727

2828
public class AvroArrayUtils {
2929

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventReader.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
import java.io.EOFException;
2424
import java.io.IOException;
2525

26-
import org.apache.avro.AvroRuntimeException;
27-
import org.apache.avro.Schema;
28-
import org.apache.avro.io.DatumReader;
29-
import org.apache.avro.io.Decoder;
30-
import org.apache.avro.io.DecoderFactory;
31-
import org.apache.avro.specific.SpecificData;
32-
import org.apache.avro.specific.SpecificDatumReader;
26+
import org.apache.hadoop.thirdparty.avro.AvroRuntimeException;
27+
import org.apache.hadoop.thirdparty.avro.Schema;
28+
import org.apache.hadoop.thirdparty.avro.io.DatumReader;
29+
import org.apache.hadoop.thirdparty.avro.io.Decoder;
30+
import org.apache.hadoop.thirdparty.avro.io.DecoderFactory;
31+
import org.apache.hadoop.thirdparty.avro.specific.SpecificData;
32+
import org.apache.hadoop.thirdparty.avro.specific.SpecificDatumReader;
3333
import org.apache.hadoop.classification.InterfaceAudience;
3434
import org.apache.hadoop.classification.InterfaceStability;
3535
import org.apache.hadoop.fs.FileSystem;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import java.io.IOException;
2222
import java.util.ArrayList;
2323

24-
import org.apache.avro.Schema;
25-
import org.apache.avro.io.DatumWriter;
26-
import org.apache.avro.io.Encoder;
27-
import org.apache.avro.io.EncoderFactory;
28-
import org.apache.avro.specific.SpecificDatumWriter;
29-
import org.apache.avro.util.Utf8;
24+
import org.apache.hadoop.thirdparty.avro.Schema;
25+
import org.apache.hadoop.thirdparty.avro.io.DatumWriter;
26+
import org.apache.hadoop.thirdparty.avro.io.Encoder;
27+
import org.apache.hadoop.thirdparty.avro.io.EncoderFactory;
28+
import org.apache.hadoop.thirdparty.avro.specific.SpecificDatumWriter;
29+
import org.apache.hadoop.thirdparty.avro.util.Utf8;
3030
import org.apache.hadoop.classification.InterfaceAudience;
3131
import org.apache.hadoop.classification.InterfaceStability;
3232
import org.apache.hadoop.fs.FSDataOutputStream;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobFinishedEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.Set;
2222

23-
import org.apache.avro.util.Utf8;
23+
import org.apache.hadoop.thirdparty.avro.util.Utf8;
2424
import org.apache.hadoop.classification.InterfaceAudience;
2525
import org.apache.hadoop.classification.InterfaceStability;
2626
import org.apache.hadoop.mapreduce.Counters;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobInfoChangeEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.Set;
2222

23-
import org.apache.avro.util.Utf8;
23+
import org.apache.hadoop.thirdparty.avro.util.Utf8;
2424
import org.apache.hadoop.classification.InterfaceAudience;
2525
import org.apache.hadoop.classification.InterfaceStability;
2626
import org.apache.hadoop.mapreduce.JobID;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobInitedEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.Set;
2222

23-
import org.apache.avro.util.Utf8;
23+
import org.apache.hadoop.thirdparty.avro.util.Utf8;
2424
import org.apache.hadoop.classification.InterfaceAudience;
2525
import org.apache.hadoop.classification.InterfaceStability;
2626
import org.apache.hadoop.mapreduce.JobID;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobPriorityChangeEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.Set;
2222

23-
import org.apache.avro.util.Utf8;
23+
import org.apache.hadoop.thirdparty.avro.util.Utf8;
2424
import org.apache.hadoop.classification.InterfaceAudience;
2525
import org.apache.hadoop.classification.InterfaceStability;
2626
import org.apache.hadoop.mapred.JobPriority;

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobQueueChangeEvent.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import java.util.Set;
2222

23-
import org.apache.avro.util.Utf8;
2423
import org.apache.hadoop.mapreduce.JobID;
24+
import org.apache.hadoop.thirdparty.avro.util.Utf8;
2525
import org.apache.hadoop.util.StringUtils;
2626
import org.apache.hadoop.yarn.api.records.timelineservice.TimelineEvent;
2727
import org.apache.hadoop.yarn.api.records.timelineservice.TimelineMetric;
@@ -31,8 +31,8 @@ public class JobQueueChangeEvent implements HistoryEvent {
3131
private JobQueueChange datum = new JobQueueChange();
3232

3333
public JobQueueChangeEvent(JobID id, String queueName) {
34-
datum.jobid = new Utf8(id.toString());
35-
datum.jobQueueName = new Utf8(queueName);
34+
datum.setJobid(new Utf8(id.toString()));
35+
datum.setJobQueueName(new Utf8(queueName));
3636
}
3737

3838
JobQueueChangeEvent() { }
@@ -54,13 +54,13 @@ public void setDatum(Object datum) {
5454

5555
/** Get the Job ID */
5656
public JobID getJobId() {
57-
return JobID.forName(datum.jobid.toString());
57+
return JobID.forName(datum.getJobid().toString());
5858
}
5959

6060
/** Get the new Job queue name */
6161
public String getJobQueueName() {
62-
if (datum.jobQueueName != null) {
63-
return datum.jobQueueName.toString();
62+
if (datum.getJobQueueName() != null) {
63+
return datum.getJobQueueName().toString();
6464
}
6565
return null;
6666
}

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobStatusChangedEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import java.util.Set;
2222

23-
import org.apache.avro.util.Utf8;
23+
import org.apache.hadoop.thirdparty.avro.util.Utf8;
2424
import org.apache.hadoop.classification.InterfaceAudience;
2525
import org.apache.hadoop.classification.InterfaceStability;
2626
import org.apache.hadoop.mapreduce.JobID;

0 commit comments

Comments
 (0)