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 295291cd761fb28acae37310ea97aab014b645b2 Author: Ali Alsuliman <[email protected]> AuthorDate: Thu Aug 15 12:21:25 2024 -0700 [ASTERIXDB-3476][STO] Mark column index active, after required steps completed - user model changes: no - storage format changes: no - interface changes: no Details: Fixing the sequence to avoid double activation. Ext-ref: MB-62964 Change-Id: I5db3953cb0e9d6c16841a4f98ee14ad7ffe0afd0 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18659 Reviewed-by: Ali Alsuliman <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> --- .../storage/am/lsm/btree/column/impls/lsm/LSMColumnBTree.java | 5 +---- .../hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/LSMColumnBTree.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/LSMColumnBTree.java index d12fbe9b13..d95678ef65 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/LSMColumnBTree.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/src/main/java/org/apache/hyracks/storage/am/lsm/btree/column/impls/lsm/LSMColumnBTree.java @@ -87,20 +87,17 @@ public class LSMColumnBTree extends LSMBTree { @Override public synchronized void activate() throws HyracksDataException { super.activate(); - postLoadingDiskComponents(); } @Override - protected void postLoadingDiskComponents() throws HyracksDataException { + protected void completeActivation() throws HyracksDataException { if (diskComponents.isEmpty()) { columnMetadata = columnManager.activate(); } else { IComponentMetadata componentMetadata = diskComponents.get(0).getMetadata(); columnMetadata = columnManager.activate(ColumnUtil.getColumnMetadataCopy(componentMetadata)); } - diskCacheManager.activate(columnMetadata.getNumberOfColumns(), diskComponents, diskBufferCache); - super.postLoadingDiskComponents(); } @Override diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java index e9a3abe3d1..4f7c624996 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java @@ -200,11 +200,11 @@ public abstract class AbstractLSMIndex implements ILSMIndex { throw HyracksDataException.create(ErrorCode.CANNOT_ACTIVATE_ACTIVE_INDEX); } loadDiskComponents(); - postLoadingDiskComponents(); + completeActivation(); + isActive = true; } - protected void postLoadingDiskComponents() throws HyracksDataException { - isActive = true; + protected void completeActivation() throws HyracksDataException { } private void loadDiskComponents() throws HyracksDataException {
