Exclude Parquet from shading

trinodb · Jul 28, 2023 · d998adf · d998adf
1 parent 9f680c1
commit d998adf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 70 deletions.
diff --git a/pom.xml b/pom.xml
@@ -452,10 +452,6 @@
             <artifactId>parquet-common</artifactId>
             <version>${dep.parquet.version}</version>
             <exclusions>
-                <exclusion>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.apache.yetus</groupId>
                     <artifactId>audience-annotations</artifactId>
@@ -467,13 +463,27 @@
             <groupId>org.apache.parquet</groupId>
             <artifactId>parquet-column</artifactId>
             <version>${dep.parquet.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.yetus</groupId>
+                    <artifactId>audience-annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.apache.parquet</groupId>
             <artifactId>parquet-hadoop</artifactId>
             <version>${dep.parquet.version}</version>
             <exclusions>
+                <exclusion>
+                    <groupId>org.apache.yetus</groupId>
+                    <artifactId>audience-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.github.luben</groupId>
+                    <artifactId>zstd-jni</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.xerial.snappy</groupId>
                     <artifactId>snappy-java</artifactId>
@@ -671,8 +681,8 @@
                                     <exclude>joda-time:joda-time</exclude>
                                     <exclude>org.apache.thrift:libthrift</exclude>
                                     <exclude>org.apache.avro:*</exclude>
+                                    <exclude>org.apache.parquet:*</exclude>
                                     <exclude>io.airlift:aircompressor</exclude>
-                                    <exclude>com.github.luben:zstd-jni</exclude>
                                 </excludes>
                             </artifactSet>
                             <relocations>
@@ -728,10 +738,6 @@
                                     <pattern>com.codahale.metrics</pattern>
                                     <shadedPattern>${shadeBase}.com.codahale.metrics</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>shaded.parquet</pattern>
-                                    <shadedPattern>${shadeBase}.parquet</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>org.slf4j</pattern>
                                     <shadedPattern>${shadeBase}.org.slf4j</shadedPattern>
@@ -805,12 +811,6 @@
                                         <exclude>overview.html</exclude>
                                     </excludes>
                                 </filter>
-                                <filter>
-                                    <artifact>org.apache.parquet:parquet-avro</artifact>
-                                    <excludes>
-                                        <exclude>stringBehavior.avsc</exclude>
-                                    </excludes>
-                                </filter>
                                 <filter>
                                     <artifact>org.apache.commons:commons-lang3</artifact>
                                     <excludes>

diff --git a/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java b/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverterUtil.java
diff --git a/src/main/java/org/apache/parquet/io/ColumnIOUtil.java b/src/main/java/org/apache/parquet/io/ColumnIOUtil.java