git: 42761afdd072 - main - databases/rocksdb: Update to 7.9.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 05 Feb 2023 15:54:00 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=42761afdd0729a6a3f8ad02780ded274e78a3abb
commit 42761afdd0729a6a3f8ad02780ded274e78a3abb
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-02-05 15:17:18 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-02-05 15:47:41 +0000
databases/rocksdb: Update to 7.9.2
Changes: https://github.com/facebook/rocksdb/releases
---
databases/rocksdb/Makefile | 2 +-
databases/rocksdb/distinfo | 6 ++---
databases/rocksdb/files/patch-db-db_test_util.cc | 28 ++++++++++++------------
databases/rocksdb/files/patch-env-io_posix.h | 11 ++++++++++
4 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index 68cb80f16c75..158ba228a044 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -1,5 +1,5 @@
PORTNAME= rocksdb
-PORTVERSION= 7.8.3
+PORTVERSION= 7.9.2
DISTVERSIONPREFIX= v
CATEGORIES= databases
diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo
index 412d2e51bdbc..1b131de2dc75 100644
--- a/databases/rocksdb/distinfo
+++ b/databases/rocksdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674589480
-SHA256 (facebook-rocksdb-v7.8.3_GH0.tar.gz) = b85408a374770897332bf15e51620a5f35720dd416a4749e3899057f9cfaf84d
-SIZE (facebook-rocksdb-v7.8.3_GH0.tar.gz) = 10782632
+TIMESTAMP = 1675190923
+SHA256 (facebook-rocksdb-v7.9.2_GH0.tar.gz) = 886378093098a1b2521b824782db7f7dd86224c232cf9652fcaf88222420b292
+SIZE (facebook-rocksdb-v7.9.2_GH0.tar.gz) = 12058713
diff --git a/databases/rocksdb/files/patch-db-db_test_util.cc b/databases/rocksdb/files/patch-db-db_test_util.cc
index 2bc1fd7b68b5..2601adc031a5 100644
--- a/databases/rocksdb/files/patch-db-db_test_util.cc
+++ b/databases/rocksdb/files/patch-db-db_test_util.cc
@@ -1,4 +1,4 @@
---- db/db_test_util.cc.orig 2022-06-08 21:08:16 UTC
+--- db/db_test_util.cc.orig 2022-12-22 17:30:39 UTC
+++ db/db_test_util.cc
@@ -104,9 +104,11 @@ DBTestBase::DBTestBase(const std::string path, bool en
}
@@ -29,16 +29,16 @@
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;
+ options.use_direct_reads = true;
+ options.use_direct_io_for_flush_and_compaction = true;
+ options.compaction_readahead_size = 2 * 1024 * 1024;
+#ifndef NDEBUG
- SetupSyncPointsToMockDirectIO();
+ SetupSyncPointsToMockDirectIO();
+#endif
- break;
- }
+ break;
+ }
#endif // ROCKSDB_LITE
-@@ -1149,6 +1155,7 @@ std::string DBTestBase::FilesPerLevel(int cf) {
+@@ -1168,6 +1174,7 @@ std::string DBTestBase::FilesPerLevel(int cf) {
#endif // !ROCKSDB_LITE
@@ -46,7 +46,7 @@
std::vector<uint64_t> DBTestBase::GetBlobFileNumbers() {
VersionSet* const versions = dbfull()->GetVersionSet();
assert(versions);
-@@ -1174,6 +1181,7 @@ std::vector<uint64_t> DBTestBase::GetBlobFileNumbers()
+@@ -1193,6 +1200,7 @@ std::vector<uint64_t> DBTestBase::GetBlobFileNumbers()
return result;
}
@@ -54,7 +54,7 @@
size_t DBTestBase::CountFiles() {
size_t count = 0;
-@@ -1256,6 +1264,7 @@ void DBTestBase::FillLevels(const std::string& smalles
+@@ -1275,6 +1283,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]));
-@@ -1263,13 +1272,16 @@ void DBTestBase::MoveFilesToLevel(int level, int cf) {
+@@ -1282,13 +1291,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) {
-@@ -1310,10 +1322,12 @@ void DBTestBase::GenerateNewFile(int cf, Random* rnd,
+@@ -1331,10 +1343,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
-@@ -1322,10 +1336,12 @@ void DBTestBase::GenerateNewFile(Random* rnd, int* key
+@@ -1343,10 +1357,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;
-@@ -1335,10 +1351,12 @@ void DBTestBase::GenerateNewRandomFile(Random* rnd, bo
+@@ -1356,10 +1372,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/files/patch-env-io_posix.h b/databases/rocksdb/files/patch-env-io_posix.h
new file mode 100644
index 000000000000..837f4ab039e3
--- /dev/null
+++ b/databases/rocksdb/files/patch-env-io_posix.h
@@ -0,0 +1,11 @@
+--- env/io_posix.h.orig 2022-12-22 17:30:39 UTC
++++ env/io_posix.h
+@@ -29,7 +29,7 @@
+
+ // For non linux platform, the following macros are used only as place
+ // holder.
+-#if !(defined OS_LINUX) && !(defined CYGWIN) && !(defined OS_AIX)
++#if !(defined OS_LINUX) && !(defined CYGWIN) && !(defined OS_AIX) && !(defined OS_FREEBSD)
+ #define POSIX_FADV_NORMAL 0 /* [MC1] no further special treatment */
+ #define POSIX_FADV_RANDOM 1 /* [MC1] expect random page refs */
+ #define POSIX_FADV_SEQUENTIAL 2 /* [MC1] expect sequential page refs */