mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-10 07:04:03 +00:00
Code Issues Releases Activity

Update to 6.3.6

Browse Source 
Changes:	https://github.com/facebook/rocksdb/releases
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2019-10-21 23:32:14 +00:00
parent fe45922832
commit 872a3e1b59
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=515140
6 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
databases/rocksdb/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rocksdb
PORTVERSION= 6.2.4
PORTVERSION= 6.3.6
DISTVERSIONPREFIX= v
CATEGORIES= databases

6
databases/rocksdb/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1569607998
SHA256 (facebook-rocksdb-v6.2.4_GH0.tar.gz) = 7f34d1b55501f5273d11cd064bd34aef87c51ff114452968b86457f06cdb8ced
SIZE (facebook-rocksdb-v6.2.4_GH0.tar.gz) = 5502861
TIMESTAMP = 1571671533
SHA256 (facebook-rocksdb-v6.3.6_GH0.tar.gz) = 9878beb4e9b74a5f0d9500772235a39066fd019ba7af9ae6afe483ca713e3c7c
SIZE (facebook-rocksdb-v6.3.6_GH0.tar.gz) = 5573722

4
databases/rocksdb/files/patch-util-arena.cc → databases/rocksdb/files/patch-memory-arena.cc
View File

@ -1,5 +1,5 @@
--- util/arena.cc.orig 2018-01-31 01:15:39 UTC
+++ util/arena.cc
--- memory/arena.cc.orig 2018-01-31 01:15:39 UTC
+++ memory/arena.cc
@@ -33,7 +33,7 @@ const size_t Arena::kInlineSize;
const size_t Arena::kMinBlockSize = 4096;

4
databases/rocksdb/files/patch-util-arena.h → databases/rocksdb/files/patch-memory-arena.h
View File

@ -1,5 +1,5 @@
--- util/arena.h.orig 2018-01-31 01:15:39 UTC
+++ util/arena.h
--- memory/arena.h.orig 2018-01-31 01:15:39 UTC
+++ memory/arena.h
@@ -82,7 +82,7 @@ class Arena : public Allocator {
}

4
databases/rocksdb/files/patch-util-arena_test.cc → databases/rocksdb/files/patch-memory-arena_test.cc
View File

@ -1,5 +1,5 @@
--- util/arena_test.cc.orig 2018-01-31 01:15:39 UTC
+++ util/arena_test.cc
--- memory/arena_test.cc.orig 2018-01-31 01:15:39 UTC
+++ memory/arena_test.cc
@@ -91,7 +91,7 @@ static void ApproximateMemoryUsageTest(s
ASSERT_EQ(kZero, arena.ApproximateMemoryUsage());

39
databases/rocksdb/files/patch-tools-db_stress.cc
View File

@ -1,39 +0,0 @@
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());
}