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

Arrow,Core,Spark: Remove functionality marked for removal in 1.4.0 #7987

Merged
merged 1 commit into from
Aug 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
52 changes: 52 additions & 0 deletions .palantir/revapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,58 @@ acceptedBreaks:
- code: "java.method.removed"
old: "method org.apache.iceberg.view.ViewBuilder org.apache.iceberg.view.ViewBuilder::withQueryColumnNames(java.util.List<java.lang.String>)"
justification: "Acceptable break due to updating View APIs and the View Spec"
org.apache.iceberg:iceberg-core:
- code: "java.class.removed"
old: "class org.apache.iceberg.actions.BaseDeleteOrphanFilesActionResult"
justification: "Removing deprecated code"
- code: "java.class.removed"
old: "class org.apache.iceberg.actions.BaseDeleteReachableFilesActionResult"
justification: "Removing deprecated code"
- code: "java.class.removed"
old: "class org.apache.iceberg.actions.BaseFileGroupRewriteResult"
justification: "Removing deprecated code"
- code: "java.class.removed"
old: "class org.apache.iceberg.actions.BaseMigrateTableActionResult"
justification: "Removing deprecated code"
- code: "java.class.removed"
old: "class org.apache.iceberg.actions.BaseRewriteDataFilesFileGroupInfo"
justification: "Removing deprecated code"
- code: "java.class.removed"
old: "class org.apache.iceberg.actions.BaseRewriteDataFilesResult"
justification: "Removing deprecated code"
- code: "java.class.removed"
old: "class org.apache.iceberg.actions.BaseRewriteManifestsActionResult"
justification: "Removing deprecated code"
- code: "java.class.removed"
old: "class org.apache.iceberg.actions.BaseSnapshotTableActionResult"
justification: "Removing deprecated code"
- code: "java.class.removed"
old: "interface org.apache.iceberg.actions.RewritePositionDeleteStrategy"
justification: "Removing deprecated code"
- code: "java.method.removed"
old: "method java.util.List<org.apache.iceberg.DataFile> org.apache.iceberg.MergingSnapshotProducer<ThisT>::addedFiles()\
\ @ org.apache.iceberg.BaseOverwriteFiles"
justification: "Removing deprecated code"
- code: "java.method.removed"
old: "method java.util.List<org.apache.iceberg.DataFile> org.apache.iceberg.MergingSnapshotProducer<ThisT>::addedFiles()\
\ @ org.apache.iceberg.BaseReplacePartitions"
justification: "Removing deprecated code"
- code: "java.method.removed"
old: "method java.util.List<org.apache.iceberg.DataFile> org.apache.iceberg.MergingSnapshotProducer<ThisT>::addedFiles()\
\ @ org.apache.iceberg.StreamingDelete"
justification: "Removing deprecated code"
- code: "java.method.removed"
old: "method void org.apache.iceberg.MergingSnapshotProducer<ThisT>::setNewFilesSequenceNumber(long)\
\ @ org.apache.iceberg.BaseOverwriteFiles"
justification: "Removing deprecated code"
- code: "java.method.removed"
old: "method void org.apache.iceberg.MergingSnapshotProducer<ThisT>::setNewFilesSequenceNumber(long)\
\ @ org.apache.iceberg.BaseReplacePartitions"
justification: "Removing deprecated code"
- code: "java.method.removed"
old: "method void org.apache.iceberg.MergingSnapshotProducer<ThisT>::setNewFilesSequenceNumber(long)\
\ @ org.apache.iceberg.StreamingDelete"
justification: "Removing deprecated code"
apache-iceberg-0.14.0:
org.apache.iceberg:iceberg-api:
- code: "java.class.defaultSerializationChanged"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,54 +186,6 @@ protected int nextBatchOf(
}
}

