Update to LevelDB 1.20 #10544
pull sipa wants to merge 4 commits into bitcoin:master from sipa:leveldb120 changing 38 files +1440 −1155-
sipa commented at 7:19 PM on June 6, 2017: member
- sipa force-pushed on Jun 6, 2017
-
gmaxwell commented at 7:29 PM on June 6, 2017: contributor
utACK
-
sipa commented at 9:37 PM on June 6, 2017: member
Major improvement: adds the ability to use hardware-accelerated crc32, which this PR is
notexploiting yet. -
gmaxwell commented at 12:11 AM on June 7, 2017: contributor
Travis is bombing with
leveldb/util/env_posix.cc:29:10: fatal error: 'util/env_posix_test_helper.h'
file not found#include "util/env_posix_test_helper.h"
-
paveljanik commented at 7:23 AM on June 7, 2017: contributor
On OS X:
Making all in src CXXLD bitcoind Undefined symbols for architecture x86_64: "leveldb::port::AcceleratedCRC32C(unsigned int, char const*, unsigned long)", referenced from: leveldb::crc32c::Extend(unsigned int, char const*, unsigned long) in libleveldb.a(leveldb_libleveldb_a-crc32c.o) ld: symbol(s) not found for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) -
paveljanik commented at 7:25 AM on June 7, 2017: contributor
But
util/env_posix_test_helper.his there:Strange. This Travis issue does not happen locally.
-
paveljanik commented at 7:45 PM on June 7, 2017: contributor
My issue is this one 8) https://github.com/NuxiNL/cloudabi-ports/issues/32 reported by @laanwj ;-)
-
jonasschnelli commented at 7:26 AM on June 8, 2017: contributor
Gitian complains:
CXX leveldb/util/leveldb_libleveldb_a-status.o CXX leveldb/port/leveldb_libleveldb_a-port_posix.o CXX leveldb/helpers/memenv/leveldb_libmemenv_a-memenv.o CXX test/test_test_bitcoin-arith_uint256_tests.o AR libbitcoin_cli.a leveldb/util/env_posix.cc:29:10: fatal error: 'util/env_posix_test_helper.h' file not found #include "util/env_posix_test_helper.h" ^ 1 error generated. make[2]: *** [leveldb/util/leveldb_libleveldb_a-env_posix.o] Error 1 make[2]: *** Waiting for unfinished jobs.... CXX test/test_test_bitcoin-addrman_tests -
-
-
paveljanik commented at 8:30 PM on June 8, 2017: contributor
compiles OK here, only one new warning:
leveldb/db/version_set.cc:1039:21: warning: comparison of integers of different signs: 'uint64_t' (aka 'unsigned long long') and 'int' [-Wsign-compare] manifest_size >= TargetFileSize(options_)) { ~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. -
MarcoFalke commented at 10:29 AM on June 9, 2017: member
@sipa I suspect you need to fix the out-of-tree builds by something like
diff --git a/src/Makefile.leveldb.include b/src/Makefile.leveldb.include index b61088e..ac38141 100644 --- a/src/Makefile.leveldb.include +++ b/src/Makefile.leveldb.include @@ -77,6 +77,7 @@ leveldb_libleveldb_a_SOURCES += leveldb/table/merger.h leveldb_libleveldb_a_SOURCES += leveldb/table/format.h leveldb_libleveldb_a_SOURCES += leveldb/table/iterator_wrapper.h leveldb_libleveldb_a_SOURCES += leveldb/util/crc32c.h +leveldb_libleveldb_a_SOURCES += leveldb/util/env_posix_test_helper.h leveldb_libleveldb_a_SOURCES += leveldb/util/arena.h leveldb_libleveldb_a_SOURCES += leveldb/util/random.h leveldb_libleveldb_a_SOURCES += leveldb/util/posix_logger.h -
paveljanik commented at 11:42 AM on June 9, 2017: contributor
@MarcoFalke Good catch!
-
sipa commented at 8:21 PM on June 9, 2017: member
@MarcoFalke Thanks! I've added a commit with you as author.
-
cf44e4ca77
Squashed 'src/leveldb/' changes from a31c8aa40..196962ff0
196962ff0 Add AcceleratedCRC32C to port_win.h 1bdf1c34c Merge upstream LevelDB v1.20 d31721eb0 Merge #17: Fixed file sharing errors fecd44902 Fixed file sharing error in Win32Env::GetFileSize(), Win32SequentialFile::_Init(), Win32RandomAccessFile::_Init() Fixed error checking in Win32SequentialFile::_Init() 5b7510f1b Merge #14: Merge upstream LevelDB 1.19 0d969fd57 Merge #16: [LevelDB] Do no crash if filesystem can't fsync c8c029b5b [LevelDB] Do no crash if filesystem can't fsync a53934a3a Increase leveldb version to 1.20. f3f139737 Separate Env tests from PosixEnv tests. eb4f0972f leveldb: Fix compilation warnings in port_posix_sse.cc on x86 (32-bit). d0883b600 Fixed path to doc file: index.md. 7fa20948d Convert documentation to markdown. ea175e28f Implement support for Intel crc32 instruction (SSE 4.2) 95cd743e5 Including <limits> for std::numeric_limits. 646c3588d Limit the number of read-only files the POSIX Env will have open. d40bc3fa5 Merge #13: Typo ebbd772d3 Typo a2fb086d0 Add option for max file size. The currend hard-coded value of 2M is inefficient in colossus. git-subtree-dir: src/leveldb git-subtree-split: 196962ff01c39b4705d8117df5c3f8c205349950
-
Update to LevelDB 1.20 e4030ab4f4
-
leveldb: enable runtime-detected crc32 instructions 2424989e4f
-
Add extra LevelDB source to Makefile 3ee3d04374
- sipa force-pushed on Jun 10, 2017
- gmaxwell approved
-
gmaxwell commented at 5:16 PM on June 13, 2017: contributor
ACK
-
laanwj commented at 5:43 PM on June 13, 2017: member
After merging https://github.com/bitcoin-core/leveldb/pull/1
src/leveldb in HEAD was last updated to upstream commit 196962ff01c39b4705d8117df5c3f8c205349950 (tree d5a89851da0a8ab07c40966ac137f4e299c80927) src/leveldb in HEAD currently refers to tree d5a89851da0a8ab07c40966ac137f4e299c80927 GOOD - laanwj approved
- laanwj merged this on Jun 13, 2017
- laanwj closed this on Jun 13, 2017
- laanwj referenced this in commit a4fe07714d on Jun 13, 2017
-
theuni commented at 5:55 PM on June 13, 2017: member
post-merge utACK.
- sipa deleted the branch on Jun 23, 2017
- sickpig referenced this in commit edad43d178 on Aug 17, 2017
- sickpig referenced this in commit 138039196c on Aug 17, 2017
- sickpig referenced this in commit 521cfbf736 on Aug 17, 2017
- PastaPastaPasta referenced this in commit c01afe69ab on Jul 5, 2019
- PastaPastaPasta referenced this in commit c8fa82daa9 on Jul 5, 2019
- PastaPastaPasta referenced this in commit c81792057d on Jul 6, 2019
- PastaPastaPasta referenced this in commit a93b194f92 on Jul 8, 2019
- PastaPastaPasta referenced this in commit 71436c5b60 on Jul 9, 2019
- PastaPastaPasta referenced this in commit 946388169d on Jul 9, 2019
- barrystyle referenced this in commit 4cb9029a0c on Jan 22, 2020
- zkbot referenced this in commit 59d6a92e7d on Sep 22, 2020
- zkbot referenced this in commit 514d868179 on Sep 25, 2020
- DrahtBot locked this on Sep 8, 2021
