Date: Thu, 16 Jun 2022 14:05:14 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e4bc1f63b9db - main - databases/rocksdb: Update to 7.3.1 Message-ID: <202206161405.25GE5EZb012493@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e4bc1f63b9dbdbde2463e8e4e33687aceb51bf1e commit e4bc1f63b9dbdbde2463e8e4e33687aceb51bf1e Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2022-06-16 13:59:07 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2022-06-16 13:59:07 +0000 databases/rocksdb: Update to 7.3.1 Changes: https://github.com/facebook/rocksdb/releases --- databases/rocksdb/Makefile | 15 +++-------- databases/rocksdb/distinfo | 6 ++--- databases/rocksdb/files/patch-Makefile | 34 +++++++++++++----------- databases/rocksdb/files/patch-db-db_test_util.cc | 32 +++++++++++----------- databases/rocksdb/pkg-plist | 18 +++++-------- 5 files changed, 46 insertions(+), 59 deletions(-) diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile index 2525c4e57456..59f10bcaf383 100644 --- a/databases/rocksdb/Makefile +++ b/databases/rocksdb/Makefile @@ -1,7 +1,7 @@ # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org> PORTNAME= rocksdb -PORTVERSION= 7.2.2 +PORTVERSION= 7.3.1 DISTVERSIONPREFIX= v CATEGORIES= databases @@ -42,6 +42,8 @@ PORTDATA= make_config.mk GH_ACCOUNT= facebook USE_GITHUB= yes +CONFLICTS_INSTALL= rocksdb-lite + 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 @@ -55,17 +57,6 @@ LZ4_MAKE_ENV_OFF= ROCKSDB_DISABLE_LZ4=yes ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd 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> .if ${CHOSEN_COMPILER_TYPE} == clang diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo index fb5cc02a5a39..07208f0c749b 100644 --- a/databases/rocksdb/distinfo +++ b/databases/rocksdb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652122553 -SHA256 (facebook-rocksdb-v7.2.2_GH0.tar.gz) = c4ea6bd2e3ffe3f0f8921c699234d59108c9122d61b0ba2aa78358642a7b614e -SIZE (facebook-rocksdb-v7.2.2_GH0.tar.gz) = 9549844 +TIMESTAMP = 1655208210 +SHA256 (facebook-rocksdb-v7.3.1_GH0.tar.gz) = 51a44b8f151d1a39793a8cf37d9de248b980f9aaed0c7bbeee06304e4d7b8d95 +SIZE (facebook-rocksdb-v7.3.1_GH0.tar.gz) = 9607813 diff --git a/databases/rocksdb/files/patch-Makefile b/databases/rocksdb/files/patch-Makefile index 2c820e4c7ab6..8c1f862c98ce 100644 --- a/databases/rocksdb/files/patch-Makefile +++ b/databases/rocksdb/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2022-03-10 06:51:01 UTC +--- Makefile.orig 2022-06-08 21:08:16 UTC +++ 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. # Export some common variables that might have been passed as Make variables # instead of environment variables. @@ -14,24 +14,26 @@ - export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \ - export USE_CLANG="$(USE_CLANG)"; \ - export LIB_MODE="$(LIB_MODE)"; \ +- export ROCKSDB_CXX_STANDARD="$(ROCKSDB_CXX_STANDARD)"; \ - "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk")) -+#dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \ -+# export CXXFLAGS="$(EXTRA_CXXFLAGS)"; \ -+# export LDFLAGS="$(EXTRA_LDFLAGS)"; \ -+# export COMPILE_WITH_ASAN="$(COMPILE_WITH_ASAN)"; \ -+# export COMPILE_WITH_TSAN="$(COMPILE_WITH_TSAN)"; \ -+# export COMPILE_WITH_UBSAN="$(COMPILE_WITH_UBSAN)"; \ -+# export PORTABLE="$(PORTABLE)"; \ -+# export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \ -+# export USE_CLANG="$(USE_CLANG)"; \ -+# export LIB_MODE="$(LIB_MODE)"; \ -+# "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk")) ++# dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \ ++# export CXXFLAGS="$(EXTRA_CXXFLAGS)"; \ ++# export LDFLAGS="$(EXTRA_LDFLAGS)"; \ ++# export COMPILE_WITH_ASAN="$(COMPILE_WITH_ASAN)"; \ ++# export COMPILE_WITH_TSAN="$(COMPILE_WITH_TSAN)"; \ ++# export COMPILE_WITH_UBSAN="$(COMPILE_WITH_UBSAN)"; \ ++# export PORTABLE="$(PORTABLE)"; \ ++# export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \ ++# export USE_CLANG="$(USE_CLANG)"; \ ++# export LIB_MODE="$(LIB_MODE)"; \ ++# export ROCKSDB_CXX_STANDARD="$(ROCKSDB_CXX_STANDARD)"; \ ++# "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk")) # this file is generated by the previous line to set build flags and sources include make_config.mk -@@ -796,7 +796,7 @@ endif # PLATFORM_SHARED_EXT - blackbox_crash_test_with_ts whitebox_crash_test_with_ts - +@@ -806,7 +806,7 @@ endif # PLATFORM_SHARED_EXT + 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) diff --git a/databases/rocksdb/files/patch-db-db_test_util.cc b/databases/rocksdb/files/patch-db-db_test_util.cc index 472503e88f1f..2bc1fd7b68b5 100644 --- a/databases/rocksdb/files/patch-db-db_test_util.cc +++ b/databases/rocksdb/files/patch-db-db_test_util.cc @@ -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 -@@ -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() { @@ -12,7 +12,7 @@ Close(); Options options; 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; BlockBasedTableOptions table_options; bool set_block_based_table_factory = true; @@ -20,15 +20,15 @@ #if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(OS_SOLARIS) && \ !defined(OS_AIX) ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearCallBack( -@@ -354,6 +357,7 @@ Options DBTestBase::GetOptions( +@@ -363,6 +366,7 @@ Options DBTestBase::GetOptions( ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearCallBack( "NewWritableFile:O_DIRECT"); #endif +#endif - - bool can_allow_mmap = IsMemoryMappedAccessSupported(); - switch (option_config) { -@@ -408,7 +412,9 @@ Options DBTestBase::GetOptions( + // kMustFreeHeapAllocations -> indicates ASAN build + if (kMustFreeHeapAllocations && !options_override.full_block_cache) { + // Detecting block cache use-after-free is normally difficult in unit +@@ -428,7 +432,9 @@ Options DBTestBase::GetOptions( options.use_direct_reads = true; options.use_direct_io_for_flush_and_compaction = true; options.compaction_readahead_size = 2 * 1024 * 1024; @@ -38,15 +38,15 @@ break; } #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 +#ifndef NDEBUG std::vector<uint64_t> DBTestBase::GetBlobFileNumbers() { - VersionSet* const versions = dbfull()->TEST_GetVersionSet(); + VersionSet* const versions = dbfull()->GetVersionSet(); assert(versions); -@@ -1148,6 +1155,7 @@ std::vector<uint64_t> DBTestBase::GetBlobFileNumbers() +@@ -1174,6 +1181,7 @@ std::vector<uint64_t> DBTestBase::GetBlobFileNumbers() return result; } @@ -54,7 +54,7 @@ size_t DBTestBase::CountFiles() { 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) { @@ -62,7 +62,7 @@ for (int l = 0; l < level; ++l) { if (cf > 0) { 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)); } } @@ -79,7 +79,7 @@ for (int level = 0; level < db_->NumberLevels(); level++) { int num = NumTableFilesAtLevel(level); 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))); (*key_idx)++; } @@ -92,7 +92,7 @@ } // 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))); (*key_idx)++; } @@ -105,7 +105,7 @@ } 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(200))); diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist index 875e07d16554..9c22828ea885 100644 --- a/databases/rocksdb/pkg-plist +++ b/databases/rocksdb/pkg-plist @@ -113,16 +113,10 @@ include/rocksdb/wal_filter.h include/rocksdb/write_batch.h include/rocksdb/write_batch_base.h include/rocksdb/write_buffer_manager.h -%%LITE%%lib/librocksdb-lite.a -%%LITE%%lib/librocksdb-lite.so -%%LITE%%lib/librocksdb-lite.so.7 -%%LITE%%lib/librocksdb-lite.so.%%SHLIB_VER%% -%%LITE%%lib/librocksdb-lite.so.%%PORTVERSION%% -%%LITE%%lib/librocksdb-lite_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 +lib/librocksdb.a +lib/librocksdb.so +lib/librocksdb.so.7 +lib/librocksdb.so.%%SHLIB_VER%% +lib/librocksdb.so.%%PORTVERSION%% +lib/librocksdb_tools.so libdata/pkgconfig/rocksdb.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206161405.25GE5EZb012493>