This is an automated email from the ASF dual-hosted git repository. ritik pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 5237daee69fa6d0d2515ad6be8c44e62c6134051 Merge: 130dd2b34b 52b8df6313 Author: Michael Blow <[email protected]> AuthorDate: Sat Nov 23 10:20:59 2024 -0500 Merge branch 'gerrit/trinity' into 'gerrit/morpheus' Change-Id: I64ace35c05e7226bd9965537e05ac6cc8fad648d .../rules/PushAggregateIntoNestedSubplanRule.java | 6 ++- .../optimizer/rules/PushGroupByThroughProduct.java | 4 +- .../NoOpFrameOperationCallbackFactory.java | 5 +++ .../LSMPrimaryInsertOperatorNodePushable.java | 10 ++++- .../LSMPrimaryUpsertOperatorNodePushable.java | 13 ++++++- .../runtime/operators/StandardBatchController.java | 45 ++++++++++++++++++++++ .../algebra/util/OperatorManipulationUtil.java | 19 +++++++-- .../rewriter/rules/AbstractDecorrelationRule.java | 4 +- .../subplan/IntroduceGroupByForSubplanRule.java | 7 +++- .../apache/hyracks/api/comm/IFrameAppender.java | 2 +- .../hyracks/api/util/HyracksThrowingAction.java} | 30 ++------------- .../org/apache/hyracks/api/util/InvokeUtil.java | 36 +++++++++++++++++ .../common/io/MessagingFrameTupleAppender.java | 9 ----- .../hyracks/dataflow/common/utils/TaskUtil.java | 14 +++++++ ...perationCallback.java => IBatchController.java} | 29 +++----------- .../am/lsm/common/api/IFrameOperationCallback.java | 14 ++++++- .../storage/am/lsm/common/api/ILSMHarness.java | 35 +++++++---------- .../storage/am/lsm/common/impls/LSMHarness.java | 30 +++++++++++---- .../am/lsm/common/impls/LSMTreeIndexAccessor.java | 5 ++- 19 files changed, 213 insertions(+), 104 deletions(-)