/** @deprecated will be removed in 1.4.0 */
@Deprecated
public class IntBackedDecimalBatchReader extends BatchReader {
@Override
protected int nextBatchOf(
final FieldVector vector,
final int expectedBatchSize,
final int numValsInVector,
final int typeWidth,
NullabilityHolder holder) {
return vectorizedPageIterator
.intBackedDecimalPageReader()
.nextBatch(vector, expectedBatchSize, numValsInVector, typeWidth, holder);
}
}

/** @deprecated will be removed in 1.4.0 */
@Deprecated
public class LongBackedDecimalBatchReader extends BatchReader {
@Override
protected int nextBatchOf(
final FieldVector vector,
final int expectedBatchSize,
final int numValsInVector,
final int typeWidth,
NullabilityHolder holder) {
return vectorizedPageIterator
.longBackedDecimalPageReader()
.nextBatch(vector, expectedBatchSize, numValsInVector, typeWidth, holder);
}
}

/** @deprecated will be removed in 1.4.0 */
@Deprecated
public class FixedLengthDecimalBatchReader extends BatchReader {
@Override
protected int nextBatchOf(
final FieldVector vector,
final int expectedBatchSize,
final int numValsInVector,
final int typeWidth,
NullabilityHolder holder) {
return vectorizedPageIterator
.fixedLengthDecimalPageReader()
.nextBatch(vector, expectedBatchSize, numValsInVector, typeWidth, holder);
}
}

