This is an automated email from the ASF dual-hosted git repository. dlych pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 681cd3601e1c1215c29d76ea667b8324facdd2f7 Author: Ian Maxon <[email protected]> AuthorDate: Wed Apr 7 19:52:05 2021 -0700 [NO ISSUE] Pass request parameters with DROP fn/lib - user model changes: no - storage format changes: no - interface changes: yes Details: - Pass request parameters that are passed during CREATE during DROP as well Change-Id: I9676ef0e3dae3af10f28c663648a6dea72965955 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/10945 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Ian Maxon <[email protected]> Reviewed-by: Dmitry Lychagin <[email protected]> --- .../apache/asterix/app/translator/QueryTranslator.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java index a06f014..d49649d 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java @@ -378,13 +378,13 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen handleCreateFunctionStatement(metadataProvider, stmt, stmtRewriter, requestParameters); break; case FUNCTION_DROP: - handleFunctionDropStatement(metadataProvider, stmt); + handleFunctionDropStatement(metadataProvider, stmt, requestParameters); break; case CREATE_LIBRARY: handleCreateLibraryStatement(metadataProvider, stmt, hcc, requestParameters); break; case LIBRARY_DROP: - handleLibraryDropStatement(metadataProvider, stmt, hcc); + handleLibraryDropStatement(metadataProvider, stmt, hcc, requestParameters); break; case CREATE_SYNONYM: handleCreateSynonymStatement(metadataProvider, stmt); @@ -2279,7 +2279,8 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen return new Triple<>(paramTypeSignature, depTypeSignature, paramInlineTypeEntity); } - protected void handleFunctionDropStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception { + protected void handleFunctionDropStatement(MetadataProvider metadataProvider, Statement stmt, + IRequestParameters requestParameters) throws Exception { FunctionDropStatement stmtDropFunction = (FunctionDropStatement) stmt; FunctionSignature signature = stmtDropFunction.getFunctionSignature(); metadataProvider.validateDatabaseObjectName(signature.getDataverseName(), signature.getName(), @@ -2288,14 +2289,14 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen signature.setDataverseName(dataverseName); lockUtil.dropFunctionBegin(lockManager, metadataProvider.getLocks(), dataverseName, signature.getName()); try { - doDropFunction(metadataProvider, stmtDropFunction, signature); + doDropFunction(metadataProvider, stmtDropFunction, signature, requestParameters); } finally { metadataProvider.getLocks().unlock(); } } protected boolean doDropFunction(MetadataProvider metadataProvider, FunctionDropStatement stmtDropFunction, - FunctionSignature signature) throws Exception { + FunctionSignature signature, IRequestParameters requestParameters) throws Exception { DataverseName dataverseName = signature.getDataverseName(); SourceLocation sourceLoc = stmtDropFunction.getSourceLocation(); MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); @@ -2585,7 +2586,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } protected void handleLibraryDropStatement(MetadataProvider metadataProvider, Statement stmt, - IHyracksClientConnection hcc) throws Exception { + IHyracksClientConnection hcc, IRequestParameters requestParameters) throws Exception { LibraryDropStatement stmtDropLibrary = (LibraryDropStatement) stmt; String libraryName = stmtDropLibrary.getLibraryName(); metadataProvider.validateDatabaseObjectName(stmtDropLibrary.getDataverseName(), libraryName, @@ -2593,14 +2594,15 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen DataverseName dataverseName = getActiveDataverseName(stmtDropLibrary.getDataverseName()); lockUtil.dropLibraryBegin(lockManager, metadataProvider.getLocks(), dataverseName, libraryName); try { - doDropLibrary(metadataProvider, stmtDropLibrary, dataverseName, libraryName, hcc); + doDropLibrary(metadataProvider, stmtDropLibrary, dataverseName, libraryName, hcc, requestParameters); } finally { metadataProvider.getLocks().unlock(); } } protected boolean doDropLibrary(MetadataProvider metadataProvider, LibraryDropStatement stmtDropLibrary, - DataverseName dataverseName, String libraryName, IHyracksClientConnection hcc) throws Exception { + DataverseName dataverseName, String libraryName, IHyracksClientConnection hcc, + IRequestParameters requestParameters) throws Exception { JobUtils.ProgressState progress = ProgressState.NO_PROGRESS; MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); boolean bActiveTxn = true;
