sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

databases/rocksdb: Update to 7.3.1

Browse source 
Changes:	https://github.com/facebook/rocksdb/releases
This commit is contained in:
Po-Chuan Hsieh 2022-06-16 21:59:07 +08:00
parent d4428bd985
commit e4bc1f63b9
No known key found for this signature in database
GPG key ID: 9A4BD10F002DD04B
5 changed files with 46 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
databases/rocksdb/Makefile
View file

@ -1,7 +1,7 @@
# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org> # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
PORTNAME= rocksdb PORTNAME= rocksdb
PORTVERSION= 7.2.2 PORTVERSION= 7.3.1
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
CATEGORIES= databases CATEGORIES= databases
@ -42,6 +42,8 @@ PORTDATA= make_config.mk
GH_ACCOUNT= facebook GH_ACCOUNT= facebook
USE_GITHUB= yes USE_GITHUB= yes
CONFLICTS_INSTALL= rocksdb-lite
BENCHMARKS= cache_bench db_bench memtablerep_bench persistent_cache_bench range_del_aggregator_bench table_reader_bench BENCHMARKS= cache_bench db_bench memtablerep_bench persistent_cache_bench range_del_aggregator_bench table_reader_bench
TOOLS= blob_dump db_repl_stress db_sanity_test db_stress ldb rocksdb_dump rocksdb_undump sst_dump trace_analyzer write_stress TOOLS= blob_dump db_repl_stress db_sanity_test db_stress ldb rocksdb_dump rocksdb_undump sst_dump trace_analyzer write_stress
@ -55,17 +57,6 @@ LZ4_MAKE_ENV_OFF= ROCKSDB_DISABLE_LZ4=yes
ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
ZSTD_MAKE_ENV_OFF= ROCKSDB_DISABLE_ZSTD=yes ZSTD_MAKE_ENV_OFF= ROCKSDB_DISABLE_ZSTD=yes
.if !defined(LITE)
CONFLICTS_INSTALL= rocksdb-lite
PLIST_SUB+= LITE="@comment " NO_LITE=""
.else
PKGNAMESUFFIX= -lite
CONFLICTS_INSTALL= rocksdb
CFLAGS+= -DROCKSDB_LITE=1
MAKE_ENV+= LIBNAME=librocksdb${PKGNAMESUFFIX} DISABLE_JEMALLOC=1
PLIST_SUB+= LITE="" NO_LITE="@comment "
.endif
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${CHOSEN_COMPILER_TYPE} == clang .if ${CHOSEN_COMPILER_TYPE} == clang

6
databases/rocksdb/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1652122553 TIMESTAMP = 1655208210
SHA256 (facebook-rocksdb-v7.2.2_GH0.tar.gz) = c4ea6bd2e3ffe3f0f8921c699234d59108c9122d61b0ba2aa78358642a7b614e SHA256 (facebook-rocksdb-v7.3.1_GH0.tar.gz) = 51a44b8f151d1a39793a8cf37d9de248b980f9aaed0c7bbeee06304e4d7b8d95
SIZE (facebook-rocksdb-v7.2.2_GH0.tar.gz) = 9549844 SIZE (facebook-rocksdb-v7.3.1_GH0.tar.gz) = 9607813

12
databases/rocksdb/files/patch-Makefile
View file

@ -1,6 +1,6 @@
--- Makefile.orig 2022-03-10 06:51:01 UTC --- Makefile.orig 2022-06-08 21:08:16 UTC
+++ Makefile +++ Makefile
@@ -220,17 +220,17 @@ AM_SHARE = $(AM_V_CCLD) $(CXX) $(PLATFORM_SHARED_LDFLA @@ -223,18 +223,18 @@ AM_SHARE = $(AM_V_CCLD) $(CXX) $(PLATFORM_SHARED_LDFLA
# Detect what platform we're building on. # Detect what platform we're building on.
# Export some common variables that might have been passed as Make variables # Export some common variables that might have been passed as Make variables
# instead of environment variables. # instead of environment variables.
@ -14,6 +14,7 @@
- export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \ - export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \
- export USE_CLANG="$(USE_CLANG)"; \ - export USE_CLANG="$(USE_CLANG)"; \
- export LIB_MODE="$(LIB_MODE)"; \ - export LIB_MODE="$(LIB_MODE)"; \
- export ROCKSDB_CXX_STANDARD="$(ROCKSDB_CXX_STANDARD)"; \
- "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk")) - "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
+# dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \ +# dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \
+# export CXXFLAGS="$(EXTRA_CXXFLAGS)"; \ +# export CXXFLAGS="$(EXTRA_CXXFLAGS)"; \
@ -25,13 +26,14 @@
+# export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \ +# export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \
+# export USE_CLANG="$(USE_CLANG)"; \ +# export USE_CLANG="$(USE_CLANG)"; \
+# export LIB_MODE="$(LIB_MODE)"; \ +# export LIB_MODE="$(LIB_MODE)"; \
+# export ROCKSDB_CXX_STANDARD="$(ROCKSDB_CXX_STANDARD)"; \
+# "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk")) +# "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
# this file is generated by the previous line to set build flags and sources # this file is generated by the previous line to set build flags and sources
include make_config.mk include make_config.mk
@@ -796,7 +796,7 @@ endif # PLATFORM_SHARED_EXT @@ -806,7 +806,7 @@ endif # PLATFORM_SHARED_EXT
blackbox_crash_test_with_ts whitebox_crash_test_with_ts rocksdbjavastatic rocksdbjava install install-static install-shared \
uninstall analyze tools tools_lib check-headers checkout_folly
-all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(TESTS) -all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(TESTS)
+all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs # $(TESTS) +all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs # $(TESTS)

