Skip to content

Sync upstream #5

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

Jump to bottom
Merged
merged 12 commits into from
Dec 13, 2023
Merged

Sync upstream #5

merged 12 commits into from
Dec 13, 2023

Conversation

@hassila
Copy link

@hassila hassila commented Nov 28, 2023 •
edited
Loading

Sync with upstream, will run DocC test suite as next step.

This PR fixes two cases highly relevant to Apple Silicon (one hindering usage of ASAN and one performance improvement by better utilisation of the 16K pages):

6a1954d
and
b534747

hyc and others added 12 commits June 9, 2022 22:58
@hyc
Fix spurious fallthru warning
5a4f5c9
@moneromooo-monero @hyc
lmdb: catch non-LMDB negative errors before strerror
1b113f2 
That should hopefully shut coverity up
@glandium @hyc
ITS#9030 - Use sys/cachectl.h rather than asm/cachectl.h on mips
a46d78e 
It also contains the cacheflush function declaration.
@glandium @quanah
ITS#9919 - Mark infrequently used functions as cold rather than manua…
b534747 
…lly putting them in a separate section
@hyc
ITS#9806 LMDB page_split: key threshold depends on page size
6a1954d 
32 was chosen for page size of 4KB. Not large nough for 16KB pages.
@hyc
ITS#9916 liblmdb: use alternate MDB_page2 struct for some accesses
3947014 
fakepage pointers are only guaranteed to be 2-byte aligned. Use a
2-byte aligned struct definition when referencing 2-byte page members
if a page pointer possibly points to a fakepage.
@hyc
ITS#9961 LMDB: fix MSVC error
02baafb
@hyc
ITS#8447 fix cursor_put(MDB_CURRENT) on DUPSORT DB with different-siz…
c7b3cc4 
…ed data
@hyc
ITS#10095 partial revert of ITS#9278 2fd44e3
3dde6c4 
The patch was incorrect and introduced numerous race conditions.
The original problem was a FreeBSD bug, subsequently fixed:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269277
@hyc
ITS#10125 mdb_load: fix cursor reinit in Append mode
c07884d
@Kerollmops @hyc
ITS#10137 LMDB: Allow users to define MDB_IDL_LOGN
30288c7
@hassila
Merge pull request #2 from LMDB/mdb.master
ee7b33d 
Sync upstream
@hassila hassila mentioned this pull request Nov 28, 2023
Closed
@hassila
Copy link
Author

hassila commented Nov 28, 2023

Ok, this passed the DocC test suite:

hassila@min ~/g/swift-docc (main)> bin/test
Building for debugging...
[3/3] Compiling plugin Swift-DocC Preview
Build complete! (3.50s)
[1504/1504] Testing SwiftDocCUtilitiesTests.DirectoryMonitorTests/testMonitorDoesNotTriggerUpdates
=> Checking for unacceptable language… okay.
=> Checking license headers… okay.
=> Validating scripts in bin subdirectory… okay.
hassila@min ~/g/swift-docc (main)>

Ready for review now I think.

@hassila
Copy link
Author

hassila commented Nov 28, 2023

@franklinsch would be awesome if you could kick off the cross-repo testing, TIA.

@hassila hassila mentioned this pull request Nov 28, 2023
Closed
@franklinsch
Copy link

franklinsch commented Nov 28, 2023

@swift-ci please test

@hassila
Copy link
Author

hassila commented Nov 28, 2023

Guess it needs the cross-repo testing as previous time in #2 as well?

@hassila
Copy link
Author

hassila commented Dec 12, 2023

Another datapoint is that we've been running with the above internally for the last couple of weeks without any issues.

@franklinsch
Copy link

franklinsch commented Dec 12, 2023

Hi @hassila, sorry I missed your previous message. Yes, can we please run cross-repo testing?

@hassila
Copy link
Author

hassila commented Dec 12, 2023

I'm not allowed to kick that off so would need help...

@franklinsch franklinsch mentioned this pull request Dec 12, 2023
Closed
@franklinsch
Copy link

franklinsch commented Dec 12, 2023

Triggered here: swiftlang/swift#70398

@franklinsch
Copy link

franklinsch commented Dec 12, 2023

@daniel-grumberg Any feedback on this PR?

daniel-grumberg
daniel-grumberg approved these changes Dec 13, 2023
View reviewed changes
Copy link

@daniel-grumberg daniel-grumberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes seem fine to me but I don't have enough understanding of lmdb's code base to truly make a comment here.

@franklinsch franklinsch merged commit c425824 into swiftlang:main Dec 13, 2023
@franklinsch
Copy link

franklinsch commented Dec 13, 2023

Thanks @hassila!

@hassila hassila deleted the sync-upstream branch January 12, 2024 09:32
@hassila hassila mentioned this pull request Feb 13, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@daniel-grumberg daniel-grumberg daniel-grumberg approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@hassila @franklinsch @daniel-grumberg @hyc @moneromooo-monero @glandium @Kerollmops