From ee76404c4d259633150617ed1652e06c40217a8a Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Sat, 19 Sep 2020 21:25:30 -0400 Subject: [PATCH] Adjust default v5 map size even on 64-bit platforms (#969608). debian/patches/tune_lmdb_defaults: Rename from tune_32bit_lmdb_defaults; scale down somewhat even on 64-bit platforms to account for potential use of qemu. --- debian/changelog | 5 ++++- debian/patches/series | 2 +- .../patches/{tune_32bit_lmdb_defaults => tune_lmdb_defaults} | 4 +--- 3 files changed, 6 insertions(+), 5 deletions(-) rename debian/patches/{tune_32bit_lmdb_defaults => tune_lmdb_defaults} (84%) diff --git a/debian/changelog b/debian/changelog index 9b1f2031..e6a5d733 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,11 @@ ncbi-blast+ (2.10.1-1) UNRELEASED; urgency=medium * debian/patches/{reprobuild,support_x32}: Refresh (had fuzz). * debian/patches/support_gcc10: Drop build-system portions, incorporated upstream as of this release. + * debian/patches/tune_lmdb_defaults: Rename from tune_32bit_lmdb_defaults; + scale down somewhat even on 64-bit platforms to account for potential + use of qemu. (Closes: #969608.) - -- Aaron M. Ucko Sat, 19 Sep 2020 21:21:01 -0400 + -- Aaron M. Ucko Sat, 19 Sep 2020 21:25:28 -0400 ncbi-blast+ (2.10.0-3) unstable; urgency=medium diff --git a/debian/patches/series b/debian/patches/series index d255e29b..69b0517d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,5 +15,5 @@ reprobuild spelling support_gcc10 run_perl_directly -tune_32bit_lmdb_defaults +tune_lmdb_defaults fix_x86isms diff --git a/debian/patches/tune_32bit_lmdb_defaults b/debian/patches/tune_lmdb_defaults similarity index 84% rename from debian/patches/tune_32bit_lmdb_defaults rename to debian/patches/tune_lmdb_defaults index 75503bda..ded0c386 100644 --- a/debian/patches/tune_32bit_lmdb_defaults +++ b/debian/patches/tune_lmdb_defaults @@ -1,5 +1,3 @@ -Index: b/c++/include/objtools/blast/seqdb_writer/writedb_lmdb.hpp -=================================================================== --- a/c++/include/objtools/blast/seqdb_writer/writedb_lmdb.hpp +++ b/c++/include/objtools/blast/seqdb_writer/writedb_lmdb.hpp @@ -48,6 +48,11 @@ USING_SCOPE(objects); @@ -7,7 +5,7 @@ Index: b/c++/include/objtools/blast/seqdb_writer/writedb_lmdb.hpp BEGIN_NCBI_SCOPE +#if NCBI_PLATFORM_BITS >= 64 -+# define NCBI_WRITEDB_DEFAULT_MAP_SIZE (300UL * 1000 * 1000 * 1000) ++# define NCBI_WRITEDB_DEFAULT_MAP_SIZE (20UL * 1000 * 1000 * 1000) +#else +# define NCBI_WRITEDB_DEFAULT_MAP_SIZE (750 * 1000 * 1000) +#endif -- 2.30.2