This is an automated email from the ASF dual-hosted git repository.

alsuliman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 622df4ea0f28cd879cfbde134f95e3a6daeafc83
Merge: 9fdf5fdc21 47d9ff4583
Author: Ali Alsuliman <[email protected]>
AuthorDate: Mon May 13 20:27:10 2024 +0300

    Merge branch 'trinity' into 'master'
    
    Change-Id: I6b458d2761d490355dde6e4238a15bd42a1e0d9d

 .../asterix/translator/BaseClientRequest.java      |  9 +++
 .../apache/asterix/translator/ClientRequest.java   | 25 +++++---
 .../api/http/server/AbstractRequestsServlet.java   | 12 +++-
 .../apache/asterix/app/active/RecoveryTask.java    |  1 +
 .../active_requests.2.pollquery.sqlpp              |  2 +-
 .../completed_requests.4.query.sqlpp}              |  8 +--
 .../misc/active_requests/active_requests.2.regex   |  2 +-
 .../completed_requests.4.regexjson                 | 19 ++++++
 .../apache/asterix/common/api/IClientRequest.java  |  5 ++
 .../asterix/runtime/utils/RequestTracker.java      | 48 ++++++++++-----
 .../hyracks/control/cc/executor/JobExecutor.java   | 15 ++---
 .../apache/hyracks/control/cc/job/JobManager.java  |  5 +-
 .../control/cc/partitions/PartitionMatchMaker.java | 71 ++++++----------------
 .../control/cc/result/ResultDirectoryService.java  | 25 +++++---
 .../hyracks/control/cc/work/JobCleanupWork.java    |  1 -
 .../hyracks/control/cc/work/TaskFailureWork.java   |  9 +--
 .../control/common/config/ConfigManager.java       | 11 +++-
 .../apache/hyracks/control/nc/CcConnection.java    |  2 +
 .../control/nc/work/NotifyTaskFailureWork.java     |  4 --
 19 files changed, 154 insertions(+), 120 deletions(-)


Reply via email to