diff --git a/parquet-column/pom.xml b/parquet-column/pom.xml
index 13081ea948..057736c03a 100644
--- a/parquet-column/pom.xml
+++ b/parquet-column/pom.xml
@@ -70,11 +70,6 @@
zero-allocation-hashing
${net.openhft.version}
-
- org.apache.yetus
- audience-annotations
- ${yetus.audience-annotations.version}
-
org.slf4j
slf4j-api
diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java b/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java
index 0c4eba1c3b..c4e50f2926 100644
--- a/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java
+++ b/parquet-column/src/main/java/org/apache/parquet/schema/LogicalTypeAnnotation.java
@@ -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;
@@ -150,9 +149,10 @@ protected LogicalTypeAnnotation fromString(List params) {
* Convert this logical type to old logical type representation in parquet-mr (if there's any).
* Those logical type implementations, which don't have a corresponding mapping should return null.
*
+ * API should be considered private
+ *
* @return the OriginalType representation of the new logical type, or null if there's none
*/
- @InterfaceAudience.Private
public abstract OriginalType toOriginalType();
/**
@@ -186,8 +186,9 @@ PrimitiveStringifier valueStringifier(PrimitiveType primitiveType) {
/**
* Helper method to convert the old representation of logical types (OriginalType) to new logical type.
+ *
+ * API should be considered private
*/
- @InterfaceAudience.Private
public static LogicalTypeAnnotation fromOriginalType(OriginalType originalType, DecimalMetadata decimalMetadata) {
if (originalType == null) {
return null;
@@ -302,8 +303,12 @@ public static class StringLogicalTypeAnnotation extends LogicalTypeAnnotation {
private StringLogicalTypeAnnotation() {
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.UTF8;
}
@@ -341,8 +346,12 @@ public static class MapLogicalTypeAnnotation extends LogicalTypeAnnotation {
private MapLogicalTypeAnnotation() {
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.MAP;
}
@@ -375,8 +384,12 @@ public static class ListLogicalTypeAnnotation extends LogicalTypeAnnotation {
private ListLogicalTypeAnnotation() {
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.LIST;
}
@@ -409,8 +422,12 @@ public static class EnumLogicalTypeAnnotation extends LogicalTypeAnnotation {
private EnumLogicalTypeAnnotation() {
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.ENUM;
}
@@ -461,8 +478,12 @@ public int getScale() {
return scale;
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.DECIMAL;
}
@@ -514,8 +535,12 @@ public static class DateLogicalTypeAnnotation extends LogicalTypeAnnotation {
private DateLogicalTypeAnnotation() {
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.DATE;
}
@@ -562,8 +587,12 @@ private TimeLogicalTypeAnnotation(boolean isAdjustedToUTC, TimeUnit unit) {
this.unit = unit;
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
switch (unit) {
case MILLIS:
@@ -641,8 +670,12 @@ private TimestampLogicalTypeAnnotation(boolean isAdjustedToUTC, TimeUnit unit) {
this.unit = unit;
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
switch (unit) {
case MILLIS:
@@ -727,8 +760,12 @@ private IntLogicalTypeAnnotation(int bitWidth, boolean isSigned) {
this.isSigned = isSigned;
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
switch (bitWidth) {
case 8:
@@ -799,8 +836,12 @@ public static class JsonLogicalTypeAnnotation extends LogicalTypeAnnotation {
private JsonLogicalTypeAnnotation() {
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.JSON;
}
@@ -838,8 +879,12 @@ public static class BsonLogicalTypeAnnotation extends LogicalTypeAnnotation {
private BsonLogicalTypeAnnotation() {
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.BSON;
}
@@ -878,8 +923,12 @@ public static class UUIDLogicalTypeAnnotation extends LogicalTypeAnnotation {
private UUIDLogicalTypeAnnotation() {
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
// No OriginalType for UUID
return null;
@@ -914,8 +963,12 @@ public static LogicalTypeAnnotation getInstance() {
private IntervalLogicalTypeAnnotation() {
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.INTERVAL;
}
@@ -965,8 +1018,12 @@ public static MapKeyValueTypeAnnotation getInstance() {
private MapKeyValueTypeAnnotation() {
}
+ /**
+ * API Should be considered private
+ *
+ * @return the original type
+ */
@Override
- @InterfaceAudience.Private
public OriginalType toOriginalType() {
return OriginalType.MAP_KEY_VALUE;
}
diff --git a/parquet-hadoop/pom.xml b/parquet-hadoop/pom.xml
index 0b8c8fc696..d587de0394 100644
--- a/parquet-hadoop/pom.xml
+++ b/parquet-hadoop/pom.xml
@@ -164,11 +164,6 @@
${net.openhft.version}
test
-
- org.apache.yetus
- audience-annotations
- ${yetus.audience-annotations.version}
-
org.apache.commons
commons-lang3
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnChunkPageWriteStore.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnChunkPageWriteStore.java
index cd6ec5d930..f392a79af6 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnChunkPageWriteStore.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnChunkPageWriteStore.java
@@ -53,11 +53,12 @@
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
+/**
+ * Class should be considered private
+ */
public class ColumnChunkPageWriteStore implements PageWriteStore, BloomFilterWriteStore {
private static final Logger LOG = LoggerFactory.getLogger(ColumnChunkPageWriteStore.class);
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java
index f63367022e..a16f987726 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java
@@ -113,7 +113,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;
@@ -1384,13 +1383,13 @@ public BloomFilter readBloomFilter(ColumnChunkMetaData meta) throws IOException
}
/**
- * @param column
- * the column chunk which the column index is to be returned for
+ * Class should be considered private
+ *
+ * @param column the column chunk which the column index is to be returned for
+ *
* @return the column index for the specified column chunk or {@code null} if there is no index
- * @throws IOException
- * if any I/O error occurs during reading the file
+ * @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) {
@@ -1413,13 +1412,12 @@ public ColumnIndex readColumnIndex(ColumnChunkMetaData column) throws IOExceptio
}
/**
- * @param column
- * the column chunk which the offset index is to be returned for
+ * Class should be considered private
+ *
+ * @param column the column chunk which the offset index is to be returned for
* @return the offset index for the specified column chunk or {@code null} if there is no index
- * @throws IOException
- * if any I/O error occurs during reading the file
+ * @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) {
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/metadata/ColumnChunkMetaData.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/metadata/ColumnChunkMetaData.java
index f149b1bde0..158348e01c 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/metadata/ColumnChunkMetaData.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/metadata/ColumnChunkMetaData.java
@@ -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
@@ -288,54 +287,57 @@ public PrimitiveType getPrimitiveType() {
abstract public Statistics getStatistics();
/**
+ * Method should be considered private
+ *
* @return the reference to the column index
*/
- @Private
public IndexReference getColumnIndexReference() {
decryptIfNeeded();
return columnIndexReference;
}
/**
- * @param indexReference
- * the reference to the column index
+ * Method should be considered private
+ *
+ * @param indexReference the reference to the column index
*/
- @Private
public void setColumnIndexReference(IndexReference indexReference) {
this.columnIndexReference = indexReference;
}
/**
+ * Method should be considered private
+ *
* @return the reference to the offset index
*/
- @Private
public IndexReference getOffsetIndexReference() {
decryptIfNeeded();
return offsetIndexReference;
}
/**
- * @param offsetIndexReference
- * the reference to the offset index
+ * Method should be considered private
+ *
+ * @param offsetIndexReference the reference to the offset index
*/
- @Private
public void setOffsetIndexReference(IndexReference offsetIndexReference) {
this.offsetIndexReference = offsetIndexReference;
}
/**
- * @param bloomFilterOffset
- * the reference to the Bloom filter
+ * Method should be considered private
+ *
+ * @param bloomFilterOffset the reference to the Bloom filter
*/
- @Private
public void setBloomFilterOffset(long bloomFilterOffset) {
this.bloomFilterOffset = bloomFilterOffset;
}
/**
+ * Method should be considered private
+ *
* @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;
@@ -372,9 +374,10 @@ public boolean hasDictionaryPage() {
}
/**
+ * Method should be considered private
+ *
* @return whether or not this column is encrypted
*/
- @Private
public boolean isEncrypted() {
return false;
}
diff --git a/pom.xml b/pom.xml
index 90e3d5a7e1..c450fac7ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,6 @@
2.0.9
0.16
1.6.0
- 0.13.0
2.3