@@ -22,35 +22,9 @@ TOPDIR/tmp/work/core2-64-oe-linux/rocksdb/9.10.0/git/db/blob/blob_file_meta.h:28
Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/13437]
Signed-off-by: mark.yang <mark.yang@lge.com>
---
- db/blob/blob_file_meta.h | 1 +
- include/rocksdb/trace_record.h | 1 +
include/rocksdb/write_batch_base.h | 1 +
- 3 files changed, 3 insertions(+)
+ 1 file changed, 1 insertion(+)
-diff --git a/db/blob/blob_file_meta.h b/db/blob/blob_file_meta.h
-index d7c8a1243..2e47726f8 100644
---- a/db/blob/blob_file_meta.h
-+++ b/db/blob/blob_file_meta.h
-@@ -6,6 +6,7 @@
- #pragma once
-
- #include <cassert>
-+#include <cstdint>
- #include <iosfwd>
- #include <memory>
- #include <string>
-diff --git a/include/rocksdb/trace_record.h b/include/rocksdb/trace_record.h
-index 8f9c3ee2f..d321f5387 100644
---- a/include/rocksdb/trace_record.h
-+++ b/include/rocksdb/trace_record.h
-@@ -5,6 +5,7 @@
-
- #pragma once
-
-+#include <cstdint>
- #include <memory>
- #include <string>
- #include <vector>
diff --git a/include/rocksdb/write_batch_base.h b/include/rocksdb/write_batch_base.h
index 3334a1292..43b186029 100644
--- a/include/rocksdb/write_batch_base.h
@@ -14,9 +14,9 @@ diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_t
index 0a7488c397..ad7d9f2124 100644
--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-@@ -162,6 +162,12 @@ static inline tokutime_t toku_time_now(void) {
+@@ -158,6 +158,12 @@ static inline tokutime_t toku_time_now(void) {
unsigned long result;
- asm volatile ("rdtime.d\t%0,$r0" : "=r" (result));
+ asm volatile("rdtime.d\t%0,$r0" : "=r"(result));
return result;
+#elif defined(__mips__)
+ // mips apparently only allows rdtsc for superusers, so we fall
@@ -26,7 +26,7 @@ index 93b884dd9c1..2ca925d505c 100644
+option(ROCKSDB_BUILD_STATIC "Build static versions of the RocksDB libraries" ON)
if( NOT DEFINED CMAKE_CXX_STANDARD )
- set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD 20)
@@ -1139,11 +1140,13 @@ string(REGEX REPLACE "[^0-9: /-]+" "" GIT_DATE "${GIT_DATE}")
set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc)
configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY)
similarity index 95%
rename from meta-oe/recipes-dbs/rocksdb/rocksdb_9.10.0.bb
rename to meta-oe/recipes-dbs/rocksdb/rocksdb_10.10.1.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
-SRCREV = "ae8fb3e5000e46d8d4c9dbf3a36019c0aaceebff"
-SRCBRANCH = "9.10.fb"
+SRCREV = "4595a5e95ae8525c42e172a054435782b3479c57"
+SRCBRANCH = "10.10.fb"
-SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \
+SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https;tag=v${PV} \
file://0001-cmake-Add-check-for-atomic-support.patch \
file://0002-cmake-Use-exported-target-for-bz2.patch \
file://0003-cmake-Do-not-add-msse4.2-mpclmul-on-clang.patch \
@@ -39,7 +39,7 @@ PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON,-DWITH_BZ2=OFF,bzip2"
PACKAGECONFIG[lz4] = "-DWITH_LZ4=ON,-DWITH_LZ4=OFF,lz4"
PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib"
PACKAGECONFIG[zstd] = "-DWITH_ZSTD=ON,-DWITH_ZSTD=OFF,zstd"
-PACKAGECONFIG[lite] = "-DROCKSDB_LITE=ON,-DROCKSDB_LITE=OFF"
+PACKAGECONFIG[liburing] = "-DWITH_LIBURING=ON,-DWITH_LIBURING=OFF,liburing"
PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags"
# Tools and tests currently don't compile on armv5 so we disable them
Remove not exist PACKAGECONFIG option `lite` Add new PACKAGECONFIG option liburing Changelog: v10.10.1 https://github.com/facebook/rocksdb/releases/tag/v10.10.1 Bugs: - Fixed a bug in best-efforts recovery that causes use-after-free crashes when accessing SST files that were cached during the recovery. - Fix resumable compaction incorrectly allowing resumption from a truncated range deletion that is not well handled currently. - Fixed a bug in PosixRandomFileAccess IO uring submission queue ownership & management. Fix eliminates the false positive 'Bad cqe data' IO errors in PosixRandomFileAccess::MultiRead when interleaved with PosixRandomFileAccess::ReadAsync on the same thread. - Fix Windows VS 2022 build errors. v10.9.1: https://github.com/facebook/rocksdb/releases/tag/v10.9.1 v10.8.3: https://github.com/facebook/rocksdb/releases/tag/v10.8.3 v10.7.5: https://github.com/facebook/rocksdb/releases/tag/v10.7.5 v10.6.2: https://github.com/facebook/rocksdb/releases/tag/v10.6.2 v10.5.1: https://github.com/facebook/rocksdb/releases/tag/v10.5.1 v10.4.2: https://github.com/facebook/rocksdb/releases/tag/v10.4.2 v10.2.1: https://github.com/facebook/rocksdb/releases/tag/v10.2.1 v10.1.3: https://github.com/facebook/rocksdb/releases/tag/v10.1.3 v10.0.1: https://github.com/facebook/rocksdb/releases/tag/v10.0.1 Signed-off-by: Andrej Kozemcak <andrej.kozemcak@siemens.com> --- ...with-gcc-13-by-adding-cstdint-header.patch | 28 +------------------ ...mer-implementation-for-mips-platform.patch | 4 +-- .../files/static_library_as_option.patch | 2 +- .../{rocksdb_9.10.0.bb => rocksdb_10.10.1.bb} | 8 +++--- 4 files changed, 8 insertions(+), 34 deletions(-) rename meta-oe/recipes-dbs/rocksdb/{rocksdb_9.10.0.bb => rocksdb_10.10.1.bb} (95%)