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.

diff --git a/debian/changelog b/debian/changelog
index 9b1f203180f3591b64b9d4591bb08171baa415bb..e6a5d733969ea7d7acd8b8f39fd8db877c2f1cc9 100644 (file)
--- 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 <ucko@debian.org>  Sat, 19 Sep 2020 21:21:01 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  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 d255e29b0093270d97acf42b60d2783c886bd07b..69b0517d39761e68ec84118f23af6e743cbf62e7 100644 (file)
--- 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_32bit_lmdb_defaults
deleted file mode 100644 (file)
index 75503bd..0000000
--- a/debian/patches/tune_32bit_lmdb_defaults
+++ /dev/null
@@ -1,36 +0,0 @@
-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);
- 
- BEGIN_NCBI_SCOPE
- 
-+#if NCBI_PLATFORM_BITS >= 64
-+#  define NCBI_WRITEDB_DEFAULT_MAP_SIZE (300UL * 1000 * 1000 * 1000)
-+#else
-+#  define NCBI_WRITEDB_DEFAULT_MAP_SIZE (750 * 1000 * 1000)
-+#endif
- 
- /// This class supports creation of a string accession to integer OID
- /// lmdb database
-@@ -59,7 +64,8 @@ public:
- 
-     /// Constructor for LMDB write access
-     /// @param dbname Database name
--    CWriteDB_LMDB(const string& dbname, Uint8 map_size = 300000000000, Uint8 capacity = 500000);
-+    CWriteDB_LMDB(const string& dbname, Uint8 map_size = NCBI_WRITEDB_DEFAULT_MAP_SIZE,
-+                Uint8 capacity = 500000);
- 
-     // Destructor
-     ~CWriteDB_LMDB();
-@@ -130,7 +136,8 @@ public:
- 
-     /// Constructor for LMDB write access
-     /// @param dbname Database name
--    CWriteDB_TaxID(const string& dbname, Uint8 map_size = 300000000000, Uint8 capacity = 500000);
-+    CWriteDB_TaxID(const string& dbname, Uint8 map_size = NCBI_WRITEDB_DEFAULT_MAP_SIZE,
-+                 Uint8 capacity = 500000);
- 
-     // Destructor
-     ~CWriteDB_TaxID();

diff --git a/debian/patches/tune_lmdb_defaults b/debian/patches/tune_lmdb_defaults
new file mode 100644 (file)
index 0000000..ded0c38
--- /dev/null
+++ b/debian/patches/tune_lmdb_defaults
@@ -0,0 +1,34 @@
+--- 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);
+ 
+ BEGIN_NCBI_SCOPE
+ 
++#if NCBI_PLATFORM_BITS >= 64
++#  define NCBI_WRITEDB_DEFAULT_MAP_SIZE (20UL * 1000 * 1000 * 1000)
++#else
++#  define NCBI_WRITEDB_DEFAULT_MAP_SIZE (750 * 1000 * 1000)
++#endif
+ 
+ /// This class supports creation of a string accession to integer OID
+ /// lmdb database
+@@ -59,7 +64,8 @@ public:
+ 
+     /// Constructor for LMDB write access
+     /// @param dbname Database name
+-    CWriteDB_LMDB(const string& dbname, Uint8 map_size = 300000000000, Uint8 capacity = 500000);
++    CWriteDB_LMDB(const string& dbname, Uint8 map_size = NCBI_WRITEDB_DEFAULT_MAP_SIZE,
++                Uint8 capacity = 500000);
+ 
+     // Destructor
+     ~CWriteDB_LMDB();
+@@ -130,7 +136,8 @@ public:
+ 
+     /// Constructor for LMDB write access
+     /// @param dbname Database name
+-    CWriteDB_TaxID(const string& dbname, Uint8 map_size = 300000000000, Uint8 capacity = 500000);
++    CWriteDB_TaxID(const string& dbname, Uint8 map_size = NCBI_WRITEDB_DEFAULT_MAP_SIZE,
++                 Uint8 capacity = 500000);
+ 
+     // Destructor
+     ~CWriteDB_TaxID();