Skip to content

Commit 4a664e0

Browse files
holimanzzyalbert
authored andcommitted
core/rawdb: better error message in freezer (#23901)
* core/rawdb: better error message in freezer * Apply suggestions from code review
1 parent 90f80fc commit 4a664e0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/rawdb/freezer_batch.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func (batch *freezerTableBatch) reset() {
116116
// existing data.
117117
func (batch *freezerTableBatch) Append(item uint64, data interface{}) error {
118118
if item != batch.curItem {
119-
return errOutOrderInsertion
119+
return fmt.Errorf("%w: have %d want %d", errOutOrderInsertion, item, batch.curItem)
120120
}
121121

122122
// Encode the item.
@@ -136,7 +136,7 @@ func (batch *freezerTableBatch) Append(item uint64, data interface{}) error {
136136
// existing data.
137137
func (batch *freezerTableBatch) AppendRaw(item uint64, blob []byte) error {
138138
if item != batch.curItem {
139-
return errOutOrderInsertion
139+
return fmt.Errorf("%w: have %d want %d", errOutOrderInsertion, item, batch.curItem)
140140
}
141141

142142
encItem := blob

core/rawdb/freezer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ func TestFreezerConcurrentModifyTruncate(t *testing.T) {
246246
if truncateErr != nil {
247247
t.Fatal("concurrent truncate failed:", err)
248248
}
249-
if !(modifyErr == nil || modifyErr == errOutOrderInsertion) {
249+
if !(errors.Is(modifyErr, nil) || errors.Is(modifyErr, errOutOrderInsertion)) {
250250
t.Fatal("wrong error from concurrent modify:", modifyErr)
251251
}
252252
checkAncientCount(t, f, "test", 10)

0 commit comments

Comments
 (0)