This is an automated email from the ASF dual-hosted git repository. hanahmily pushed a commit to branch bug/trace-oom in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
commit 1f14c6524d1f658c3fdb5187a70b542596154998 Author: Gao Hongtao <[email protected]> AuthorDate: Wed Sep 24 14:46:40 2025 +0800 Remove commented-out sidx merge logic in mergePartsThenSendIntroduction function to clean up code. --- banyand/trace/merger.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/banyand/trace/merger.go b/banyand/trace/merger.go index d96fad6f..105671b3 100644 --- a/banyand/trace/merger.go +++ b/banyand/trace/merger.go @@ -112,12 +112,12 @@ func (tst *tsTable) mergePartsThenSendIntroduction(creator snapshotCreator, part if err != nil { return nil, err } - for _, sidxInstance := range tst.getAllSidx() { - if err := sidxInstance.Merge(closeCh); err != nil { - tst.l.Warn().Err(err).Msg("sidx merge failed") - return nil, err - } - } + // for _, sidxInstance := range tst.getAllSidx() { + // if err := sidxInstance.Merge(closeCh); err != nil { + // tst.l.Warn().Err(err).Msg("sidx merge failed") + // return nil, err + // } + // } elapsed := time.Since(start) tst.incTotalMergeLatency(elapsed.Seconds(), typ) tst.incTotalMerged(1, typ)
