Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rocksdb] update to v8.3.2, add/rework features #29093

Merged
merged 33 commits into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
35abbb1
add more options and remove unused CMake variables
yurybura Jan 21, 2023
844f015
add version
yurybura Jan 21, 2023
f91dd1c
[rocksdb] fix liburing option
yurybura Jan 22, 2023
1df7d02
update version
yurybura Jan 22, 2023
182845e
[rocksdb] disable debug runtime for Release configuration (Windows only)
yurybura Jan 22, 2023
5bfc94c
update version
yurybura Jan 22, 2023
975031c
[rocksdb] remove processor-specific features
yurybura Mar 13, 2023
6e940d6
[rocksdb] update v7.10.2
yurybura Mar 13, 2023
4a147d0
add version
yurybura Mar 13, 2023
5546099
[rocksdb] update to v8.0.0
yurybura Mar 19, 2023
0fa8ece
add version
yurybura Mar 19, 2023
c6f55fa
Merge branch 'master' of https://github.com/microsoft/vcpkg into rock…
yurybura Mar 23, 2023
2db63bb
add version
yurybura Mar 23, 2023
ae3b4dc
Merge branch 'master' of https://github.com/microsoft/vcpkg into rock…
yurybura Apr 3, 2023
f13e4fd
modify version
yurybura Apr 5, 2023
ccc8284
add version
yurybura Apr 5, 2023
5ee0648
Merge branch 'master' of https://github.com/microsoft/vcpkg into rock…
yurybura Apr 14, 2023
bf2241d
[rocksdb] update to v8.3.2, build shared library, update ci.basline.txt
yurybura Jun 24, 2023
dc29ca6
update version
yurybura Jun 24, 2023
b144e40
Merge branch 'master' into rocksdb-features
yurybura Jun 24, 2023
7941a9f
[rocksdb] PORTABLE option has been modified in v8.3, it should be equ…
yurybura Jun 25, 2023
6720e8c
clean up ci.baseline.txt
yurybura Jun 25, 2023
77225e2
=update version
yurybura Jun 25, 2023
6bc6ad0
revert "clean up ci.baseline.txt"
yurybura Jun 26, 2023
903b003
remove unnecessary lines
yurybura Jun 26, 2023
97b32a5
update version
yurybura Jun 26, 2023
5e6130e
update ci.baseline.txt
yurybura Jun 27, 2023
a090a85
update version
yurybura Jun 27, 2023
4c9bd82
Merge branch 'master' of https://github.com/microsoft/vcpkg into rock…
yurybura Jun 29, 2023
d650d33
Merge branch 'microsoft:master' into rocksdb-features
yurybura Jul 2, 2023
e57df3a
[rocksdb] remove JeMalloc
yurybura Jul 7, 2023
9b3de77
update version
yurybura Jul 7, 2023
72d6bc7
Merge branch 'microsoft:master' into rocksdb-features
yurybura Jul 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ports/rocksdb/0004-fix-dependency-in-config.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
diff --git a/cmake/RocksDBConfig.cmake.in b/cmake/RocksDBConfig.cmake.in
index 0bd14be11..f9f6aa878 100644
index 0bd14be11..ad07f018a 100644
--- a/cmake/RocksDBConfig.cmake.in
+++ b/cmake/RocksDBConfig.cmake.in
@@ -37,7 +37,7 @@ if(@WITH_LZ4@)
@@ -33,11 +33,11 @@ if(@WITH_BZ2@)
endif()

if(@WITH_LZ4@)
- find_dependency(lz4)
+ find_dependency(lz4 CONFIG)
yurybura marked this conversation as resolved.
Show resolved Hide resolved
endif()

if(@WITH_ZSTD@)
Expand Down
37 changes: 16 additions & 21 deletions ports/rocksdb/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/rocksdb
REF "v${VERSION}"
SHA512 2f6fb50c5bb506665950520347104f666fcc29c7df5d806ccdf8c682f10043a0ea3c57b889871812951c5a5101ea8cf318b42b16383e5e6223e8c70e8a55e127
SHA512 6640deb2aeef493a36125a081c0a1f5fa0e15636ad824088d26c03bacee95af742d833bb7e601952aa0d278563025934049a8195ab14c1cd18e29636fe5f64d7
HEAD_REF main
PATCHES
0002-only-build-one-flavor.patch
Expand All @@ -18,14 +16,14 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ROCKSDB_BUILD_SHARED)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"lz4" WITH_LZ4
"snappy" WITH_SNAPPY
"zlib" WITH_ZLIB
"zstd" WITH_ZSTD
"bzip2" WITH_BZ2
"tbb" WITH_TBB
INVERTED_FEATURES
"tbb" CMAKE_DISABLE_FIND_PACKAGE_TBB
"liburing" WITH_LIBURING
"snappy" WITH_SNAPPY
"lz4" WITH_LZ4
"zlib" WITH_ZLIB
"zstd" WITH_ZSTD
"bzip2" WITH_BZ2
"numa" WITH_NUMA
"tbb" WITH_TBB
)