32
databases/rocksdb/files/patch-db-db_test_util.cc
View file

@ -1,6 +1,6 @@
--- db/db_test_util.cc.orig 2021-06-25 21:15:04 UTC --- db/db_test_util.cc.orig 2022-06-08 21:08:16 UTC
+++ db/db_test_util.cc +++ db/db_test_util.cc
@@ -95,9 +95,11 @@ DBTestBase::DBTestBase(const std::string path, bool en @@ -104,9 +104,11 @@ DBTestBase::DBTestBase(const std::string path, bool en
} }
DBTestBase::~DBTestBase() { DBTestBase::~DBTestBase() {
@ -12,7 +12,7 @@
Close(); Close();
Options options; Options options;
options.db_paths.emplace_back(dbname_, 0); options.db_paths.emplace_back(dbname_, 0);
@@ -347,6 +349,7 @@ Options DBTestBase::GetOptions( @@ -356,6 +358,7 @@ Options DBTestBase::GetOptions(
Options options = default_options; Options options = default_options;
BlockBasedTableOptions table_options; BlockBasedTableOptions table_options;
bool set_block_based_table_factory = true; bool set_block_based_table_factory = true;
@ -20,15 +20,15 @@
#if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(OS_SOLARIS) && \ #if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(OS_SOLARIS) && \
!defined(OS_AIX) !defined(OS_AIX)
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearCallBack( ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearCallBack(
@@ -354,6 +357,7 @@ Options DBTestBase::GetOptions( @@ -363,6 +366,7 @@ Options DBTestBase::GetOptions(
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearCallBack( ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearCallBack(
"NewWritableFile:O_DIRECT"); "NewWritableFile:O_DIRECT");
#endif #endif
+#endif +#endif
// kMustFreeHeapAllocations -> indicates ASAN build
bool can_allow_mmap = IsMemoryMappedAccessSupported(); if (kMustFreeHeapAllocations && !options_override.full_block_cache) {
switch (option_config) { // Detecting block cache use-after-free is normally difficult in unit
@@ -408,7 +412,9 @@ Options DBTestBase::GetOptions( @@ -428,7 +432,9 @@ Options DBTestBase::GetOptions(
options.use_direct_reads = true; options.use_direct_reads = true;
options.use_direct_io_for_flush_and_compaction = true; options.use_direct_io_for_flush_and_compaction = true;
options.compaction_readahead_size = 2 * 1024 * 1024; options.compaction_readahead_size = 2 * 1024 * 1024;
@ -38,15 +38,15 @@
break; break;
} }
#endif // ROCKSDB_LITE #endif // ROCKSDB_LITE
@@ -1124,6 +1130,7 @@ std::string DBTestBase::FilesPerLevel(int cf) { @@ -1149,6 +1155,7 @@ std::string DBTestBase::FilesPerLevel(int cf) {
#endif // !ROCKSDB_LITE #endif // !ROCKSDB_LITE
+#ifndef NDEBUG +#ifndef NDEBUG
std::vector<uint64_t> DBTestBase::GetBlobFileNumbers() { std::vector<uint64_t> DBTestBase::GetBlobFileNumbers() {
VersionSet* const versions = dbfull()->TEST_GetVersionSet(); VersionSet* const versions = dbfull()->GetVersionSet();
assert(versions); assert(versions);
@@ -1148,6 +1155,7 @@ std::vector<uint64_t> DBTestBase::GetBlobFileNumbers() @@ -1174,6 +1181,7 @@ std::vector<uint64_t> DBTestBase::GetBlobFileNumbers()
return result; return result;
} }
@ -54,7 +54,7 @@
size_t DBTestBase::CountFiles() { size_t DBTestBase::CountFiles() {
size_t count = 0; size_t count = 0;
@@ -1230,6 +1238,7 @@ void DBTestBase::FillLevels(const std::string& smalles @@ -1256,6 +1264,7 @@ void DBTestBase::FillLevels(const std::string& smalles
} }
void DBTestBase::MoveFilesToLevel(int level, int cf) { void DBTestBase::MoveFilesToLevel(int level, int cf) {
@ -62,7 +62,7 @@
for (int l = 0; l < level; ++l) { for (int l = 0; l < level; ++l) {
if (cf > 0) { if (cf > 0) {
EXPECT_OK(dbfull()->TEST_CompactRange(l, nullptr, nullptr, handles_[cf])); EXPECT_OK(dbfull()->TEST_CompactRange(l, nullptr, nullptr, handles_[cf]));
@@ -1237,13 +1246,16 @@ void DBTestBase::MoveFilesToLevel(int level, int cf) { @@ -1263,13 +1272,16 @@ void DBTestBase::MoveFilesToLevel(int level, int cf) {
EXPECT_OK(dbfull()->TEST_CompactRange(l, nullptr, nullptr)); EXPECT_OK(dbfull()->TEST_CompactRange(l, nullptr, nullptr));
} }
} }
@ -79,7 +79,7 @@
for (int level = 0; level < db_->NumberLevels(); level++) { for (int level = 0; level < db_->NumberLevels(); level++) {
int num = NumTableFilesAtLevel(level); int num = NumTableFilesAtLevel(level);
if (num > 0) { if (num > 0) {
@@ -1284,10 +1296,12 @@ void DBTestBase::GenerateNewFile(int cf, Random* rnd, @@ -1310,10 +1322,12 @@ void DBTestBase::GenerateNewFile(int cf, Random* rnd,
ASSERT_OK(Put(cf, Key(*key_idx), rnd->RandomString((i == 99) ? 1 : 990))); ASSERT_OK(Put(cf, Key(*key_idx), rnd->RandomString((i == 99) ? 1 : 990)));
(*key_idx)++; (*key_idx)++;
} }
@ -92,7 +92,7 @@
} }
// this will generate non-overlapping files since it keeps increasing key_idx // this will generate non-overlapping files since it keeps increasing key_idx
@@ -1296,10 +1310,12 @@ void DBTestBase::GenerateNewFile(Random* rnd, int* key @@ -1322,10 +1336,12 @@ void DBTestBase::GenerateNewFile(Random* rnd, int* key
ASSERT_OK(Put(Key(*key_idx), rnd->RandomString((i == 99) ? 1 : 990))); ASSERT_OK(Put(Key(*key_idx), rnd->RandomString((i == 99) ? 1 : 990)));
(*key_idx)++; (*key_idx)++;
} }
@ -105,7 +105,7 @@
} }
const int DBTestBase::kNumKeysByGenerateNewRandomFile = 51; const int DBTestBase::kNumKeysByGenerateNewRandomFile = 51;
@@ -1309,10 +1325,12 @@ void DBTestBase::GenerateNewRandomFile(Random* rnd, bo @@ -1335,10 +1351,12 @@ void DBTestBase::GenerateNewRandomFile(Random* rnd, bo
ASSERT_OK(Put("key" + rnd->RandomString(7), rnd->RandomString(2000))); ASSERT_OK(Put("key" + rnd->RandomString(7), rnd->RandomString(2000)));
} }
ASSERT_OK(Put("key" + rnd->RandomString(7), rnd->RandomString(200))); ASSERT_OK(Put("key" + rnd->RandomString(7), rnd->RandomString(200)));

18
databases/rocksdb/pkg-plist
View file

@ -113,16 +113,10 @@ include/rocksdb/wal_filter.h
include/rocksdb/write_batch.h include/rocksdb/write_batch.h
include/rocksdb/write_batch_base.h include/rocksdb/write_batch_base.h
include/rocksdb/write_buffer_manager.h include/rocksdb/write_buffer_manager.h
%%LITE%%lib/librocksdb-lite.a lib/librocksdb.a
%%LITE%%lib/librocksdb-lite.so lib/librocksdb.so
%%LITE%%lib/librocksdb-lite.so.7 lib/librocksdb.so.7
%%LITE%%lib/librocksdb-lite.so.%%SHLIB_VER%% lib/librocksdb.so.%%SHLIB_VER%%
%%LITE%%lib/librocksdb-lite.so.%%PORTVERSION%% lib/librocksdb.so.%%PORTVERSION%%
%%LITE%%lib/librocksdb-lite_tools.so lib/librocksdb_tools.so
%%NO_LITE%%lib/librocksdb.a
%%NO_LITE%%lib/librocksdb.so
%%NO_LITE%%lib/librocksdb.so.7
%%NO_LITE%%lib/librocksdb.so.%%SHLIB_VER%%
%%NO_LITE%%lib/librocksdb.so.%%PORTVERSION%%
%%NO_LITE%%lib/librocksdb_tools.so
libdata/pkgconfig/rocksdb.pc libdata/pkgconfig/rocksdb.pc