Obtain safely a sibling location

trinodb · Jul 21, 2023 · 4ce5f46 · 4ce5f46
1 parent cb27662
commit 4ce5f46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...a/io/trino/plugin/deltalake/transactionlog/writer/S3NativeTransactionLogSynchronizer.java b/...a/io/trino/plugin/deltalake/transactionlog/writer/S3NativeTransactionLogSynchronizer.java
@@ -79,7 +79,7 @@ public boolean isUnsafe()
     public void write(ConnectorSession session, String clusterId, Location newLogEntryPath, byte[] entryContents)
     {
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
-        Location locksDirectory = newLogEntryPath.parentDirectory().appendPath(LOCK_DIRECTORY);
+        Location locksDirectory = newLogEntryPath.sibling(LOCK_DIRECTORY);
         String newEntryFilename = newLogEntryPath.fileName();
         Optional<LockInfo> myLockInfo = Optional.empty();
 

diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OriginalFilesUtils.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/orc/OriginalFilesUtils.java
@@ -54,7 +54,7 @@ public static long getPrecedingRowCount(
         long rowCount = 0;
         for (OriginalFileInfo originalFileInfo : originalFileInfos) {
             if (originalFileInfo.getName().compareTo(splitPath.fileName()) < 0) {
-                Location path = splitPath.parentDirectory().appendPath(originalFileInfo.getName());
+                Location path = splitPath.sibling(originalFileInfo.getName());
                 TrinoInputFile inputFile = fileSystemFactory.create(identity)
                         .newInputFile(path, originalFileInfo.getFileSize());
                 rowCount += getRowsInFile(inputFile, options, stats);