ci updates

use std::out_ptr if available

allow put std::string_view into database

Author: BestITUserEUW

.github/workflows/linux.yaml

@@ -16,10 +16,12 @@ jobs:
             cxx: 20 
           - compiler: llvm
             compiler-version: 18
-            cxx: 20  
+            cxx: 20
+          - compiler: llvm
+            compiler-version: 19
+            cxx: 23
           - compiler: gcc
             compiler-version: 11
-            additional-dep: "g++-11"
             cxx: 20  
           - compiler: gcc
             compiler-version: 12
@@ -29,9 +31,9 @@ jobs:
             cxx: 20  
           - compiler: gcc
             compiler-version: 14
-            cxx: 20  
+            cxx: 23  
     name: "${{ github.job }} (C++${{ matrix.cxx }}-${{ matrix.compiler }}-${{ matrix.compiler-version }})"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-25.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -52,7 +54,12 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt update
-          sudo apt install -y ninja-build ${{ matrix.additional-dep }}
+          sudo apt install -y ninja-build ${{ matrix.deps }}
+          if [[ "${{ matrix.compiler }}" == "llvm" ]]; then
+            sudo apt install "clang++-${{ matrix.compiler }}"
+          elif [[ "${{ matrix.compiler }}" == "gcc" ]]; then
+            sudo apt install "g++-${{ matrix.compiler }}"
+          fi
       - name: Compile
         run: |
           if [[ "${{ matrix.compiler }}" == "llvm" ]]; then

include/oryx/key_value_database.hpp

@@ -14,6 +14,12 @@
 namespace oryx {
 namespace detail {
 
+template <typename T, typename... Us>
+struct is_same_r : std::bool_constant<(std::is_same_v<T, Us> || ...)> {};
+
+template <typename T, typename... Us>
+inline constexpr bool is_same_r_v = is_same_r<T, Us...>::value;
+
 template <typename T>
 constexpr auto FromChars(std::string_view s) -> std::optional<T> {
     T val;
@@ -33,18 +39,18 @@ constexpr auto FromChars<bool>(std::string_view s) -> std::optional<bool> {
 }
 
 template <typename T>
-auto Read(const std::string& val) -> std::optional<T> {
+constexpr auto Read(const std::string& val) -> std::optional<T> {
     using _T = std::remove_cvref_t<T>;
 
-    if constexpr (std::is_same<_T, std::string>()) {
+    if constexpr (std::is_same_v<_T, std::string>)
         return val;
-    } else if constexpr (std::is_same<_T, bool>()) {
+    else if constexpr (std::is_same_v<_T, bool>)
         return FromChars<bool>(val);
-    } else if constexpr (std::is_floating_point<_T>()) {
+    else if constexpr (std::is_floating_point_v<_T>)
         return FromChars<T>(val);
-    } else if constexpr (std::is_integral<_T>()) {
+    else if constexpr (std::is_integral_v<_T>)
         return FromChars<T>(val);
-    } else {
+    else {
         if (auto result = rfl::json::read<T>(val); result) {
             return result.value();
         } else {
@@ -54,20 +60,19 @@ auto Read(const std::string& val) -> std::optional<T> {
 }
 
 template <typename T>
-auto Write(const T& obj) -> std::string {
+constexpr auto Write(const T& obj) {
     using _T = std::remove_cvref_t<T>;
 
-    if constexpr (std::is_same<_T, std::string>()) {
+    if constexpr (is_same_r_v<_T, std::string, std::string_view>)
         return obj;
-    } else if constexpr (std::is_same<_T, bool>()) {
+    else if constexpr (std::is_same_v<_T, bool>)
         return std::to_string(static_cast<uint8_t>(obj));
-    } else if constexpr (std::is_floating_point<_T>()) {
+    else if constexpr (std::is_floating_point_v<_T>)
         return std::to_string(obj);
-    } else if constexpr (std::is_integral<_T>()) {
+    else if constexpr (std::is_integral_v<_T>)
         return std::to_string(obj);
-    } else {
+    else
         return rfl::json::write(obj);
-    }
 }
 
 }  // namespace detail
@@ -79,11 +84,15 @@ class KeyValueDatabase {
     auto Open(const std::string& name, const leveldb::Options& opts = DefaultOptions()) -> leveldb::Status {
         Close();
 
+#ifdef __cpp_lib_out_ptr
+        const auto status = leveldb::DB::Open(opts, name, std::out_ptr(handle_));
+#else
         leveldb::DB* db;
         const auto status = leveldb::DB::Open(opts, name, &db);
         if (status.ok()) {
             handle_ = std::unique_ptr<leveldb::DB>(db);
         }
+#endif
         return status;
     }
 

tests/read_write.cpp

@@ -62,6 +62,7 @@ TEST_CASE("Reading supported types") {
 
 TEST_CASE("Writing supported types") {
     CHECK_EQ(detail::Write<std::string>("hello world1232!*2`-."), "hello world1232!*2`-.");
+    CHECK_EQ(detail::Write<std::string_view>("hello world1232!*2`-."), "hello world1232!*2`-.");
     CHECK_EQ(detail::Write<bool>(false), "0");
     CHECK_EQ(detail::Write<bool>(true), "1");
     CHECK_EQ(detail::Write<double>(1.256), "1.256000");  // std::to_string appends 0 at the end for some reason