Fixed testRenameDirectoryAsExistingFile

apache · Feb 1, 2025 · f00f5c9 · f00f5c9
1 parent f3acefb
commit f00f5c9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/...p-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java b/...p-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java
@@ -558,6 +558,9 @@ public boolean rename(final Path src, final Path dst) throws IOException {
       Path adjustedDst = dst;
 
       if (dstFileStatus != null) {
+        if (!dstFileStatus.isDirectory()) {
+          return qualifiedSrcPath.equals(qualifiedDstPath);
+        }
         adjustedDst = new Path(dst, sourceFileName);
       }
 

diff --git a/...oop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemDelete.java b/...oop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemDelete.java
@@ -345,16 +345,6 @@ public void deleteBlobDirParallelThreadToDeleteOnDifferentTracingContext()
     fs.close();
   }
 
-  /**
-   * Assumes that the AzureBlobFileSystem's client is an instance of `AbfsBlobClient`.
-   * This assumption is used to ensure that the test runs only if the correct client type is present.
-   *
-   * @throws IOException if the file system client cannot be retrieved
-   */
-  private void assumeBlobClient() throws IOException {
-    Assume.assumeTrue(getFileSystem().getAbfsClient() instanceof AbfsBlobClient);
-  }
-
   /**
    * Tests deleting an implicit directory and its contents. The test verifies that after deletion,
    * both the directory and its child file no longer exist.
@@ -364,7 +354,7 @@ private void assumeBlobClient() throws IOException {
   @Test
   public void testDeleteImplicitDir() throws Exception {
     AzureBlobFileSystem fs = getFileSystem();
-    assumeBlobClient();
+    assumeBlobServiceType();
     fs.mkdirs(new Path("/testDir/dir1"));
     fs.create(new Path("/testDir/dir1/file1"));
     AbfsBlobClient client = (AbfsBlobClient) fs.getAbfsClient();
@@ -389,7 +379,7 @@ public void testDeleteImplicitDir() throws Exception {
   public void testDeleteImplicitDirWithSingleListResults() throws Exception {
     AzureBlobFileSystem fs = (AzureBlobFileSystem) FileSystem.newInstance(
             getRawConfiguration());
-    assumeBlobClient();
+    assumeBlobServiceType();
     AbfsBlobClient client = (AbfsBlobClient) fs.getAbfsClient();
     AbfsBlobClient spiedClient = Mockito.spy(client);
     fs.getAbfsStore().setClient(spiedClient);
@@ -425,7 +415,7 @@ public void testDeleteImplicitDirWithSingleListResults() throws Exception {
   @Test
   public void testDeleteExplicitDirInImplicitParentDir() throws Exception {
     AzureBlobFileSystem fs = getFileSystem();
-    assumeBlobClient();
+    assumeBlobServiceType();
     AbfsBlobClient client = (AbfsBlobClient) fs.getAbfsClient();
     fs.mkdirs(new Path("/testDir/dir1"));
     fs.create(new Path("/testDir/dir1/file1"));
@@ -453,7 +443,7 @@ public void testDeleteExplicitDirInImplicitParentDir() throws Exception {
   @Test
   public void testDeleteParallelBlobFailure() throws Exception {
     AzureBlobFileSystem fs = Mockito.spy(getFileSystem());
-    assumeBlobClient();
+    assumeBlobServiceType();
     AbfsBlobClient client = Mockito.spy((AbfsBlobClient) fs.getAbfsClient());
     AzureBlobFileSystemStore store = Mockito.spy(fs.getAbfsStore());
     store.setClient(client);
@@ -497,7 +487,7 @@ public void testDeleteRootWithNonRecursion() throws Exception {
    */
   @Test
   public void testProducerStopOnDeleteFailure() throws Exception {
-    assumeBlobClient();
+    assumeBlobServiceType();
     Configuration configuration = Mockito.spy(getRawConfiguration());
     AzureBlobFileSystem fs = Mockito.spy(
             (AzureBlobFileSystem) FileSystem.get(configuration));
@@ -575,7 +565,7 @@ public void testProducerStopOnDeleteFailure() throws Exception {
   @Test
   public void testDeleteEmitDeletionCountInClientRequestId() throws Exception {
     AzureBlobFileSystem fs = Mockito.spy(getFileSystem());
-    assumeBlobClient();
+    assumeBlobServiceType();
     AbfsBlobClient client = (AbfsBlobClient) fs.getAbfsClient();
     AbfsBlobClient spiedClient = Mockito.spy(client);
     AzureBlobFileSystemStore store = Mockito.spy(fs.getAbfsStore());

diff --git a/...re/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemRenameUnicode.java b/...re/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemRenameUnicode.java
@@ -24,8 +24,8 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import org.apache.hadoop.fs.azurebfs.constants.AbfsServiceType;
 import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AbfsRestOperationException;
-import org.apache.hadoop.fs.azurebfs.services.AbfsBlobClient;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.PathIOException;
@@ -90,7 +90,7 @@ public void testRenameFileUsingUnicode() throws Exception {
     assertIsFile(fs, filePath);
 
     Path folderPath2 = new Path(destDir);
-    if (getFileSystem().getAbfsClient() instanceof AbfsBlobClient
+    if (getAbfsServiceType() == AbfsServiceType.BLOB
         && destDir.contains(COLON)) {
       AbfsRestOperationException ex = intercept(
           AbfsRestOperationException.class, () -> {

diff --git a/...adoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/TracingHeaderValidator.java b/...adoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/TracingHeaderValidator.java
@@ -186,6 +186,10 @@ public void updatePosition(String position) {
     this.position = position;
   }
 
+  /**
+   * Sets the value of the number of blobs operated on
+   * @param operatedBlobCount number of blobs operated on
+   */
   public void setOperatedBlobCount(Integer operatedBlobCount) {
     this.operatedBlobCount = operatedBlobCount;
   }