vcpkg_cmake_configure(
Expand All @@ -35,22 +33,19 @@ vcpkg_cmake_configure(
-DWITH_TESTS=OFF
-DWITH_BENCHMARK_TOOLS=OFF
-DWITH_TOOLS=OFF
-DUSE_RTTI=1
-DUSE_RTTI=ON
-DROCKSDB_INSTALL_ON_WINDOWS=ON
-DFAIL_ON_WARNINGS=OFF
-DWITH_MD_LIBRARY=${WITH_MD_LIBRARY}
-DPORTABLE=ON
-DCMAKE_DEBUG_POSTFIX=d
-DPORTABLE=1 # Minimum CPU arch to support, or 0 = current CPU, 1 = baseline CPU
-DROCKSDB_BUILD_SHARED=${ROCKSDB_BUILD_SHARED}
-DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE
yurybura marked this conversation as resolved.
Show resolved Hide resolved
${FEATURE_OPTIONS}
MAYBE_UNUSED_VARIABLES
CMAKE_DISABLE_FIND_PACKAGE_NUMA
CMAKE_DISABLE_FIND_PACKAGE_gtest
CMAKE_DISABLE_FIND_PACKAGE_TBB
CMAKE_DEBUG_POSTFIX
OPTIONS_DEBUG
-DCMAKE_DEBUG_POSTFIX=d
-DWITH_RUNTIME_DEBUG=ON
OPTIONS_RELEASE
-DWITH_RUNTIME_DEBUG=OFF
)

vcpkg_cmake_install()
Expand Down
29 changes: 22 additions & 7 deletions ports/rocksdb/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "rocksdb",
"version": "8.0.0",
"version": "8.3.2",
"description": "A library that provides an embeddable, persistent key-value store for fast storage",
"homepage": "https://github.com/facebook/rocksdb",
"license": "GPL-2.0-only OR Apache-2.0",
"supports": "!uwp & !(arm & !arm64 & android)",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand All @@ -15,41 +16,55 @@
}
],
"default-features": [
"liburing",
"zlib"
],
"features": {
"bzip2": {
"description": "bzip2 support in rocksdb",
"description": "build with bzip2",
"dependencies": [
"bzip2"
]
},
"liburing": {
"description": "build with liburing",
"dependencies": [
{
"name": "liburing",
"platform": "linux"
}
]
},
yurybura marked this conversation as resolved.
Show resolved Hide resolved
"lz4": {
"description": "lz4 support in rocksdb",
"description": "build with lz4",
"dependencies": [
"lz4"
]
},
"numa": {
"description": "build with NUMA policy support",
"supports": "linux"
},
"snappy": {
"description": "snappy support in rocksdb",
"description": "build with SNAPPY",
"dependencies": [
"snappy"
]
},
"tbb": {
"description": "tbb support in rocksdb",
"description": "build with Threading Building Blocks (TBB)",
"dependencies": [
"tbb"
]
},
"zlib": {
"description": "zlib support in rocksdb",
"description": "build with zlib",
"dependencies": [
"zlib"
]
},
"zstd": {
"description": "zstd support in rocksdb",
"description": "build with zstd",
"dependencies": [
"zstd"
]
Expand Down
3 changes: 0 additions & 3 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1311,9 +1311,6 @@ rest-rpc:x64-linux=skip
rest-rpc:x64-osx=skip
rest-rpc:arm64-osx=skip
rhash:arm64-windows=fail
rocksdb:arm-neon-android=fail
rocksdb:arm-uwp=fail
rocksdb:x64-uwp=fail
rpclib:arm64-windows=fail
rpclib:arm-uwp=fail
rpclib:x64-uwp=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -7205,7 +7205,7 @@
"port-version": 0
},
"rocksdb": {
"baseline": "8.0.0",
"baseline": "8.3.2",
"port-version": 0
},
"rpclib": {
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/rocksdb.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3d5c9033fedfbf0a9e993125f5511616b894f493",
"version": "8.3.2",
"port-version": 0
},
{
"git-tree": "284f182a8687ee7818ab84d5e7ada9bd5612cfcb",
"version": "8.0.0",
Expand Down