From 93afd8e430807a60f8b2db69cc831f51ffcd67c0 Mon Sep 17 00:00:00 2001 From: Siyuan Zhang Date: Fri, 19 Jan 2024 08:57:50 -0800 Subject: [PATCH] Revert "add key dedupe when a write buffer writeback to an empty read buffer bucket." This reverts commit 971a4f57ccff71dfc10c1f9eb7a6a4d64bec1d2e. Signed-off-by: Siyuan Zhang --- server/storage/backend/tx_buffer.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/server/storage/backend/tx_buffer.go b/server/storage/backend/tx_buffer.go index 590cf2af6..7c2f9d63a 100644 --- a/server/storage/backend/tx_buffer.go +++ b/server/storage/backend/tx_buffer.go @@ -83,7 +83,6 @@ func (txw *txWriteBuffer) writeback(txr *txReadBuffer) { if !ok { delete(txw.buckets, k) txr.buckets[k] = wb - wb.dedupe() continue } if seq, ok := txw.bucket2seq[k]; ok && !seq && wb.used > 1 { @@ -204,12 +203,10 @@ func (bb *bucketBuffer) merge(bbsrc *bucketBuffer) { if bytes.Compare(bb.buf[(bb.used-bbsrc.used)-1].key, bbsrc.buf[0].key) < 0 { return } - bb.dedupe() -} -// dedupe removes duplicates, using only newest update -func (bb *bucketBuffer) dedupe() { sort.Stable(bb) + + // remove duplicates, using only newest update widx := 0 for ridx := 1; ridx < bb.used; ridx++ { if !bytes.Equal(bb.buf[ridx].key, bb.buf[widx].key) {