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

apache · Jul 4, 2023 · 65906a8 · 65906a8
1 parent 2afd1dc
commit 65906a8
Show file tree

Hide file tree

Showing 32 changed files with 121 additions and 1,359 deletions.
diff --git a/...w/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java b/...w/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java
@@ -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(
@@ -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();
   }

diff --git a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedPageIterator.java b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedPageIterator.java
@@ -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;
@@ -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(
@@ -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();
   }

diff --git a/core/src/main/java/org/apache/iceberg/MergingSnapshotProducer.java b/core/src/main/java/org/apache/iceberg/MergingSnapshotProducer.java
@@ -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);
   }
@@ -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;
   }

diff --git a/core/src/main/java/org/apache/iceberg/actions/BaseDeleteOrphanFilesActionResult.java b/core/src/main/java/org/apache/iceberg/actions/BaseDeleteOrphanFilesActionResult.java
diff --git a/core/src/main/java/org/apache/iceberg/actions/BaseDeleteReachableFilesActionResult.java b/core/src/main/java/org/apache/iceberg/actions/BaseDeleteReachableFilesActionResult.java