From e46881b79153db2f10891dbb81fef89844ba1ab8 Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Mon, 7 Sep 2020 21:15:03 -0400 Subject: [PATCH] ncbi-blast+ 2.10.0-3: Tweak debian/patches/tune_32bit_lmdb_defaults. * For 64-bit platforms, use an explicit UL suffix on one factor to avoid overflow. * For 32-bit platforms, avoid tying up quite so much address space, since opening a pair of databases is a distinct possibility. * Generally parenthesize expressions per best macro practice. --- debian/changelog | 11 +++++++++++ debian/patches/tune_32bit_lmdb_defaults | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ed5c9a3..77e7634c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +ncbi-blast+ (2.10.0-3) unstable; urgency=medium + + * debian/patches/tune_32bit_lmdb_defaults: Tweak default map size expressions. + - For 64-bit platforms, use an explicit UL suffix on one factor to avoid + overflow. + - For 32-bit platforms, avoid tying up quite so much address space, since + opening a pair of databases is a distinct possibility. + - Generally parenthesize expressions per best macro practice. + + -- Aaron M. Ucko Mon, 07 Sep 2020 21:15:02 -0400 + ncbi-blast+ (2.10.0-2) unstable; urgency=high * debian/patches/support_gcc10: Additionally tweak ncbifile.cpp to avoid diff --git a/debian/patches/tune_32bit_lmdb_defaults b/debian/patches/tune_32bit_lmdb_defaults index 9786c7d5..75503bda 100644 --- a/debian/patches/tune_32bit_lmdb_defaults +++ b/debian/patches/tune_32bit_lmdb_defaults @@ -7,9 +7,9 @@ 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 300 * 1000 * 1000 * 1000 ++# define NCBI_WRITEDB_DEFAULT_MAP_SIZE (300UL * 1000 * 1000 * 1000) +#else -+# define NCBI_WRITEDB_DEFAULT_MAP_SIZE 1000 * 1000 * 1000 ++# define NCBI_WRITEDB_DEFAULT_MAP_SIZE (750 * 1000 * 1000) +#endif /// This class supports creation of a string accession to integer OID -- 2.30.2