(asterixdb) 05/25: Merge branch 'gerrit/neo' into 'gerrit/trinity'

[mblow]

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 909f6ce5c9c37d3a00328423b7d2f875d4253859
Merge: 99fa79cd50 4874143e7d
Author: Michael Blow <michael.b...@couchbase.com>
AuthorDate: Sun Oct 5 11:36:17 2025 -0400

    Merge branch 'gerrit/neo' into 'gerrit/trinity'
    
     * [NO ISSUE][*DB][EXT] Make IDataParser extend Closeable, misc
    
    Ext-ref: MB-68827
    Change-Id: I434142a9b9cd2d1fc941b1e1f255ef740308a1ec

 .../java/org/apache/asterix/active/ActiveManager.java  |  1 +
 .../org/apache/asterix/external/api/IDataParser.java   | 13 +++++++++----
 .../apache/asterix/external/api/IRecordConverter.java  |  9 +++++++--
 .../dataflow/FeedRecordDataFlowController.java         |  2 ++
 .../data/std/util/ByteArrayAccessibleOutputStream.java | 18 ++++++++++++++++++
 .../org/apache/hyracks/http/server/utils/HttpUtil.java |  6 ++++--
 .../common/dataflow/IndexDropOperatorNodePushable.java |  2 +-
 .../storage/am/lsm/common/impls/LSMHarness.java        | 16 ++++++++++++++++
 8 files changed, 58 insertions(+), 9 deletions(-)

diff --cc 
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
index 8ad67f7f85,2ac29fe640..236d853b4c
--- 
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
@@@ -577,9 -584,19 +585,17 @@@ public class LSMHarness implements ILSM
          }
      }
  
+     private static String threadName(ILSMIOOperation operation) {
+         if (operation.getIOOpertionType() == LSMIOOperationType.NOOP) {
+             return String.valueOf(operation.getIOOpertionType());
+         }
+         return operation.getIOOpertionType() + ":" + 
operation.getTarget().getRelativePath() + "@"
+                 + OP_THREAD_TIMESTAMP.format(ZonedDateTime.now());
+     }
+ 
      @Override
      public void merge(ILSMIOOperation operation) throws HyracksDataException {
 -        if (LOGGER.isDebugEnabled()) {
 -            LOGGER.debug("Started a merge operation for index: {}", lsmIndex);
 -        }
 +        LOGGER.debug("Started a merge operation for index {}", lsmIndex);
          synchronized (opTracker) {
              enterComponents(operation.getAccessor().getOpContext(), 
LSMOperationType.MERGE);
          }