Verified Commit dffdaab0 authored by sunpoet's avatar sunpoet
Browse files

databases/rocksdb: Fix build on i386 

utilities/transactions/pessimistic_transaction.cc:691:25: error: implicit conversion from 'type' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int') changes value from 18446744073709551615 to 4294967295 [-Werror,-Wconstant-conversion]
                      : std::numeric_limits<uint64_t>::max();
                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
utilities/transactions/pessimistic_transaction.cc:766:23: error: implicit conversion from 'type' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int') changes value from 18446744073709551615 to 4294967295 [-Werror,-Wconstant-conversion]
                    : std::numeric_limits<uint64_t>::max();
                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.
parent 6c8595c8

databases/rocksdb/files/patch-utilities-transactions-pessimistic_transaction.cc

0 → 100644
+20 −0
Original line number Diff line number Diff line 
--- utilities/transactions/pessimistic_transaction.cc.orig	2023-09-01 20:58:39 UTC

+++ utilities/transactions/pessimistic_transaction.cc

@@ -688,7 +688,7 @@ Status WriteCommittedTxn::CommitWithoutPrepareInternal

           const Comparator* ucmp =

               WriteBatchWithIndexInternal::GetUserComparator(*wbwi, cf);

           return ucmp ? ucmp->timestamp_size()

-                      : std::numeric_limits<uint64_t>::max();

+                      : std::numeric_limits<size_t>::max();

         });

     if (!s.ok()) {

       return s;

@@ -763,7 +763,7 @@ Status WriteCommittedTxn::CommitInternal() {

         const Comparator* ucmp =

             WriteBatchWithIndexInternal::GetUserComparator(*wbwi, cf);

         return ucmp ? ucmp->timestamp_size()

-                    : std::numeric_limits<uint64_t>::max();

+                    : std::numeric_limits<size_t>::max();

       });

     }

   }