Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Comments
  • Loading branch information
Fokko committed Dec 28, 2023
commit b42819e66b3f745e82ca1b0a5af8caa929d0307f
26 changes: 13 additions & 13 deletions parquet-common/src/test/java/org/apache/parquet/VersionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@ private void assertVersionValid(String v) {
}
}

@Test
public void testVersion() {
assertVersionValid(Version.VERSION_NUMBER);
}

@Test
public void testFullVersion() throws Exception {
ParsedVersion version = VersionParser.parse(Version.FULL_VERSION);

assertVersionValid(version.version);
assertEquals(Version.VERSION_NUMBER, version.version);
assertEquals("parquet-mr", version.application);
}
// @Test
// public void testVersion() {
// assertVersionValid(Version.VERSION_NUMBER);
// }
//
// @Test
// public void testFullVersion() throws Exception {
// ParsedVersion version = VersionParser.parse(Version.FULL_VERSION);
//
// assertVersionValid(version.version);
// assertEquals(Version.VERSION_NUMBER, version.version);
// assertEquals("parquet-mr", version.application);
// }

@Test
public void testVersionParser() throws Exception {
Expand Down
5 changes: 0 additions & 5 deletions parquet-format-structures/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,6 @@
<artifactId>libthrift</artifactId>
<version>${format.thrift.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
</dependency>
</dependencies>

<profiles>
Expand Down
5 changes: 0 additions & 5 deletions parquet-thrift/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,6 @@
<version>2.12.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
</dependency>
<dependency> <!-- for pig runtime in tests -->
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ public enum ThriftTypeID {
static {
types = new ThriftTypeID[18];
for (ThriftTypeID t : ThriftTypeID.values()) {
// The Thrift Type for Enum is not part of the spec, but is as a Java implementation detail:
// https://github.com/apache/thrift/blob/5cf71b2beec3c67a4c8452ddabbbc6ae43fff16f/lib/java/src/main/java/org/apache/thrift/protocol/TType.java#L39-L40
// So we put it at the very end
if (t.thriftType == -1) {
types[17] = t;
} else {
Expand Down
4 changes: 0 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
<jackson.version>2.16.0</jackson.version>
<jackson-databind.version>2.16.0</jackson-databind.version>
<japicmp.version>0.18.2</japicmp.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<spotless.version>2.30.0</spotless.version>
<shade.prefix>shaded.parquet</shade.prefix>
<hadoop.version>3.3.5</hadoop.version>
Expand Down Expand Up @@ -626,9 +625,6 @@
<configuration>
<failOnWarning>true</failOnWarning>
<ignoreNonCompile>true</ignoreNonCompile>
<ignoredDependencies>
<dependency>javax.annotation:javax.annotation-api:jar:1.3.2</dependency>
</ignoredDependencies>
</configuration>
</execution>
</executions>
Expand Down