diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-08-04 16:10:04 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-08-04 16:10:04 +0000 |
| commit | f0a6349b52dd63a38fb6f0c28556cc3d02106a8a (patch) | |
| tree | d222ce0a0c8e5f5467c0ab592a53bd953823f3f3 /databases/rocksdb | |
| parent | 8a1608680ba79331604187324fba644a08d739d5 (diff) | |
| download | ports-f0a6349b52dd63a38fb6f0c28556cc3d02106a8a.tar.gz ports-f0a6349b52dd63a38fb6f0c28556cc3d02106a8a.zip | |
Update to 6.2.2
Notes
Notes:
svn path=/head/; revision=508101
Diffstat (limited to 'databases/rocksdb')
| -rw-r--r-- | databases/rocksdb/Makefile | 3 | ||||
| -rw-r--r-- | databases/rocksdb/distinfo | 6 | ||||
| -rw-r--r-- | databases/rocksdb/files/patch-tools-db_stress.cc | 39 |
3 files changed, 43 insertions, 5 deletions
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile index f163aff20b8c..0624e9366e6f 100644 --- a/databases/rocksdb/Makefile +++ b/databases/rocksdb/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 6.1.2 -PORTREVISION= 1 +PORTVERSION= 6.2.2 DISTVERSIONPREFIX= v CATEGORIES= databases diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo index aed03e8ce5c6..b3d6a0ba3937 100644 --- a/databases/rocksdb/distinfo +++ b/databases/rocksdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1559751337 -SHA256 (facebook-rocksdb-v6.1.2_GH0.tar.gz) = df93f3b66caa1cbe1c2862c99c33e18a5c5b24a64fb51dfe8ef805e3c9fd1cad -SIZE (facebook-rocksdb-v6.1.2_GH0.tar.gz) = 5468047 +TIMESTAMP = 1564837219 +SHA256 (facebook-rocksdb-v6.2.2_GH0.tar.gz) = 3e7365cb2a35982e95e5e5dd0b3352dc78573193dafca02788572318c38483fb +SIZE (facebook-rocksdb-v6.2.2_GH0.tar.gz) = 5500603 diff --git a/databases/rocksdb/files/patch-tools-db_stress.cc b/databases/rocksdb/files/patch-tools-db_stress.cc new file mode 100644 index 000000000000..ea32f5292fc7 --- /dev/null +++ b/databases/rocksdb/files/patch-tools-db_stress.cc @@ -0,0 +1,39 @@ +tools/db_stress.cc:3613:33: error: implicit instantiation of undefined template 'std::__1::array<std::__1::basic_string<char>, 10>' + std::array<std::string, 10> keys = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"}; + ^ +/usr/include/c++/v1/__tuple:223:64: note: template is declared here +template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array; + ^ +tools/db_stress.cc:3896:30: error: implicit conversion loses integer precision: 'std::__1::vector<long, std::__1::allocator<long> >::size_type' (aka 'unsigned long') to 'int' [-Werror,-Wshorten-64-to-32] + int num_keys = rand_keys.size(); + ~~~~~~~~ ~~~~~~~~~~^~~~~~ +2 errors generated. + +--- tools/db_stress.cc.orig 2019-06-07 23:23:07 UTC ++++ tools/db_stress.cc +@@ -38,6 +38,7 @@ int main() { + #include <stdlib.h> + #include <sys/types.h> + #include <algorithm> ++#include <array> + #include <chrono> + #include <exception> + #include <queue> +@@ -3893,7 +3894,7 @@ class AtomicFlushStressTest : public Str + const ReadOptions& read_opts, + const std::vector<int>& rand_column_families, + const std::vector<int64_t>& rand_keys) { +- int num_keys = rand_keys.size(); ++ size_t num_keys = rand_keys.size(); + std::vector<std::string> key_str; + std::vector<Slice> keys; + keys.reserve(num_keys); +@@ -3902,7 +3903,7 @@ class AtomicFlushStressTest : public Str + std::vector<Status> statuses(num_keys); + ColumnFamilyHandle* cfh = column_families_[rand_column_families[0]]; + +- for (int i = 0; i < num_keys; ++i) { ++ for (size_t i = 0; i < num_keys; ++i) { + key_str.emplace_back(Key(rand_keys[i])); + keys.emplace_back(key_str.back()); + } |