Skip to content

Commit ddbbb71

Browse files
committed
fix(pkg/store): remove useless ringbuffer array
1 parent 8550f65 commit ddbbb71

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pkg/store/store.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ func (t *Store) itemAt(readTs uint64) (index uint64, key, value []byte, err erro
259259
// cache reference lookup
260260
t.tree.RLock()
261261
defer t.tree.RUnlock()
262-
if key := t.tree.rcaches[0].Get(index); key != nil {
262+
if key := t.tree.rcache.Get(index); key != nil {
263263
refkey = key.([]byte)
264264
}
265265

@@ -627,7 +627,7 @@ func (t *Store) GetTree() *schema.Tree {
627627
var value []byte
628628
value = h.(*[sha256.Size]byte)[:]
629629
if l == 0 {
630-
value = t.tree.rcaches[l].Get(i).([]byte)
630+
value = t.tree.rcache.Get(i).([]byte)
631631
}
632632
memnode := &schema.Node{}
633633
memhash, memrefk, _ := decodeRefTreeKey(value)

pkg/store/treestore.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ type treeStore struct {
125125
db *badger.DB
126126
log logger.Logger
127127
caches [256]ring.Buffer
128-
rcaches [256]ring.Buffer
128+
rcache ring.Buffer
129129
cPos [256]uint64
130130
cSize uint64
131131
sync.RWMutex
@@ -183,7 +183,7 @@ func (t *treeStore) makeCaches() {
183183
size = 64
184184
}
185185
}
186-
t.rcaches[0] = ring.NewRingBuffer(t.cSize + 2)
186+
t.rcache = ring.NewRingBuffer(t.cSize + 2)
187187
}
188188

189189
// Close closes a treeStore. All pending items will be processed and flushed.
@@ -278,7 +278,7 @@ func (t *treeStore) worker() {
278278
// insertion order index reference creation
279279
c := refTreeKey(*item.h, *item.r)
280280
// insertion order index cache save
281-
t.rcaches[0].Set(item.ts-1, c)
281+
t.rcache.Set(item.ts-1, c)
282282

283283
merkletree.AppendHash(t, item.h)
284284
if t.w%2 == 0 && (t.w-t.lastFlushed) >= t.cSize/2 {
@@ -340,7 +340,7 @@ func (t *treeStore) flush() {
340340
value = h.(*[sha256.Size]byte)[:]
341341
// retrieving insertion order index reference from buffer ring
342342
if l == 0 {
343-
value = t.rcaches[l].Get(i).([]byte)
343+
value = t.rcache.Get(i).([]byte)
344344
}
345345
// fmt.Printf("Storing [l=%d, i=%d]\n", l, i)
346346
entry := badger.Entry{

0 commit comments

Comments
 (0)