Skip to content

prune: use Put(Current) mdbx's method instead of DelCurrent+Put #19914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AskAlexSharov merged 9 commits into from
Mar 24, 2026
Merged

prune: use Put(Current) mdbx's method instead of DelCurrent+Put #19914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fdf7148
save
AskAlexSharov Mar 16, 2026
60a5ee6
save
AskAlexSharov Mar 16, 2026
4cc8c36
save
AskAlexSharov Mar 21, 2026
3727fe7
Merge branch 'release/3.4' into alex/flush_34
AskAlexSharov Mar 21, 2026
32da9e0
save
AskAlexSharov Mar 21, 2026
be08d94
save
AskAlexSharov Mar 21, 2026
f341245
save
AskAlexSharov Mar 21, 2026
65d77fd
Merge branch 'release/3.4' into alex/flush_34
AskAlexSharov Mar 24, 2026
84a4e2d
Merge branch 'release/3.4' into alex/flush_34
AskAlexSharov Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ jobs:
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
go-version: '1.25'
go-version: '1.26'
- run: make downloader
- run: echo $ModModified
- run: ./build/bin/downloader manifest-verify --chain mainnet --webseed 'https://erigon3-v1-snapshots-mainnet.erigon.network'
- run: ./build/bin/downloader manifest-verify --chain bor-mainnet --webseed 'https://erigon3-v1-snapshots-bor-mainnet.erigon.network'
- run: ./build/bin/downloader manifest-verify --chain gnosis --webseed 'https://erigon3-v1-snapshots-gnosis.erigon.network'
- run: ./build/bin/downloader manifest-verify --chain chiado --webseed 'https://erigon3-v1-snapshots-chiado.erigon.network'
- run: ./build/bin/downloader manifest-verify --chain sepolia --webseed 'https://erigon3-v1-snapshots-sepolia.erigon.network'
- run: ./build/bin/downloader manifest-verify --chain amoy --webseed 'https://erigon3-v1-snapshots-amoy.erigon.network'
127 changes: 0 additions & 127 deletions .github/workflows/qa-clean-exit-block-downloading.yml
View file
Open in desktop

This file was deleted.

193 changes: 0 additions & 193 deletions .github/workflows/qa-rpc-integration-tests-polygon.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/scripts/test_report/generate-test-report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,13 @@ function mapConclusionToIconWithTracking(conclusion: string | null, status: stri
function mapChain(chain: string | null): string {
if (!chain) return '';
let chainLowerCaseString = chain.toLowerCase();
if (chainLowerCaseString.includes('bor-mainnet')) return '🟣 polygon';
if (chainLowerCaseString.includes('polygon')) return '🟣 polygon';
if (chainLowerCaseString.includes('lighthouse, mainnet')) return '⬢ ethereum / lighthouse';
if (chainLowerCaseString.includes('prysm, mainnet')) return '⬢ ethereum / prysm';
if (chainLowerCaseString.includes('mainnet')) return '⬢ ethereum';
if (chainLowerCaseString.includes('ethereum')) return '⬢ ethereum';
if (chainLowerCaseString.includes('sepolia')) return '🔹 sepolia';
if (chainLowerCaseString.includes('hoodi')) return '🔸 hoodi';
if (chainLowerCaseString.includes('amoy')) return '🟣 amoy';
if (chainLowerCaseString.includes('chiado')) return '🟢 chiado';
if (chainLowerCaseString.includes('lighthouse, gnosis')) return '🟢 gnosis / lighthouse';
if (chainLowerCaseString.includes('gnosis')) return '🟢 gnosis';
Expand Down
1 change: 1 addition & 0 deletions db/kv/kv_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ type RwCursorDupSort interface {
RwCursor

PutNoDupData(key, value []byte) error // PutNoDupData - inserts key without dupsort
PutCurrent(key, value []byte) error // PutCurrent - replaces the current dup entry in-place (cursor must be positioned); saves Del+Put round-trip
DeleteCurrentDuplicates() error // DeleteCurrentDuplicates - deletes all values of the current key
DeleteExact(k1, k2 []byte) error // DeleteExact - delete 1 value from given key
AppendDup(key, value []byte) error // AppendDup - same as Append, but for sorted dup data
Expand Down
9 changes: 9 additions & 0 deletions db/kv/mdbx/kv_mdbx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,16 @@ func (c *MdbxDupSortCursor) PutNoDupData(k, v []byte) error {
if err := c.c.Put(k, v, mdbx.NoDupData); err != nil {
return fmt.Errorf("label: %s, in PutNoDupData: %w", c.label, err)
}
return nil
}

// PutCurrent replaces the current dup entry in-place. The cursor must be
// positioned (e.g. via SeekBothRange) on the entry to replace.
// Saves one CGo call vs DeleteCurrent()+Put() for the update path.
func (c *MdbxDupSortCursor) PutCurrent(k, v []byte) error {
if err := c.c.PutCurrent(k, v); err != nil {
return fmt.Errorf("label: %s, in PutCurrent: %w", c.label, err)
}
return nil
}

Expand Down
4 changes: 4 additions & 0 deletions db/kv/membatchwithdb/memory_mutation_cursor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,10 @@ func (m *memoryMutationCursor) PutNoDupData(key, value []byte) error {
panic("Not implemented")
}

func (m *memoryMutationCursor) PutCurrent(key, value []byte) error {
panic("Not implemented")
}

func (m *memoryMutationCursor) Delete(k []byte) error {
return m.mutation.Delete(m.table, k)
}
Expand Down
1 change: 1 addition & 0 deletions db/kv/remotedb/kv_remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,7 @@ func (c *remoteCursorDupSort) SeekBothRange(k, v []byte) ([]byte, error) {
func (c *remoteCursorDupSort) DeleteExact(k1, k2 []byte) error { panic("not supported") }
func (c *remoteCursorDupSort) AppendDup(k []byte, v []byte) error { panic("not supported") }
func (c *remoteCursorDupSort) PutNoDupData(k, v []byte) error { panic("not supported") }
func (c *remoteCursorDupSort) PutCurrent(k, v []byte) error { panic("not supported") }
func (c *remoteCursorDupSort) DeleteCurrentDuplicates() error { panic("not supported") }
func (c *remoteCursorDupSort) CountDuplicates() (uint64, error) { panic("not supported") }

Expand Down
Loading
Loading