You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by sp...@apache.org on 2025/03/03 06:31:29 UTC

(iotdb) 01/02: Merge branch 'feature/memory_collect' into feature/memory_auto

This is an automated email from the ASF dual-hosted git repository.

spricoder pushed a commit to branch feature/memory_auto
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 48b89dad18e40528d7425e9e010042b8417545ad
Merge: bcbab696c1b 42474ce99b0
Author: spricoder <sp...@qq.com>
AuthorDate: Mon Mar 3 14:29:15 2025 +0800

    Merge branch 'feature/memory_collect' into feature/memory_auto

 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  4 +-
 .../commons/memory/AtomicLongMemoryBlock.java      |  4 +-
 .../iotdb/commons/memory/MemoryBlockTest.java      | 49 ++++++++++++++++++++++
 3 files changed, 54 insertions(+), 3 deletions(-)