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.

diff --git a/debian/changelog b/debian/changelog
index 0ed5c9a392a607d21801161116b050bb21e86ad8..77e7634cc6c2b93f432d1b92eb1bcf4db9b6f2ac 100644 (file)
--- 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 <ucko@debian.org>  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 9786c7d5d129bdfcc8d0a8621d6d1fa169e39750..75503bda74d0141975284d2b318bec4077ba8ba1 100644 (file)
--- 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