From owner-svn-ports-head@freebsd.org Sun Aug 4 16:10:05 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 41E00AC7BD; Sun, 4 Aug 2019 16:10:05 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 461m7x12ncz4crd; Sun, 4 Aug 2019 16:10:05 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 06E4D5E7B; Sun, 4 Aug 2019 16:10:05 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x74GA4ix076149; Sun, 4 Aug 2019 16:10:04 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x74GA4LD076146; Sun, 4 Aug 2019 16:10:04 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201908041610.x74GA4LD076146@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 4 Aug 2019 16:10:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508101 - in head/databases/rocksdb: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/databases/rocksdb: . files X-SVN-Commit-Revision: 508101 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Aug 2019 16:10:05 -0000 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, 10>' + std::array keys = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"}; + ^ +/usr/include/c++/v1/__tuple:223:64: note: template is declared here +template struct _LIBCPP_TEMPLATE_VIS array; + ^ +tools/db_stress.cc:3896:30: error: implicit conversion loses integer precision: 'std::__1::vector >::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 + #include + #include ++#include + #include + #include + #include +@@ -3893,7 +3894,7 @@ class AtomicFlushStressTest : public Str + const ReadOptions& read_opts, + const std::vector& rand_column_families, + const std::vector& rand_keys) { +- int num_keys = rand_keys.size(); ++ size_t num_keys = rand_keys.size(); + std::vector key_str; + std::vector keys; + keys.reserve(num_keys); +@@ -3902,7 +3903,7 @@ class AtomicFlushStressTest : public Str + std::vector 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()); + }