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 2119432478a26ac613936e588c2131ada7dd5672 Merge: 46db92c16d b2449e9b6d Author: Michael Blow <[email protected]> AuthorDate: Wed Nov 22 16:12:22 2023 -0500 Merge branch 'gerrit/trinity' into 'master' Change-Id: If0be086e2af3499e965a67d520c781f441be7a68 .../asterix/api/http/server/ClusterApiServlet.java | 17 ++++++++------- .../src/test/resources/runtimets/api.xml | 6 ++++++ .../api/cluster_state_5/cluster_state_5.1.get.http | 25 ++++++++++++++++++++++ .../common/context/GlobalVirtualBufferCache.java | 5 +++++ .../impls/MultitenantVirtualBufferCache.java | 5 +++++ .../am/lsm/common/impls/VirtualBufferCache.java | 5 +++++ .../storage/common/buffercache/BufferCache.java | 17 +++++++++------ .../common/buffercache/DebugBufferCache.java | 9 ++++++-- .../storage/common/buffercache/IBufferCache.java | 22 +++++++++++++++++++ .../compression/file/CompressedFileManager.java | 9 ++++++-- .../am/lsm/btree/impl/TestVirtualBufferCache.java | 5 +++++ 11 files changed, 107 insertions(+), 18 deletions(-)
