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 bc86836eb986f2cc4ce3fd1856f595043dad4f97 Merge: ba446b9a0c dad9820245 Author: Apache AsterixDB Gerrit <[email protected]> AuthorDate: Sat Jun 15 17:18:56 2024 +0000 Merge "Merge branch 'gerrit/trinity' into 'master'" .../org/apache/asterix/active/ActiveManager.java | 11 +++++---- .../http/server/QueryServiceRequestParameters.java | 9 +++++++ .../api/http/server/QueryServiceServlet.java | 21 ++++++++++++---- .../app/active/ActiveEntityEventsListener.java | 20 ++++++---------- .../app/active/ActiveNotificationHandler.java | 2 +- .../org/apache/asterix/app/nc/RecoveryManager.java | 3 --- .../query-ASTERIXDB-3418.1.query.sqlpp | 26 ++++---------------- .../query-ASTERIXDB-3418.2.query.sqlpp | 26 ++++---------------- .../query-ASTERIXDB-3418.3.query.sqlpp | 26 ++++---------------- .../query-ASTERIXDB-3418.4.query.sqlpp | 26 ++++---------------- .../results/comparison/arrays/arrays.020.adm | 2 +- .../query-ASTERIXDB-3418.1.adm | 1 + .../query-ASTERIXDB-3418.2.adm | 1 + .../query-ASTERIXDB-3418.3.adm | 1 + .../query-ASTERIXDB-3418.4.adm | 1 + .../src/test/resources/runtimets/sqlpp_queries.xml | 5 ++++ .../data/nontagged/comparators/ComparatorUtil.java | 20 +++++++++++----- .../evaluators/functions/SleepDescriptor.java | 8 +++---- .../job/resource/JobCapacityController.java | 5 ++++ ...stractOneInputOneOutputOneFramePushRuntime.java | 2 +- .../job/resource/DefaultJobCapacityController.java | 10 ++++++++ .../api/job/resource/IJobCapacityController.java | 6 +++++ .../hyracks/control/cc/executor/JobExecutor.java | 6 ++++- .../apache/hyracks/control/cc/job/JobManager.java | 22 +++++++++++++++++ .../control/cc/partitions/PartitionMatchMaker.java | 4 ++-- .../control/cc/result/ResultDirectoryService.java | 1 - .../hyracks/control/cc/scheduler/FIFOJobQueue.java | 5 ++++ .../hyracks/control/cc/scheduler/IJobQueue.java | 7 ++++++ .../cc/work/GetResultPartitionLocationsWork.java | 6 +++++ .../hyracks/control/cc/work/JobCleanupWork.java | 7 ++++++ .../work/RegisterResultPartitionLocationWork.java | 5 ++++ .../control/cc/work/RemoveDeadNodesWork.java | 2 +- .../hyracks/control/cc/work/TaskFailureWork.java | 4 +++- .../control/cc/work/WaitForJobCompletionWork.java | 6 +++++ .../MaterializingPipelinedPartition.java | 7 ------ .../hyracks/control/nc/work/CleanupJobletWork.java | 2 +- .../control/nc/work/NotifyTaskFailureWork.java | 5 +++- .../OptimizedHybridHashJoinOperatorDescriptor.java | 28 +++++----------------- .../dataflow/std/sort/TupleSorterHeapSort.java | 9 ------- .../AbstractMultiNCIntegrationTest.java | 10 ++++++++ 40 files changed, 200 insertions(+), 168 deletions(-)
