diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-10-21 10:01:42 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2023-10-30 07:14:02 -0400 |
commit | 5026936d69f27e88e294d89ee4bd6ec7bd1a890f (patch) | |
tree | 4dd385e9d4d3c9a8e2a5e392bfb5217006fe83b6 | |
parent | 840df5af41967d558e3d50d06490797c5fee6176 (diff) | |
download | meta-openembedded-5026936d69f27e88e294d89ee4bd6ec7bd1a890f.tar.gz |
leveldb: Print uint64_t with PRI64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1319827ed9f4af10380fc7e53a2f0e5a0844d5e1)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-dbs/leveldb/leveldb/0001-Fix-printing-64-bit-integer-types.patch | 43 | ||||
-rw-r--r-- | meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb | 1 |
2 files changed, 44 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/leveldb/leveldb/0001-Fix-printing-64-bit-integer-types.patch b/meta-oe/recipes-dbs/leveldb/leveldb/0001-Fix-printing-64-bit-integer-types.patch new file mode 100644 index 0000000000..b9f45e773d --- /dev/null +++ b/meta-oe/recipes-dbs/leveldb/leveldb/0001-Fix-printing-64-bit-integer-types.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 1ccdb7513a7a0f24b8ce3b6766e52e690874bc64 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 17 Oct 2023 19:08:12 -0700 | ||
4 | Subject: [PATCH] Fix printing 64-bit integer types | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | db/db_impl.cc | 5 +++-- | ||
10 | db/version_edit.h | 1 + | ||
11 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
12 | |||
13 | --- a/db/db_impl.cc | ||
14 | +++ b/db/db_impl.cc | ||
15 | @@ -5,6 +5,7 @@ | ||
16 | #include "db/db_impl.h" | ||
17 | |||
18 | #include <algorithm> | ||
19 | +#include <cinttypes> | ||
20 | #include <atomic> | ||
21 | #include <cstdint> | ||
22 | #include <cstdio> | ||
23 | @@ -520,8 +521,8 @@ Status DBImpl::WriteLevel0Table(MemTable | ||
24 | mutex_.Lock(); | ||
25 | } | ||
26 | |||
27 | - Log(options_.info_log, "Level-0 table #%llu: %lld bytes %s", | ||
28 | - (unsigned long long)meta.number, (unsigned long long)meta.file_size, | ||
29 | + Log(options_.info_log, "Level-0 table #%" PRIu64 " : %" PRIu64 " bytes %s", | ||
30 | + meta.number, meta.file_size, | ||
31 | s.ToString().c_str()); | ||
32 | delete iter; | ||
33 | pending_outputs_.erase(meta.number); | ||
34 | --- a/db/version_edit.h | ||
35 | +++ b/db/version_edit.h | ||
36 | @@ -5,6 +5,7 @@ | ||
37 | #ifndef STORAGE_LEVELDB_DB_VERSION_EDIT_H_ | ||
38 | #define STORAGE_LEVELDB_DB_VERSION_EDIT_H_ | ||
39 | |||
40 | +#include <cstdint> | ||
41 | #include <set> | ||
42 | #include <utility> | ||
43 | #include <vector> | ||
diff --git a/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb b/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb index ab0176ff9b..60b486df78 100644 --- a/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb +++ b/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb | |||
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" | |||
6 | 6 | ||
7 | SRC_URI = "gitsm://github.com/google/${BPN}.git;branch=main;protocol=https \ | 7 | SRC_URI = "gitsm://github.com/google/${BPN}.git;branch=main;protocol=https \ |
8 | file://0001-CMakeLists.txt-fix-googletest-related-options.patch \ | 8 | file://0001-CMakeLists.txt-fix-googletest-related-options.patch \ |
9 | file://0001-Fix-printing-64-bit-integer-types.patch \ | ||
9 | file://run-ptest \ | 10 | file://run-ptest \ |
10 | " | 11 | " |
11 | 12 | ||