Change in asterixdb[master]: [NO ISSUE][EXT]: External Library fixes

[AsterixDB Code Review]

>From Ian Maxon <ima...@apache.org>:

Ian Maxon has uploaded this change for review. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19447 )


Change subject: [NO ISSUE][EXT]: External Library fixes
......................................................................

[NO ISSUE][EXT]: External Library fixes

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
Address remaining comments to:
- Clean up local disk when deleting libraries
- Don't touch library file if already present

Change-Id: I9ba13e7afc54ddd08f5e522627c56d11f51ca4a9
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCUdfApiServlet.java
M 
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalLibraryManager.java
2 files changed, 27 insertions(+), 8 deletions(-)



  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/47/19447/1

diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCUdfApiServlet.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCUdfApiServlet.java
index 76d91cf..02a99f6 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCUdfApiServlet.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCUdfApiServlet.java
@@ -239,7 +239,9 @@
         if (!libDir.getFile().exists()) {
             Files.createDirectories(lib.getFile().toPath().getParent());
         }
-        Files.createFile(lib.getFile().toPath());
+        if (!lib.getFile().exists()) {
+            Files.createFile(lib.getFile().toPath());
+        }
         IFileHandle fh = cloudIoMgr.open(lib, 
IIOManager.FileReadWriteMode.READ_WRITE,
                 IIOManager.FileSyncMode.METADATA_ASYNC_DATA_ASYNC);
         WritableByteChannel outChannel = cloudIoMgr.newWritableChannel(fh);
diff --git 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalLibraryManager.java
 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalLibraryManager.java
index f9dc118..7001058 100755
--- 
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalLibraryManager.java
+++ 
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/ExternalLibraryManager.java
@@ -515,14 +515,13 @@
             if (ncs.getConfiguration().isCloudDeployment()) {
                 ioManager.delete(fileRef.getChild(LIBRARY_ARCHIVE_NAME));
                 ioManager.delete(fileRef.getChild(DESCRIPTOR_FILE_NAME));
-            } else {
-                Path trashPath = Files.createTempDirectory(trashDirPath, null);
-                if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("Drop (move) {} into {}", path, trashPath);
-                }
-                Files.move(path, trashPath, StandardCopyOption.ATOMIC_MOVE);
-                ncs.getWorkQueue().schedule(new 
DeleteDirectoryWork(trashPath));
             }
+            Path trashPath = Files.createTempDirectory(trashDirPath, null);
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("Drop (move) {} into {}", path, trashPath);
+            }
+            Files.move(path, trashPath, StandardCopyOption.ATOMIC_MOVE);
+            ncs.getWorkQueue().schedule(new DeleteDirectoryWork(trashPath));
         } catch (IOException e) {
             throw HyracksDataException.create(e);
         }

--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19447
To unsubscribe, or for help writing mail filters, visit 
https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I9ba13e7afc54ddd08f5e522627c56d11f51ca4a9
Gerrit-Change-Number: 19447
Gerrit-PatchSet: 1
Gerrit-Owner: Ian Maxon <ima...@apache.org>
Gerrit-MessageType: newchange