Skip to content

Merge leveldb subtree #13925

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
laanwj merged 2 commits into from
Aug 10, 2018
Merged

Merge leveldb subtree #13925

laanwj merged 2 commits into from
Aug 10, 2018

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Aug 9, 2018 •
edited
Loading

For review:

git fetch https://github.com/bitcoin-core/leveldb
./test/lint/git-subtree-check.sh src/leveldb

Closes #13860

MarcoFalke added 2 commits August 9, 2018 11:30
Squashed 'src/leveldb/' changes from 64052c76c5..524b7e36a8
ec749b1 
524b7e36a8 Merge #19: Increase maximum read-only mmap()s used from 1000 to 4096 on 64-bit systems
4874cb8d3e Increase maximum number of read-only mmap()s used from 1000 to 4096 on 64 bit systems.

git-subtree-dir: src/leveldb
git-subtree-split: 524b7e36a8e3bce6fcbcd1b5df09024283f325ba
Merge leveldb subtree
fa14fa7 
Merge commit 'ec749b1bcdf2483b642fb51d635800e272c68ba6' into HEAD
@maflcko maflcko added this to the 0.17.0 milestone Aug 9, 2018
@achow101
Copy link
Member

achow101 commented Aug 9, 2018

utACK fa14fa7

@ken2812221
Copy link
Contributor

ken2812221 commented Aug 9, 2018

utACK fa14fa7

@fanquake fanquake mentioned this pull request Aug 10, 2018
Closed
@fanquake
Copy link
Member

fanquake commented Aug 10, 2018

tested the subtree merge ACK fa14fa7

merge 13925
[pull/13925/local-merge 4fc2596df] Merge #13925: Merge leveldb subtree
 Date: Fri Aug 10 16:50:47 2018 +0800
#13925 Merge leveldb subtree into master
* fa14fa742 Merge leveldb subtree (MarcoFalke) (pull/13925/head)
* ec749b1bc Squashed 'src/leveldb/' changes from 64052c76c5..524b7e36a8 (MarcoFalke)

Dropping you on a shell so you can try building/testing the merged source.
Run 'git diff HEAD~' to show the changes being merged.
Type 'exit' when done.

bash-3.2$ git fetch https://github.com/bitcoin-core/leveldb
remote: Counting objects: 1266, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 1266 (delta 540), reused 541 (delta 540), pack-reused 722
Receiving objects: 100% (1266/1266), 415.15 KiB | 273.00 KiB/s, done.
Resolving deltas: 100% (963/963), completed with 160 local objects.
From https://github.com/bitcoin-core/leveldb
 * branch                HEAD       -> FETCH_HEAD

bash-3.2$ ./test/lint/git-subtree-check.sh src/leveldb
src/leveldb in HEAD currently refers to tree f8cdc77167be86194f98d0412baf4b89d3d5abe6
src/leveldb in HEAD was last updated in commit ec749b1bcdf2483b642fb51d635800e272c68ba6 (tree f8cdc77167be86194f98d0412baf4b89d3d5abe6)
src/leveldb in HEAD was last updated to upstream commit 524b7e36a8e3bce6fcbcd1b5df09024283f325ba (tree f8cdc77167be86194f98d0412baf4b89d3d5abe6)
GOOD
bash-3.2$

@laanwj
Copy link
Member

laanwj commented Aug 10, 2018

utACK fa14fa7

@laanwj laanwj merged commit fa14fa7 into bitcoin:master Aug 10, 2018
laanwj added a commit that referenced this pull request Aug 10, 2018
@laanwj
Merge #13925: Merge leveldb subtree
71dec5c 
ec749b1 Squashed 'src/leveldb/' changes from 64052c76c5..524b7e36a8 (MarcoFalke)

Pull request description:

  For review:

  ```sh
  git fetch https://github.com/bitcoin-core/leveldb
  ./test/lint/git-subtree-check.sh src/leveldb
  ```

  Closes #13860

Tree-SHA512: 9d13384fe35e7144b4a7fca57efe77b0cc5295952da4a397e4c6d8aa3f8043d5113fccedd3ae1dcaa3d2649e732e5f57a71504847946e055aa4dc8c3780e29fc
@maflcko maflcko deleted the Mf1808-leveldbSubtree branch August 10, 2018 18:14
@Bushstar Bushstar mentioned this pull request Aug 13, 2018
Merged
@jnewbery jnewbery mentioned this pull request Aug 20, 2018
Merged
1 task
@maflcko maflcko mentioned this pull request Aug 30, 2018
Closed
jasonbcox pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Sep 13, 2019
@fpelliccioni
Merge leveldb subtree
85bc68c 
Summary:
For review:

Backport of Bitcoin Core PR13925
bitcoin/bitcoin#13925

Test Plan:
```
make check
```

Reviewers: Fabien, #bitcoin_abc, deadalnix, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D4006
jonspock pushed a commit to jonspock/devault that referenced this pull request Dec 22, 2019
@jonspock
Merge leveldb subtree
2f44940 
Summary:
For review:

Backport of Bitcoin Core PR13925
bitcoin/bitcoin#13925

Test Plan:
```
make check
```

Reviewers: Fabien, #bitcoin_abc, deadalnix, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D4006
proteanx pushed a commit to devaultcrypto/devault that referenced this pull request Dec 23, 2019
@proteanx
Merge leveldb subtree
f3d8ba7 
Summary:
For review:

Backport of Bitcoin Core PR13925
bitcoin/bitcoin#13925

Test Plan:
```
make check
```

Reviewers: Fabien, #bitcoin_abc, deadalnix, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D4006
@str4d str4d mentioned this pull request Sep 22, 2020
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Sep 25, 2020
@zkbot
Auto merge of #4739 - str4d:update-leveldb, r=str4d
514d868 
Update LevelDB to upstream commit f545dfabf

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#7911
- bitcoin/bitcoin#7982
- bitcoin/bitcoin#8133
- bitcoin/bitcoin#8784
  - Only the missing changes.
- bitcoin/bitcoin#8826
- bitcoin/bitcoin#8613
- bitcoin/bitcoin#10544
- bitcoin/bitcoin#10633
  - Only the changes to files and code we have.
- bitcoin/bitcoin#10806
- bitcoin/bitcoin#10958
- bitcoin/bitcoin#12451
- bitcoin/bitcoin#13925
- bitcoin/bitcoin#15270

This upgrades LevelDB in the exact same commit progression as upstream, up to January 2019.
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Feb 4, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#13925: Merge leveldb subtree
2f301fd 
ec749b1 Squashed 'src/leveldb/' changes from 64052c76c5..524b7e36a8 (MarcoFalke)

Pull request description:

  For review:

  ```sh
  git fetch https://github.com/bitcoin-core/leveldb
  ./test/lint/git-subtree-check.sh src/leveldb
  ```

  Closes bitcoin#13860

Tree-SHA512: 9d13384fe35e7144b4a7fca57efe77b0cc5295952da4a397e4c6d8aa3f8043d5113fccedd3ae1dcaa3d2649e732e5f57a71504847946e055aa4dc8c3780e29fc
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Upstream

Projects

None yet

Milestone

0.17.0

Development

Successfully merging this pull request may close these issues.

5 participants

@maflcko @achow101 @ken2812221 @fanquake @laanwj