Fix Azure path comparison when filePath is root ("/") (#385)

* Fix Azure path comparison * Address comments * Formatting
apache · Oct 18, 2024 · 3191ea0 · 3191ea0
1 parent b33d84a
commit 3191ea0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/StorageLocation.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/StorageLocation.java
@@ -55,6 +55,15 @@ protected final String ensureTrailingSlash(String location) {
     }
   }
 
+  /** If a path doesn't start with `/`, this will add one */
+  protected final @NotNull String ensureLeadingSlash(@NotNull String location) {
+    if (location.startsWith("/")) {
+      return location;
+    } else {
+      return "/" + location;
+    }
+  }
+
   @Override
   public int hashCode() {
     return location.hashCode();

diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureLocation.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureLocation.java
@@ -108,9 +108,10 @@ public boolean isChildOf(@NotNull StorageLocation potentialParent) {
       AzureLocation potentialAzureParent = (AzureLocation) potentialParent;
       if (this.container.equals(potentialAzureParent.container)) {
         if (this.storageAccount.equals(potentialAzureParent.storageAccount)) {
-          String slashTerminatedFilePath = ensureTrailingSlash(this.filePath);
-          String slashTerminatedParentFilePath = ensureTrailingSlash(potentialAzureParent.filePath);
-          return slashTerminatedFilePath.startsWith(slashTerminatedParentFilePath);
+          String formattedFilePath = ensureLeadingSlash(ensureTrailingSlash(this.filePath));
+          String formattedParentFilePath =
+              ensureLeadingSlash(ensureTrailingSlash(potentialAzureParent.filePath));
+          return formattedFilePath.startsWith(formattedParentFilePath);
         }
       }
     }

diff --git a/polaris-core/src/test/java/org/apache/polaris/service/storage/azure/AzureLocationTest.java b/polaris-core/src/test/java/org/apache/polaris/service/storage/azure/AzureLocationTest.java
@@ -55,6 +55,22 @@ public void testCrossSchemeComparisons() {
     Assertions.assertThat(abfsLocation.isChildOf(wasbLocation)).isTrue();
   }
 
+  @Test
+  public void testLocationComparisons() {
+    StorageLocation location =
+        AzureLocation.of("abfss://[email protected]/some_file/metadata");
+    StorageLocation parentLocation =
+        AzureLocation.of("abfss://[email protected]");
+    StorageLocation parentLocationTrailingSlash =
+        AzureLocation.of("abfss://[email protected]/");
+
+    Assertions.assertThat(location).isNotEqualTo(parentLocation);
+    Assertions.assertThat(location).isNotEqualTo(parentLocationTrailingSlash);
+
+    Assertions.assertThat(location.isChildOf(parentLocation)).isTrue();
+    Assertions.assertThat(location.isChildOf(parentLocationTrailingSlash)).isTrue();
+  }
+
   @Test
   public void testLocation_negative_cases() {
     Assertions.assertThatThrownBy(