This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 946f2832c203ad244e4d682e8fa376519dfad9ca Merge: 8e9972c1d6 835bc42b37 Author: Apache AsterixDB Gerrit <[email protected]> AuthorDate: Fri May 10 15:08:00 2024 +0000 Merge "Merge branch 'gerrit/trinity' into 'master'" .../apache/asterix/translator/ClientRequest.java | 98 ++++++++++++------- .../apache/asterix/translator/Receptionist.java | 6 +- .../api/http/server/QueryServiceServlet.java | 2 +- .../app/active/ActiveNotificationHandler.java | 10 +- .../org/apache/asterix/app/cc/GlobalTxManager.java | 16 ++-- .../asterix/app/translator/QueryTranslator.java | 6 +- .../asterix/hyracks/bootstrap/CCApplication.java | 1 + .../http/servlet/QueryCancellationServletTest.java | 4 +- .../asterix/test/active/ActiveStatsTest.java | 6 +- .../test/active/TestClusterControllerActor.java | 7 +- .../apache/asterix/common/api/IClientRequest.java | 32 +++++++ .../apache/asterix/common/api/IReceptionist.java | 9 +- .../apache/asterix/common/api/IRequestTracker.java | 13 ++- .../runtime/job/listener/NodeJobTracker.java | 9 +- .../asterix/runtime/utils/RequestTracker.java | 52 ++++++++++ .../runtime/job/listener/NodeJobTrackerTest.java | 7 +- .../hyracks/api/job/IJobLifecycleListener.java | 31 +++--- .../apache/hyracks/api/job/JobSpecification.java | 10 ++ .../control/cc/application/CCServiceContext.java | 16 ++-- .../hyracks/control/cc/executor/JobExecutor.java | 2 +- .../apache/hyracks/control/cc/job/IJobManager.java | 20 ++++ .../apache/hyracks/control/cc/job/JobManager.java | 105 +++++++++++++++++---- .../control/cc/result/ResultDirectoryService.java | 9 +- .../integration/TestJobLifecycleListener.java | 9 +- 24 files changed, 369 insertions(+), 111 deletions(-)
