forked from pool/rocksdb
Accepting request 1169752 from server:database
OBS-URL: https://build.opensuse.org/request/show/1169752 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rocksdb?expand=0&rev=16
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
793d3b20b6
@ -1,69 +0,0 @@
|
||||
From e09b9d0cb94fec262b2a5dc30111fd767c0664e9 Mon Sep 17 00:00:00 2001
|
||||
From: raffertyyu <raffertyyu@tencent.com>
|
||||
Date: Thu, 22 Feb 2024 14:39:05 -0800
|
||||
Subject: [PATCH] Fix zstd typo in cmake (#12309)
|
||||
|
||||
Summary:
|
||||
https://github.com/facebook/rocksdb/issues/12247 imported another typo in cmakelists.txt and findzstd.cmake.
|
||||
cmake report ZSTD_INCLUDE_DIRS not found.
|
||||
Actually it should be
|
||||
https://github.com/facebook/rocksdb/blob/aacf60dda2a138f9d3826c25818a3bcf250859fd/cmake/modules/Findzstd.cmake#L8
|
||||
|
||||
Pull Request resolved: https://github.com/facebook/rocksdb/pull/12309
|
||||
|
||||
Reviewed By: hx235
|
||||
|
||||
Differential Revision: D54070348
|
||||
|
||||
Pulled By: ajkr
|
||||
|
||||
fbshipit-source-id: eaf6e260ea3669b8ea38e4c74a375bb885761b51
|
||||
---
|
||||
cmake/modules/Findzstd.cmake | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/cmake/modules/Findzstd.cmake b/cmake/modules/Findzstd.cmake
|
||||
index c1916c435e1..e82fa148c8c 100644
|
||||
--- a/cmake/modules/Findzstd.cmake
|
||||
+++ b/cmake/modules/Findzstd.cmake
|
||||
@@ -1,29 +1,29 @@
|
||||
# - Find zstd
|
||||
# Find the zstd compression library and includes
|
||||
#
|
||||
-# zstd_INCLUDE_DIRS - where to find zstd.h, etc.
|
||||
-# zstd_LIBRARIES - List of libraries when using zstd.
|
||||
-# zstd_FOUND - True if zstd found.
|
||||
+# ZSTD_INCLUDE_DIRS - where to find zstd.h, etc.
|
||||
+# ZSTD_LIBRARIES - List of libraries when using zstd.
|
||||
+# ZSTD_FOUND - True if zstd found.
|
||||
|
||||
-find_path(zstd_INCLUDE_DIRS
|
||||
+find_path(ZSTD_INCLUDE_DIRS
|
||||
NAMES zstd.h
|
||||
HINTS ${zstd_ROOT_DIR}/include)
|
||||
|
||||
-find_library(zstd_LIBRARIES
|
||||
+find_library(ZSTD_LIBRARIES
|
||||
NAMES zstd
|
||||
HINTS ${zstd_ROOT_DIR}/lib)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
-find_package_handle_standard_args(zstd DEFAULT_MSG zstd_LIBRARIES ZSTD_INCLUDE_DIRS)
|
||||
+find_package_handle_standard_args(zstd DEFAULT_MSG ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS)
|
||||
|
||||
mark_as_advanced(
|
||||
- zstd_LIBRARIES
|
||||
- zstd_INCLUDE_DIRS)
|
||||
+ ZSTD_LIBRARIES
|
||||
+ ZSTD_INCLUDE_DIRS)
|
||||
|
||||
-if(zstd_FOUND AND NOT (TARGET zstd::zstd))
|
||||
+if(ZSTD_FOUND AND NOT (TARGET zstd::zstd))
|
||||
add_library (zstd::zstd UNKNOWN IMPORTED)
|
||||
set_target_properties(zstd::zstd
|
||||
PROPERTIES
|
||||
- IMPORTED_LOCATION ${zstd_LIBRARIES}
|
||||
- INTERFACE_INCLUDE_DIRECTORIES ${zstd_INCLUDE_DIRS})
|
||||
+ IMPORTED_LOCATION ${ZSTD_LIBRARIES}
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIRS})
|
||||
endif()
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:766e976adc52a866b5b274ed0fef28ca890ad983081c0c56b460f53dc105e41d
|
||||
size 13374826
|
||||
3
rocksdb-9.1.1.tar.gz
Normal file
3
rocksdb-9.1.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:54ca90dd782a988cd3ebc3e0e9ba9b4efd563d7eb78c5e690c2403f1b7d4a87a
|
||||
size 13457204
|
||||
@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 22 20:56:46 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- update to 9.1.1:
|
||||
* Adde an option GetMergeOperandsOptions::continue_cb to give
|
||||
users the ability to end GetMergeOperands()'s lookup process
|
||||
before all merge operands were found.
|
||||
* Add sanity checks for ingesting external files that currently
|
||||
checks if the user key comparator used to create the file is
|
||||
compatible with the column family's user key comparator.
|
||||
* Support ingesting external files for column family that has
|
||||
user-defined timestamps in memtable only enabled
|
||||
* On file systems that support storage level data checksum and
|
||||
reconstruction, retry SST block reads for point lookups, scans,
|
||||
and flush and compaction if there's a checksum mismatch on the
|
||||
initial read.
|
||||
* Some enhancements and fixes to experimental Temperature handling
|
||||
features, including new default_write_temperature CF option and
|
||||
opening an SstFileWriter with a temperature.
|
||||
* WriteBatchWithIndex now supports wide-column point lookups via
|
||||
the GetEntityFromBatch API.
|
||||
* Implement experimental features:
|
||||
API Iterator::GetProperty("rocksdb.iterator.write-time") to
|
||||
allow users to get data's approximate write unix time and write
|
||||
data with a specific write time via WriteBatch::TimedPut API.
|
||||
- drop rocksdb-9.0.0-Fix-zstd-typo-in-cmake.patch, upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 18 06:08:39 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
%define lib_name librocksdb9
|
||||
%bcond_with jemalloc
|
||||
Name: rocksdb
|
||||
Version: 9.0.1
|
||||
Version: 9.1.1
|
||||
Release: 0
|
||||
Summary: Library for embeddable, persistent and fast key-value store
|
||||
License: (Apache-2.0 OR GPL-2.0-only) AND BSD-2-Clause
|
||||
@ -29,7 +29,6 @@ Source: https://github.com/facebook/rocksdb/archive/v%{version}.tar.gz#/
|
||||
Patch0: rocksdb-8.0.0-reproducible.patch
|
||||
Patch1: rocksdb-8.0.0-shared-liburing.patch
|
||||
Patch2: rocksdb-8.0.0-rpath.patch
|
||||
Patch3: rocksdb-9.0.0-Fix-zstd-typo-in-cmake.patch
|
||||
BuildRequires: c++_compiler
|
||||
BuildRequires: cmake
|
||||
BuildRequires: pkgconfig
|
||||
|
||||
Loading…
Reference in New Issue
Block a user