public class FixedSizeBinaryBatchReader extends BatchReader {
@Override
protected int nextBatchOf(
Expand Down Expand Up @@ -318,24 +270,6 @@ public DoubleBatchReader doubleBatchReader() {
return new DoubleBatchReader();
}

/** @deprecated will be removed in 1.4.0 */
@Deprecated
public IntBackedDecimalBatchReader intBackedDecimalBatchReader() {
return new IntBackedDecimalBatchReader();
}

/** @deprecated will be removed in 1.4.0 */
@Deprecated
public LongBackedDecimalBatchReader longBackedDecimalBatchReader() {
return new LongBackedDecimalBatchReader();
}

/** @deprecated will be removed in 1.4.0 */
@Deprecated
public FixedLengthDecimalBatchReader fixedLengthDecimalBatchReader() {
return new FixedLengthDecimalBatchReader();
}

public FixedSizeBinaryBatchReader fixedSizeBinaryBatchReader() {
return new FixedSizeBinaryBatchReader();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.apache.iceberg.arrow.vectorized.parquet;

import java.io.IOException;
import org.apache.arrow.vector.DecimalVector;
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VarBinaryVector;
Expand Down Expand Up @@ -367,102 +366,6 @@ private int getActualBatchSize(int expectedBatchSize) {
return Math.min(expectedBatchSize, triplesCount - triplesRead);
}

/**
* Method for reading a batch of decimals backed by INT32 and INT64 parquet data types. Since
* Arrow stores all decimals in 16 bytes, byte arrays are appropriately padded before being
* written to Arrow data buffers.
*
* @deprecated will be removed in 1.4.0
*/
@Deprecated
class IntBackedDecimalPageReader extends BagePageReader {
@Override
protected void nextVal(
FieldVector vector, int batchSize, int numVals, int typeWidth, NullabilityHolder holder) {
vectorizedDefinitionLevelReader
.intBackedDecimalReader()
.nextBatch(vector, numVals, typeWidth, batchSize, holder, plainValuesReader);
}

@Override
protected void nextDictEncodedVal(
FieldVector vector, int batchSize, int numVals, int typeWidth, NullabilityHolder holder) {
vectorizedDefinitionLevelReader
.intBackedDecimalReader()
.nextDictEncodedBatch(
vector,
numVals,
typeWidth,
batchSize,
holder,
dictionaryEncodedValuesReader,
dictionary);
}
}

/** @deprecated will be removed in 1.4.0 */
@Deprecated
class LongBackedDecimalPageReader extends BagePageReader {
@Override
protected void nextVal(
FieldVector vector, int batchSize, int numVals, int typeWidth, NullabilityHolder holder) {
vectorizedDefinitionLevelReader
.longBackedDecimalReader()
.nextBatch(vector, numVals, typeWidth, batchSize, holder, plainValuesReader);
}

@Override
protected void nextDictEncodedVal(
FieldVector vector, int batchSize, int numVals, int typeWidth, NullabilityHolder holder) {
vectorizedDefinitionLevelReader
.longBackedDecimalReader()
.nextDictEncodedBatch(
vector,
numVals,
typeWidth,
batchSize,
holder,
dictionaryEncodedValuesReader,
dictionary);
}
}

/**
* Method for reading a batch of decimals backed by fixed length byte array parquet data type.
* Arrow stores all decimals in 16 bytes. This method provides the necessary padding to the
* decimals read. Moreover, Arrow interprets the decimals in Arrow buffer as little endian.
* Parquet stores fixed length decimals as big endian. So, this method uses {@link
* DecimalVector#setBigEndian(int, byte[])} method so that the data in Arrow vector is indeed
* little endian.
*
* @deprecated will be removed in 1.4.0
*/
@Deprecated
class FixedLengthDecimalPageReader extends BagePageReader {
@Override
protected void nextVal(
FieldVector vector, int batchSize, int numVals, int typeWidth, NullabilityHolder holder) {
vectorizedDefinitionLevelReader
.fixedLengthDecimalReader()
.nextBatch(vector, numVals, typeWidth, batchSize, holder, plainValuesReader);
}

@Override
protected void nextDictEncodedVal(
FieldVector vector, int batchSize, int numVals, int typeWidth, NullabilityHolder holder) {
vectorizedDefinitionLevelReader
.fixedLengthDecimalReader()
.nextDictEncodedBatch(
vector,
numVals,
typeWidth,
batchSize,
holder,
dictionaryEncodedValuesReader,
dictionary);
}
}

class FixedSizeBinaryPageReader extends BagePageReader {
@Override
protected void nextVal(
Expand Down Expand Up @@ -585,24 +488,6 @@ DoublePageReader doublePageReader() {
return new DoublePageReader();
}

/** @deprecated will be removed in 1.4.0 */
@Deprecated
IntBackedDecimalPageReader intBackedDecimalPageReader() {
return new IntBackedDecimalPageReader();
}

/** @deprecated will be removed in 1.4.0 */
@Deprecated
LongBackedDecimalPageReader longBackedDecimalPageReader() {
return new LongBackedDecimalPageReader();
}

/** @deprecated will be removed in 1.4.0 */
@Deprecated
FixedLengthDecimalPageReader fixedLengthDecimalPageReader() {
return new FixedLengthDecimalPageReader();
}

FixedSizeBinaryPageReader fixedSizeBinaryPageReader() {
return new FixedSizeBinaryPageReader();
}
Expand Down
22 changes: 0 additions & 22 deletions core/src/main/java/org/apache/iceberg/MergingSnapshotProducer.java
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,6 @@ protected Expression rowFilter() {
return deleteExpression;
}

/**
* Returns added data files.
*
* @deprecated since 1.3.0, will be removed in 1.4.0; use {@link #addedDataFiles()}.
*/
@Deprecated
protected List<DataFile> addedFiles() {
return addedDataFiles();
}

protected List<DataFile> addedDataFiles() {
return ImmutableList.copyOf(newDataFiles);
}
Expand Down Expand Up @@ -688,18 +678,6 @@ private CloseableIterable<ManifestEntry<DataFile>> deletedDataFiles(
return manifestGroup.entries();
}

/**
* Sets a data sequence number for new data files.
*
* @param sequenceNumber a data sequence number
* @deprecated since 1.3.0, will be removed in 1.4.0; use {@link
* #setNewDataFilesDataSequenceNumber(long)};
*/
@Deprecated
protected void setNewFilesSequenceNumber(long sequenceNumber) {
setNewDataFilesDataSequenceNumber(sequenceNumber);
}

protected void setNewDataFilesDataSequenceNumber(long sequenceNumber) {
this.newDataFilesDataSequenceNumber = sequenceNumber;
}
Expand Down

This file was deleted.

Loading