(iceberg) branch main updated: Core: Remove deprecated code in DeleteFileIndex (#9166)

[russellspitzer]

This is an automated email from the ASF dual-hosted git repository.

russellspitzer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/main by this push:
     new d247b20f16 Core: Remove deprecated code in DeleteFileIndex (#9166)
d247b20f16 is described below

commit d247b20f166ccb0b92443d4b05330b1e0d9c5d49
Author: Anton Okolnychyi <aokolnyc...@apple.com>
AuthorDate: Tue Nov 28 15:52:55 2023 -0800

    Core: Remove deprecated code in DeleteFileIndex (#9166)
---
 .../java/org/apache/iceberg/DeleteFileIndex.java   | 41 ----------------------
 1 file changed, 41 deletions(-)

diff --git a/core/src/main/java/org/apache/iceberg/DeleteFileIndex.java 
b/core/src/main/java/org/apache/iceberg/DeleteFileIndex.java
index 51917a71e9..02e55c595f 100644
--- a/core/src/main/java/org/apache/iceberg/DeleteFileIndex.java
+++ b/core/src/main/java/org/apache/iceberg/DeleteFileIndex.java
@@ -78,16 +78,6 @@ class DeleteFileIndex {
   private final boolean isEmpty;
   private final boolean useColumnStatsFiltering;
 
-  /** @deprecated since 1.4.0, will be removed in 1.5.0. */
-  @Deprecated
-  DeleteFileIndex(
-      Map<Integer, PartitionSpec> specs,
-      long[] globalSeqs,
-      DeleteFile[] globalDeletes,
-      Map<Pair<Integer, StructLikeWrapper>, Pair<long[], DeleteFile[]>> 
deletesByPartition) {
-    this(specs, index(specs, globalSeqs, globalDeletes), index(specs, 
deletesByPartition), true);
-  }
-
   private DeleteFileIndex(
       Map<Integer, PartitionSpec> specs,
       DeleteFileGroup globalDeletes,
@@ -374,37 +364,6 @@ class DeleteFileIndex {
     return nullValueCount > 0;
   }
 
-  private static DeleteFileGroup index(
-      Map<Integer, PartitionSpec> specs, Pair<long[], DeleteFile[]> pairs) {
-    return index(specs, pairs.first(), pairs.second());
-  }
-
-  private static DeleteFileGroup index(
-      Map<Integer, PartitionSpec> specs, long[] seqs, DeleteFile[] files) {
-    if (files == null || files.length == 0) {
-      return null;
-    }
-
-    IndexedDeleteFile[] indexedGlobalDeleteFiles = new 
IndexedDeleteFile[files.length];
-
-    for (int pos = 0; pos < files.length; pos++) {
-      DeleteFile file = files[pos];
-      PartitionSpec spec = specs.get(file.specId());
-      long applySequenceNumber = seqs[pos];
-      indexedGlobalDeleteFiles[pos] = new IndexedDeleteFile(spec, file, 
applySequenceNumber);
-    }
-
-    return new DeleteFileGroup(seqs, indexedGlobalDeleteFiles);
-  }
-
-  private static Map<Pair<Integer, StructLikeWrapper>, DeleteFileGroup> index(
-      Map<Integer, PartitionSpec> specs,
-      Map<Pair<Integer, StructLikeWrapper>, Pair<long[], DeleteFile[]>> 
deletesByPartition) {
-    Map<Pair<Integer, StructLikeWrapper>, DeleteFileGroup> indexed = 
Maps.newHashMap();
-    deletesByPartition.forEach((key, value) -> indexed.put(key, index(specs, 
value)));
-    return indexed;
-  }
-
   static Builder builderFor(FileIO io, Iterable<ManifestFile> deleteManifests) 
{
     return new Builder(io, Sets.newHashSet(deleteManifests));
   }