Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PARQUET-2274: Remove Yetus #1056

Merged
merged 3 commits into from
Nov 8, 2023
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
5 changes: 0 additions & 5 deletions parquet-column/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@
<artifactId>zero-allocation-hashing</artifactId>
<version>${net.openhft.version}</version>
</dependency>
<dependency>
<groupId>org.apache.yetus</groupId>
<artifactId>audience-annotations</artifactId>
<version>${yetus.audience-annotations.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.apache.parquet.schema;

import org.apache.parquet.Preconditions;
import org.apache.yetus.audience.InterfaceAudience;

import java.util.Collections;
import java.util.HashSet;
Expand Down Expand Up @@ -152,7 +151,6 @@ protected LogicalTypeAnnotation fromString(List<String> params) {
*
* @return the OriginalType representation of the new logical type, or null if there's none
*/
@InterfaceAudience.Private
public abstract OriginalType toOriginalType();

/**
Expand Down Expand Up @@ -187,7 +185,6 @@ PrimitiveStringifier valueStringifier(PrimitiveType primitiveType) {
/**
* Helper method to convert the old representation of logical types (OriginalType) to new logical type.
*/
@InterfaceAudience.Private
public static LogicalTypeAnnotation fromOriginalType(OriginalType originalType, DecimalMetadata decimalMetadata) {
if (originalType == null) {
return null;
Expand Down Expand Up @@ -303,7 +300,6 @@ private StringLogicalTypeAnnotation() {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.UTF8;
}
Expand Down Expand Up @@ -342,7 +338,6 @@ private MapLogicalTypeAnnotation() {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.MAP;
}
Expand Down Expand Up @@ -376,7 +371,6 @@ private ListLogicalTypeAnnotation() {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.LIST;
}
Expand Down Expand Up @@ -410,7 +404,6 @@ private EnumLogicalTypeAnnotation() {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.ENUM;
}
Expand Down Expand Up @@ -462,7 +455,6 @@ public int getScale() {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.DECIMAL;
}
Expand Down Expand Up @@ -515,7 +507,6 @@ private DateLogicalTypeAnnotation() {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.DATE;
}
Expand Down Expand Up @@ -563,7 +554,6 @@ private TimeLogicalTypeAnnotation(boolean isAdjustedToUTC, TimeUnit unit) {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
switch (unit) {
case MILLIS:
Expand Down Expand Up @@ -642,7 +632,6 @@ private TimestampLogicalTypeAnnotation(boolean isAdjustedToUTC, TimeUnit unit) {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
switch (unit) {
case MILLIS:
Expand Down Expand Up @@ -728,7 +717,6 @@ private IntLogicalTypeAnnotation(int bitWidth, boolean isSigned) {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
switch (bitWidth) {
case 8:
Expand Down Expand Up @@ -800,7 +788,6 @@ private JsonLogicalTypeAnnotation() {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.JSON;
}
Expand Down Expand Up @@ -839,7 +826,6 @@ private BsonLogicalTypeAnnotation() {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.BSON;
}
Expand Down Expand Up @@ -879,7 +865,6 @@ private UUIDLogicalTypeAnnotation() {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
// No OriginalType for UUID
return null;
Expand Down Expand Up @@ -915,7 +900,6 @@ private IntervalLogicalTypeAnnotation() {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.INTERVAL;
}
Expand Down Expand Up @@ -966,7 +950,6 @@ private MapKeyValueTypeAnnotation() {
}

@Override
@InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.MAP_KEY_VALUE;
}
Expand Down
5 changes: 0 additions & 5 deletions parquet-hadoop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,6 @@
<version>${net.openhft.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.yetus</groupId>
<artifactId>audience-annotations</artifactId>
<version>${yetus.audience-annotations.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,9 @@
import org.apache.parquet.io.ParquetEncodingException;
import org.apache.parquet.schema.MessageType;
import org.apache.parquet.bytes.ByteBufferAllocator;
import org.apache.yetus.audience.InterfaceAudience;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@InterfaceAudience.Private
public class ColumnChunkPageWriteStore implements PageWriteStore, BloomFilterWriteStore {
private static final Logger LOG = LoggerFactory.getLogger(ColumnChunkPageWriteStore.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@
import org.apache.parquet.io.SeekableInputStream;
import org.apache.parquet.schema.MessageType;
import org.apache.parquet.schema.PrimitiveType;
import org.apache.yetus.audience.InterfaceAudience.Private;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -1381,7 +1380,6 @@ public BloomFilter readBloomFilter(ColumnChunkMetaData meta) throws IOException
* @throws IOException
* if any I/O error occurs during reading the file
*/
@Private
public ColumnIndex readColumnIndex(ColumnChunkMetaData column) throws IOException {
IndexReference ref = column.getColumnIndexReference();
if (ref == null) {
Expand Down Expand Up @@ -1410,7 +1408,6 @@ public ColumnIndex readColumnIndex(ColumnChunkMetaData column) throws IOExceptio
* @throws IOException
* if any I/O error occurs during reading the file
*/
@Private
public OffsetIndex readOffsetIndex(ColumnChunkMetaData column) throws IOException {
IndexReference ref = column.getOffsetIndexReference();
if (ref == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import org.apache.parquet.schema.PrimitiveType;
import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
import org.apache.parquet.schema.Types;
import org.apache.yetus.audience.InterfaceAudience.Private;

/**
* Column meta data for a block stored in the file footer and passed in the InputSplit
Expand Down Expand Up @@ -290,7 +289,6 @@ public PrimitiveType getPrimitiveType() {
/**
* @return the reference to the column index
*/
@Private
public IndexReference getColumnIndexReference() {
decryptIfNeeded();
return columnIndexReference;
Expand All @@ -300,15 +298,13 @@ public IndexReference getColumnIndexReference() {
* @param indexReference
* the reference to the column index
*/
@Private
public void setColumnIndexReference(IndexReference indexReference) {
this.columnIndexReference = indexReference;
}

/**
* @return the reference to the offset index
*/
@Private
public IndexReference getOffsetIndexReference() {
decryptIfNeeded();
return offsetIndexReference;
Expand All @@ -318,7 +314,6 @@ public IndexReference getOffsetIndexReference() {
* @param offsetIndexReference
* the reference to the offset index
*/
@Private
public void setOffsetIndexReference(IndexReference offsetIndexReference) {
this.offsetIndexReference = offsetIndexReference;
}
Expand All @@ -327,15 +322,13 @@ public void setOffsetIndexReference(IndexReference offsetIndexReference) {
* @param bloomFilterOffset
* the reference to the Bloom filter
*/
@Private
public void setBloomFilterOffset(long bloomFilterOffset) {
this.bloomFilterOffset = bloomFilterOffset;
}

/**
* @return the offset to the Bloom filter or {@code -1} if there is no bloom filter for this column chunk
*/
@Private
public long getBloomFilterOffset() {
decryptIfNeeded();
return bloomFilterOffset;
Expand Down Expand Up @@ -374,7 +367,6 @@ public boolean hasDictionaryPage() {
/**
* @return whether or not this column is encrypted
*/
@Private
public boolean isEncrypted() {
return false;
}
Expand Down
1 change: 0 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
<mockito.version>1.10.19</mockito.version>
<net.openhft.version>0.9</net.openhft.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<yetus.audience-annotations.version>0.13.0</yetus.audience-annotations.version>

<!-- parquet-cli dependencies -->
<opencsv.version>2.3</opencsv.version>
Expand Down