From nobody Thu Jun 16 14:05:14 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EC112846DA3; Thu, 16 Jun 2022 14:05:15 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LP3pg1187z3G5m; Thu, 16 Jun 2022 14:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655388315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8wppFtdPeizc+55vivhJ5e279qAtMWHDXUqV1xz42LI=; b=vUnBuT34GViplT5rYJ0sn37HnnokSWQqrAEm8/9ZQahCXW6jtBq01HD0SIS+oeJccHyMIv d0HdBYqcdueQ11uyNrT0QpLzq45SIPKnFYh9fYkocp9janUikQEGRUkfkVltwTpFU7caQV 3bdTCaVPrrtmnPuWRfw0ncOIE5pTdyxmtShbFn/6D4RG5l/26nU6k5bwfkzc3Fa058A7Sq +3vQR+YFmI1+hxsZYqcRv1SJ6dJy3+o2DWIRbyO7U5LqwML23uYe24aIHHlWzOsRlB4eWJ 4fF2zAdnZkmdiwIPkGfgO2nxGShLKmCD97/7ovh9CMVbP7He7yBaOc84wTUegg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDCED4AF1; Thu, 16 Jun 2022 14:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25GE5EK9012494; Thu, 16 Jun 2022 14:05:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25GE5EZb012493; Thu, 16 Jun 2022 14:05:14 GMT (envelope-from git) Date: Thu, 16 Jun 2022 14:05:14 GMT Message-Id: <202206161405.25GE5EZb012493@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: e4bc1f63b9db - main - databases/rocksdb: Update to 7.3.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4bc1f63b9dbdbde2463e8e4e33687aceb51bf1e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655388315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8wppFtdPeizc+55vivhJ5e279qAtMWHDXUqV1xz42LI=; b=dw2erGOnbDge1U0AmwdC6XRkwrFt/+tRrwCVR4PSRCUZMDK+InjK7IyFxhm8QeIF8LHrPF uLb4ImIt0xRsW9a//Y2UwqpHl9iWh98r9u6Tc+AM1oonOU+lHMXzfUPVe4ypM51t4RXh7s zrVHluDMX1zeKWYQWrk4lG2RR+GTbI7seQS6SGlkP4cA0DNDmR3ieVlRLm6Ilv/Y5QuXJO 5PwpJ5kzkocEXiy0coFAoHmvhMDAcihz+pjYWlEPqGHEnyDEzitXk+Ha2hMg3vQeRKxt1H OfUakvv0s1mD4qF5l+2xuXNbE9Tw6hrfr2303+DKuULncKFzSge86moT9paGMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655388315; a=rsa-sha256; cv=none; b=HZlgO6oCUY66lmdT3pbHe6Lsk64Zr35AfgVgA6Sb2gFH0utqZP9dBRp3blQWMgRrlxp3rG k7xYzKDmqYz28vAyRhzOu14V24Qeyauxz/B0GUBOKD8WBH5W2KE/WTWBC1Csy+vSiUxi3/ 9FNIQd7ljEWvfv2KlhRGcCKjI6hRaU8+Tt4Yi3TZAEKW0hVNKhMb7Mr5bup98RoSOHSAer lnl8UZoP8fhfQLTCKE6KIiq5sUsrkoLI9WGQzUkPXlWxICPGEl0ymlWTkFpCPuFI2COPXC mujBBeHKPmC2n7NLCaou8nfxIALK2LZT8fESKnL/Vw0xE6C0pTtOXzJo+aI55Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e4bc1f63b9dbdbde2463e8e4e33687aceb51bf1e commit e4bc1f63b9dbdbde2463e8e4e33687aceb51bf1e Author: Po-Chuan Hsieh AuthorDate: 2022-06-16 13:59:07 +0000 Commit: Po-Chuan Hsieh 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 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 .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 DBTestBase::GetBlobFileNumbers() { - VersionSet* const versions = dbfull()->TEST_GetVersionSet(); + VersionSet* const versions = dbfull()->GetVersionSet(); assert(versions); -@@ -1148,6 +1155,7 @@ std::vector DBTestBase::GetBlobFileNumbers() +@@ -1174,6 +1181,7 @@ std::vector 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