Date: Sun, 4 Aug 2019 16:10:04 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508101 - in head/databases/rocksdb: . files Message-ID: <201908041610.x74GA4LD076146@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Aug 4 16:10:04 2019 New Revision: 508101 URL: https://svnweb.freebsd.org/changeset/ports/508101 Log: Update to 6.2.2 Changes: https://github.com/facebook/rocksdb/releases Added: head/databases/rocksdb/files/patch-tools-db_stress.cc (contents, props changed) Modified: head/databases/rocksdb/Makefile head/databases/rocksdb/distinfo Modified: head/databases/rocksdb/Makefile ============================================================================== --- head/databases/rocksdb/Makefile Sun Aug 4 16:09:59 2019 (r508100) +++ head/databases/rocksdb/Makefile Sun Aug 4 16:10:04 2019 (r508101) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 6.1.2 -PORTREVISION= 1 +PORTVERSION= 6.2.2 DISTVERSIONPREFIX= v CATEGORIES= databases Modified: head/databases/rocksdb/distinfo ============================================================================== --- head/databases/rocksdb/distinfo Sun Aug 4 16:09:59 2019 (r508100) +++ head/databases/rocksdb/distinfo Sun Aug 4 16:10:04 2019 (r508101) @@ -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 Added: head/databases/rocksdb/files/patch-tools-db_stress.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-tools-db_stress.cc Sun Aug 4 16:10:04 2019 (r508101) @@ -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()); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908041610.x74GA4LD076146>