From d247b20f166ccb0b92443d4b05330b1e0d9c5d49 Mon Sep 17 00:00:00 2001 From: Anton Okolnychyi Date: Tue, 28 Nov 2023 15:52:55 -0800 Subject: [PATCH] Core: Remove deprecated code in DeleteFileIndex (#9166) --- .../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 51917a71e9d9..02e55c595f3c 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 specs, - long[] globalSeqs, - DeleteFile[] globalDeletes, - Map, Pair> deletesByPartition) { - this(specs, index(specs, globalSeqs, globalDeletes), index(specs, deletesByPartition), true); - } - private DeleteFileIndex( Map specs, DeleteFileGroup globalDeletes, @@ -374,37 +364,6 @@ private static boolean containsNull(Map nullValueCounts, Types.Ne return nullValueCount > 0; } - private static DeleteFileGroup index( - Map specs, Pair pairs) { - return index(specs, pairs.first(), pairs.second()); - } - - private static DeleteFileGroup index( - Map 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, DeleteFileGroup> index( - Map specs, - Map, Pair> deletesByPartition) { - Map, DeleteFileGroup> indexed = Maps.newHashMap(); - deletesByPartition.forEach((key, value) -> indexed.put(key, index(specs, value))); - return indexed; - } - static Builder builderFor(FileIO io, Iterable deleteManifests) { return new Builder(io, Sets.newHashSet(deleteManifests)); }