Merge upstream LevelDB 1.13 #2933

sipa commented at 8:23 PM on August 24, 2013: member

No description provided.

Squashed 'src/leveldb/' changes from be1b0ff..936b461

936b461 Merge upstream LevelDB 1.13.
748539c LevelDB 1.13

git-subtree-dir: src/leveldb
git-subtree-split: 936b4613ea4551992e6096b1e05eeefc09a20e3b

eed29f0f50

Merge src/leveldb changes for LevelDB 1.13 877b5e3653

sipa commented at 8:24 PM on August 24, 2013: member

This obviously depends on the LevelDB 1.13 changes being merged in the LevelDB repo first, but having it in a pullreq here already makes it easier to test.

BitcoinPullTester commented at 8:59 PM on August 24, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/877b5e3653f12882e12c75aa0bb5be47f847bd09 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

jgarzik commented at 2:25 AM on August 25, 2013: contributor

ACK

wtogami commented at 10:40 AM on August 25, 2013: contributor

You mentioned adding this to 0.8.4 too. Is that safe?

Diapolo commented at 11:32 AM on August 25, 2013: none

I think it would be nice to have a reference to the LevelDB changelog in the commit-msg.

sipa commented at 2:45 PM on August 25, 2013: member

@Diapolo Actually, it is there. Unfortunately, there is only a single commit in the upstream LevelDB repo from 1.12 to 1.13 ("LevelDB 1.13"), and it's listed in the squashed subtree commit.

If you want to see the full commit message, look at the leveldb repo (http://github.com/bitcoin/leveldb), in the bitcoin-fork branch. EDIT: It's not yet merged there, look at pullreq 1 in that repo.

sipa commented at 2:47 PM on August 25, 2013: member

@wtogami There's always some risk, and we should be careful when making changes to the leveldb subtree, as it may affect convergence in case of bugs. In this case, I think the potential benefit is worth the risk, and the changes look safe.

petertodd commented at 4:44 PM on August 25, 2013: contributor

@sipa "This obviously depends on the LevelDB 1.13 changes being merged in the LevelDB repo first" <- by that do you mean this pull-req might be changed again if LevelDB changes what they decide to merge?

I'd spend an hour or two to go through the actual changes manually, but it's not worth it unless we're sure this is what we would want to merge.

sipa commented at 4:48 PM on August 25, 2013: member

@petertodd I mean in our LevelDB repo, (http://github.com/bitcoin/leveldb). Upstream LevelDB 1.13 is released, so no worries there.

Reason for this is that it's not entirely clear to me how we want to manage our leveldb repository, depending on whether we want to merge upstream changes before or after testing them in Bitcoin. In any case, this pull request serves as a preview to the actual changes, but may change if we for example wish to make some changes in our leveldb repo before merging the upstream changes.

sipa commented at 2:12 PM on September 29, 2013: member

@jgarzik @laanwj @gmaxwell @gavinandresen Opinions? Do we need some testing before or after merging this in the bitcoin/leveldb repo?

gmaxwell commented at 2:24 PM on September 29, 2013: contributor

@sipa I've given it some fairly basic testing now: ran the node under it, reindexed under it, and switched back to the old one. Everything seems okay.

sipa commented at 3:01 PM on September 29, 2013: member

I went ahead and created merge commits in the bitcoin/leveldb repo for 1.13 and 1.14 (and a signed tag for 1.13). 1.14 only has non-relevant changes for us, afaict.

sipa commented at 8:51 PM on October 13, 2013: member

Anyone object to merging?

jgarzik commented at 2:29 AM on October 15, 2013: contributor

ACK

gmaxwell commented at 2:41 AM on October 15, 2013: contributor

ACK (if my prior soft nod wasn't enough)

gavinandresen referenced this in commit ae6601872b on Oct 15, 2013

gavinandresen merged this on Oct 15, 2013

gavinandresen closed this on Oct 15, 2013

Bushstar referenced this in commit f1fe24b676 on Apr 8, 2020

DrahtBot locked this on Sep 8, 2021