You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2024/11/25 19:43:28 UTC
(asterixdb) 05/15: Merge branch 'gerrit/neo' into 'gerrit/trinity'
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 33db60a5ae619c0f2812d269ba0a62c2eb162e26
Merge: e5236fd0d9 096385e346
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Nov 20 15:28:28 2024 -0500
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Ext-ref: MB-64229
Change-Id: Ic3fd8f7abd64252ad2473b049a0d222747a43857
.../NoOpFrameOperationCallbackFactory.java | 5 +++
.../LSMPrimaryInsertOperatorNodePushable.java | 10 ++++-
.../LSMPrimaryUpsertOperatorNodePushable.java | 13 ++++++-
.../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 | 35 +++++++----------
.../storage/am/lsm/common/impls/LSMHarness.java | 30 +++++++++++----
.../am/lsm/common/impls/LSMTreeIndexAccessor.java | 5 ++-
14 files changed, 183 insertions(+), 94 deletions(-)