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 9f75957c6b278e0ce3756b634a46a1cd3cfe8da6
Merge: 994f901c8d 1b975b5599
Author: Apache AsterixDB Gerrit <[email protected]>
AuthorDate: Thu Nov 21 20:20:55 2024 +0000

    Merge "Merge branch 'gerrit/trinity' into 'gerrit/goldfish'" into goldfish

 .../NoOpFrameOperationCallbackFactory.java         |  5 +++
 .../LSMPrimaryInsertOperatorNodePushable.java      | 10 ++++-
 .../LSMPrimaryUpsertOperatorNodePushable.java      | 16 +++++++-
 .../runtime/operators/StandardBatchController.java | 45 ++++++++++++++++++++++
 .../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     |  9 ++++-
 .../storage/am/lsm/common/impls/LSMHarness.java    | 31 +++++++++++----
 .../am/lsm/common/impls/LSMTreeIndexAccessor.java  |  6 ++-
 14 files changed, 180 insertions(+), 76 deletions(-)

Reply via email to