>From Ali Alsuliman <[email protected]>: Ali Alsuliman has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21289?usp=email )
Change subject: [ASTERIXDB-3649][API] Remove tracking info when no job created ...................................................................... [ASTERIXDB-3649][API] Remove tracking info when no job created - user model changes: no - storage format changes: no - interface changes: no Details: If no job is created, remove the tracking information for async requests. Job won't be created if: * there is a compilation error. * compile-only requests. * empty statements. * ... Ext-ref: MB-69763 Change-Id: I617b6bbec266a8affb70fc9af7d8d44fdeee9474 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21289 Reviewed-by: Ali Alsuliman <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> Integration-Tests: Jenkins <[email protected]> --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Anon. E. Moose #1000171: Murtadha Hubail: Looks good to me, approved Jenkins: Verified; Verified Ali Alsuliman: Looks good to me, but someone else must approve 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 8e165c0..b744a80 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 @@ -610,12 +610,22 @@ throw ex; } finally { // async queries are completed after their job completes - if (statements.isEmpty() || ResultDelivery.ASYNC != resultDelivery) { + if (ResultDelivery.ASYNC != resultDelivery) { // this assumes 1-1 mapping between a request and a statement, needs to be adapted for multi-statement appCtx.getRequestTracker().complete(reqId); - if (ResultDelivery.ASYNC != resultDelivery && trackInAsyncDeferredRequests) { + if (trackInAsyncDeferredRequests) { completeDeferred((ClientRequest) clientRequest, hasResultSet, exception); } + } else { + if (statements.isEmpty()) { + appCtx.getRequestTracker().complete(reqId); + } + if (trackInAsyncDeferredRequests) { + JobId jobId = ((ClientRequest) clientRequest).getJobId(); + if (jobId == null) { + appCtx.getRequestTracker().removeAsyncOrDeferredRequest(clientRequest.getId()); + } + } } Thread.currentThread().setName(threadName); } -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21289?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: lumina Gerrit-Change-Id: I617b6bbec266a8affb70fc9af7d8d44fdeee9474 Gerrit-Change-Number: 21289 Gerrit-PatchSet: 2 Gerrit-Owner: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]>
