Skip to content

Commit a23d7c1

Browse files
committed
[parquet-thrift] remove pig usage
1 parent 4147bc6 commit a23d7c1

8 files changed

Lines changed: 2 additions & 574 deletions

File tree

parquet-thrift/pom.xml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<scope>provided</scope>
7171
</dependency>
7272
<!-- Guava is a dependency of hadoop-common, but scoped to compile. We need to
73-
explicity declare it as a test dependency. -->
73+
explicitly declare it as a test dependency. -->
7474
<dependency>
7575
<groupId>com.google.guava</groupId>
7676
<artifactId>guava</artifactId>
@@ -89,18 +89,6 @@
8989
</exclusion>
9090
</exclusions>
9191
</dependency>
92-
<dependency>
93-
<groupId>com.twitter.elephantbird</groupId>
94-
<artifactId>elephant-bird-pig</artifactId>
95-
<version>${elephant-bird.version}</version>
96-
<exclusions>
97-
<!-- hadoop-lzo is not required for parquet build/tests and there are issues downloading it -->
98-
<exclusion>
99-
<groupId>com.hadoop.gplcompression</groupId>
100-
<artifactId>hadoop-lzo</artifactId>
101-
</exclusion>
102-
</exclusions>
103-
</dependency>
10492
<dependency>
10593
<groupId>org.apache.parquet</groupId>
10694
<artifactId>parquet-jackson</artifactId>
@@ -124,18 +112,6 @@
124112
<type>test-jar</type>
125113
<scope>test</scope>
126114
</dependency>
127-
<dependency>
128-
<groupId>org.apache.parquet</groupId>
129-
<artifactId>parquet-pig</artifactId>
130-
<version>1.15.0</version>
131-
</dependency>
132-
<dependency>
133-
<groupId>org.apache.pig</groupId>
134-
<artifactId>pig</artifactId>
135-
<version>${pig.version}</version>
136-
<classifier>${pig.classifier}</classifier>
137-
<scope>provided</scope>
138-
</dependency>
139115
<dependency>
140116
<groupId>org.apache.thrift</groupId>
141117
<artifactId>libthrift</artifactId>

parquet-thrift/src/main/java/org/apache/parquet/hadoop/thrift/AbstractThriftWriteSupport.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.apache.parquet.hadoop.thrift;
1717

18-
import com.twitter.elephantbird.pig.util.ThriftToPig;
1918
import java.util.Map;
2019
import org.apache.hadoop.conf.Configuration;
2120
import org.apache.parquet.conf.HadoopParquetConfiguration;
@@ -25,13 +24,11 @@
2524
import org.apache.parquet.io.ColumnIOFactory;
2625
import org.apache.parquet.io.MessageColumnIO;
2726
import org.apache.parquet.io.api.RecordConsumer;
28-
import org.apache.parquet.pig.PigMetaData;
2927
import org.apache.parquet.schema.MessageType;
3028
import org.apache.parquet.thrift.ParquetWriteProtocol;
3129
import org.apache.parquet.thrift.ThriftMetaData;
3230
import org.apache.parquet.thrift.ThriftSchemaConverter;
3331
import org.apache.parquet.thrift.struct.ThriftType.StructType;
34-
import org.apache.thrift.TBase;
3532
import org.slf4j.Logger;
3633
import org.slf4j.LoggerFactory;
3734

@@ -99,26 +96,10 @@ protected void init(Class<T> thriftClass) {
9996

10097
final Map<String, String> extraMetaData =
10198
new ThriftMetaData(thriftClass.getName(), thriftStruct).toExtraMetaData();
102-
// adding the Pig schema as it would have been mapped from thrift
103-
// TODO: make this work for non-tbase types
104-
if (isPigLoaded() && TBase.class.isAssignableFrom(thriftClass)) {
105-
new PigMetaData(new ThriftToPig((Class<? extends TBase<?, ?>>) thriftClass).toSchema())
106-
.addToMetaData(extraMetaData);
107-
}
10899

109100
this.writeContext = new WriteContext(schema, extraMetaData);
110101
}
111102

112-
protected boolean isPigLoaded() {
113-
try {
114-
Class.forName("org.apache.pig.impl.logicalLayer.schema.Schema");
115-
return true;
116-
} catch (ClassNotFoundException e) {
117-
LOG.info("Pig is not loaded, pig metadata will not be written");
118-
return false;
119-
}
120-
}
121-
122103
@Override
123104
public WriteContext init(Configuration configuration) {
124105
return init(new HadoopParquetConfiguration(configuration));

parquet-thrift/src/main/java/org/apache/parquet/thrift/pig/ParquetThriftStorer.java

Lines changed: 0 additions & 91 deletions
This file was deleted.

parquet-thrift/src/main/java/org/apache/parquet/thrift/pig/TupleToThriftWriteSupport.java

Lines changed: 0 additions & 86 deletions
This file was deleted.

parquet-thrift/src/main/java/org/apache/parquet/thrift/struct/ThriftType.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ default R visit(UUIDType uuidType, S state) {
142142
/**
143143
* @deprecated will be removed in 2.0.0; use StateVisitor instead.
144144
*/
145+
@Deprecated
145146
public interface TypeVisitor {
146147

147148
void visit(MapType mapType);

0 commit comments

Comments
 (0)