Update to LevelDB 1.20 #10544

pull sipa wants to merge 4 commits into bitcoin:master from sipa:leveldb120 changing 38 files +1440 −1155
  1. sipa commented at 7:19 pm on June 6, 2017: member
  2. sipa force-pushed on Jun 6, 2017
  3. gmaxwell commented at 7:29 pm on June 6, 2017: contributor
    utACK
  4. 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 not exploiting yet.
  5. gmaxwell commented at 0: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”

  6. paveljanik commented at 7:23 am on June 7, 2017: contributor

    On OS X:

    0Making all in src
    1  CXXLD    bitcoind
    2Undefined symbols for architecture x86_64:
    3  "leveldb::port::AcceleratedCRC32C(unsigned int, char const*, unsigned long)", referenced from:
    4      leveldb::crc32c::Extend(unsigned int, char const*, unsigned long) in libleveldb.a(leveldb_libleveldb_a-crc32c.o)
    5ld: symbol(s) not found for architecture x86_64
    6clang: error: linker command failed with exit code 1 (use -v to see invocation)
    
  7. paveljanik commented at 7:25 am on June 7, 2017: contributor

    But util/env_posix_test_helper.h is there:

    https://github.com/bitcoin/bitcoin/pull/10544/commits/94fe30aaec40c6795586d2a0291f053500e40335#diff-c439a67281cf7c414d51630edca309c9

    Strange. This Travis issue does not happen locally.

  8. 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 ;-)
  9. jonasschnelli commented at 7:26 am on June 8, 2017: contributor

    Gitian complains:

     0  CXX      leveldb/util/leveldb_libleveldb_a-status.o
     1  CXX      leveldb/port/leveldb_libleveldb_a-port_posix.o
     2  CXX      leveldb/helpers/memenv/leveldb_libmemenv_a-memenv.o
     3  CXX      test/test_test_bitcoin-arith_uint256_tests.o
     4  AR       libbitcoin_cli.a
     5leveldb/util/env_posix.cc:29:10: fatal error: 'util/env_posix_test_helper.h' file not found
     6#include "util/env_posix_test_helper.h"
     7         ^
     81 error generated.
     9make[2]: *** [leveldb/util/leveldb_libleveldb_a-env_posix.o] Error 1
    10make[2]: *** Waiting for unfinished jobs....
    11  CXX      test/test_test_bitcoin-addrman_tests
    
  10. laanwj commented at 7:41 am on June 8, 2017: member

    My issue is this one 8) NuxiNL/cloudabi-ports#32 reported by @laanwj ;-)

    There the SSE-accelerated CRC function was referenced, but not linked in.

  11. sipa commented at 7:59 pm on June 8, 2017: member
    @theuni fixed it, yo
  12. paveljanik commented at 8:30 pm on June 8, 2017: contributor

    compiles OK here, only one new warning:

    0leveldb/db/version_set.cc:1039:21: warning: comparison of integers of different signs: 'uint64_t' (aka 'unsigned long long') and 'int' [-Wsign-compare]
    1      manifest_size >= TargetFileSize(options_)) {
    2      ~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~~~
    31 warning generated.
    
  13. 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

     0diff --git a/src/Makefile.leveldb.include b/src/Makefile.leveldb.include
     1index b61088e..ac38141 100644
     2--- a/src/Makefile.leveldb.include
     3+++ b/src/Makefile.leveldb.include
     4@@ -77,6 +77,7 @@ leveldb_libleveldb_a_SOURCES += leveldb/table/merger.h
     5 leveldb_libleveldb_a_SOURCES += leveldb/table/format.h
     6 leveldb_libleveldb_a_SOURCES += leveldb/table/iterator_wrapper.h
     7 leveldb_libleveldb_a_SOURCES += leveldb/util/crc32c.h
     8+leveldb_libleveldb_a_SOURCES += leveldb/util/env_posix_test_helper.h
     9 leveldb_libleveldb_a_SOURCES += leveldb/util/arena.h
    10 leveldb_libleveldb_a_SOURCES += leveldb/util/random.h
    11 leveldb_libleveldb_a_SOURCES += leveldb/util/posix_logger.h
    
  14. paveljanik commented at 11:42 am on June 9, 2017: contributor
    @MarcoFalke Good catch!
  15. sipa commented at 8:21 pm on June 9, 2017: member
    @MarcoFalke Thanks! I’ve added a commit with you as author.
  16. 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
    cf44e4ca77
  17. Update to LevelDB 1.20 e4030ab4f4
  18. leveldb: enable runtime-detected crc32 instructions 2424989e4f
  19. Add extra LevelDB source to Makefile 3ee3d04374
  20. sipa force-pushed on Jun 10, 2017
  21. gmaxwell approved
  22. gmaxwell commented at 5:16 pm on June 13, 2017: contributor
    ACK
  23. laanwj commented at 5:43 pm on June 13, 2017: member

    After merging https://github.com/bitcoin-core/leveldb/pull/1

    0src/leveldb in HEAD was last updated to upstream commit 196962ff01c39b4705d8117df5c3f8c205349950 (tree d5a89851da0a8ab07c40966ac137f4e299c80927)
    1src/leveldb in HEAD currently refers to tree d5a89851da0a8ab07c40966ac137f4e299c80927
    2GOOD
    
  24. laanwj approved
  25. laanwj merged this on Jun 13, 2017
  26. laanwj closed this on Jun 13, 2017

  27. laanwj referenced this in commit a4fe07714d on Jun 13, 2017
  28. theuni commented at 5:55 pm on June 13, 2017: member
    post-merge utACK.
  29. sipa deleted the branch on Jun 23, 2017
  30. sickpig referenced this in commit edad43d178 on Aug 17, 2017
  31. sickpig referenced this in commit 138039196c on Aug 17, 2017
  32. sickpig referenced this in commit 521cfbf736 on Aug 17, 2017
  33. PastaPastaPasta referenced this in commit c01afe69ab on Jul 5, 2019
  34. PastaPastaPasta referenced this in commit c8fa82daa9 on Jul 5, 2019
  35. PastaPastaPasta referenced this in commit c81792057d on Jul 6, 2019
  36. PastaPastaPasta referenced this in commit a93b194f92 on Jul 8, 2019
  37. PastaPastaPasta referenced this in commit 71436c5b60 on Jul 9, 2019
  38. PastaPastaPasta referenced this in commit 946388169d on Jul 9, 2019
  39. barrystyle referenced this in commit 4cb9029a0c on Jan 22, 2020
  40. zkbot referenced this in commit 59d6a92e7d on Sep 22, 2020
  41. zkbot referenced this in commit 514d868179 on Sep 25, 2020
  42. DrahtBot locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-22 03:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me