Remove pending deletions workaround (#41245)

The recent upgrade to lucene 8.1.0 included the fix for LUCENE-8735
(pending deletions did not delegate). Removed the temporary workaround
that was previously added for this issue.

Follow up to #40345

plugins/store-smb/src/main/java/org/elasticsearch/index/store/SmbDirectoryWrapper.java

@@ -30,7 +30,6 @@
 import java.nio.channels.Channels;
 import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
-import java.util.Set;
 
 /**
  * This class is used to wrap an existing {@link org.apache.lucene.store.FSDirectory} so that
@@ -80,10 +79,4 @@ public void write(byte[] b, int offset, int length) throws IOException {
                     CHUNK_SIZE);
         }
     }
-
-    // temporary override until LUCENE-8735 is integrated
-    @Override
-    public Set<String> getPendingDeletions() throws IOException {
-        return in.getPendingDeletions();
-    }
 }

server/src/main/java/org/elasticsearch/index/shard/LocalShardSnapshot.java

@@ -33,7 +33,6 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 final class LocalShardSnapshot implements Closeable {
@@ -117,12 +116,6 @@ public Lock obtainLock(String name) throws IOException {
             public void close() throws IOException {
                 throw new UnsupportedOperationException("nobody should close this directory wrapper");
             }
-
-            // temporary override until LUCENE-8735 is integrated
-            @Override
-            public Set<String> getPendingDeletions() throws IOException {
-                return in.getPendingDeletions();
-            }
         };
     }
 

server/src/main/java/org/elasticsearch/index/shard/StoreRecovery.java

@@ -259,12 +259,6 @@ public void readBytes(byte[] b, int offset, int len) throws IOException {
                 assert index.getFileDetails(dest).recovered() == l : index.getFileDetails(dest).toString();
             }
         }
-
-        // temporary override until LUCENE-8735 is integrated
-        @Override
-        public Set<String> getPendingDeletions() throws IOException {
-            return in.getPendingDeletions();
-        }
     }
 
     /**

server/src/main/java/org/elasticsearch/index/store/ByteSizeCachingDirectory.java

@@ -32,7 +32,6 @@
 import java.io.UncheckedIOException;
 import java.nio.file.AccessDeniedException;
 import java.nio.file.NoSuchFileException;
-import java.util.Set;
 
 final class ByteSizeCachingDirectory extends FilterDirectory {
 
@@ -180,10 +179,4 @@ public void deleteFile(String name) throws IOException {
             }
         }
     }
-
-    // temporary override until LUCENE-8735 is integrated
-    @Override
-    public Set<String> getPendingDeletions() throws IOException {
-        return in.getPendingDeletions();
-    }
 }

server/src/main/java/org/elasticsearch/index/store/Store.java

@@ -760,13 +760,6 @@ public IndexInput openInput(String name, IOContext context) throws IOException {
         public String toString() {
             return "store(" + in.toString() + ")";
         }
-
-        @Override
-        public Set<String> getPendingDeletions() throws IOException {
-            // FilterDirectory.getPendingDeletions does not delegate, working around it here.
-            // to be removed once fixed in FilterDirectory.
-            return unwrap(this).getPendingDeletions();
-        }
     }
 
     /**

server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java

@@ -1457,12 +1457,6 @@ public String[] listAll() throws IOException {
                     return super.listAll();
                 }
             }
-
-            // temporary override until LUCENE-8735 is integrated
-            @Override
-            public Set<String> getPendingDeletions() throws IOException {
-                return in.getPendingDeletions();
-            }
         };
 
         try (Store store = createStore(shardId, new IndexSettings(metaData, Settings.EMPTY), directory)) {

server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java

@@ -28,7 +28,6 @@
 import org.elasticsearch.test.ESTestCase;
 
 import java.io.IOException;
-import java.util.Set;
 
 @LuceneTestCase.SuppressFileSystems("ExtrasFS")
 public class ByteSizeCachingDirectoryTests extends ESTestCase {
@@ -46,12 +45,6 @@ public long fileLength(String name) throws IOException {
             numFileLengthCalls++;
             return super.fileLength(name);
         }
-
-        // temporary override until LUCENE-8735 is integrated
-        @Override
-        public Set<String> getPendingDeletions() throws IOException {
-            return in.getPendingDeletions();
-        }
     }
 
     public void testBasics() throws IOException {

test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryService.java

@@ -54,7 +54,6 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Random;
-import java.util.Set;
 
 public class MockFSDirectoryService extends FsDirectoryService {
 
@@ -179,12 +178,6 @@ public synchronized void crash() throws IOException {
                 super.crash();
             }
         }
-
-        // temporary override until LUCENE-8735 is integrated
-        @Override
-        public Set<String> getPendingDeletions() throws IOException {
-            return in.getPendingDeletions();
-        }
     }
 
     static final class CloseableDirectory implements Closeable {