From nobody Wed Sep 06 20:01:40 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgtYd0LMsz4sSbS; Wed, 6 Sep 2023 20:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgtYc72L8z4SPC; Wed, 6 Sep 2023 20:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694030501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KTHCK7+5RgvLybpwYc/reedDMWdBTvA42H4ni4MhQbo=; b=dojNZCfXpAXKtcEKlm6qPmdQ1wcv4VYthXI/e3VB/1OjkI5ttc7JFIsS3NrbuNOBiEEubO bLq+8ArZQf/2iW7fB5AixB62sopN/49iwMtRr4BTqwWpv67ThA/sTTVvtOCVb8pW+Ig4mS RrUtwnZS081ItZtSJVKev+Z4WLPl7Cb09+TnkSvrb1il8GTynLRrXHtaWfPmNstvHbzCHw FPzAAKSDi3k/dEBkUooX6LSS6ZRgGgE7fa+67pAxeqKcNjSXXuxgeVxAiI85eBBVk4WjuF xtWSnNsWmHqY9AS7/bJQ/ApHIl1QJTTQLh6POAQa5Eo3o5eq/j7Zt70d83So7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694030501; a=rsa-sha256; cv=none; b=nG+bpe3+/nf5RXmQmG5MplgYpZzDKiauG0vsk8LoiIfG3bmr3+pLyCptb+GMu38qYpJq8q nj0avahv/6AeDgmz999iHGcq9y+I85rBBvSuNSA0Zuw9cwqaYJYZJx4zzVOrXPgmUb5S29 8u+COQ9i3QnEwa5oftpIwWaKArU0eEOtyWsSSjYI/bc7uC/jCefZSokYzAIEmBN1JCcNfM gMagcIW+16++WzIog0wFmznz9xb5EDv5mk+08aTnT82qhA5Hj0UVs1p5F0yl9Gmy1zgfjH olfXZO2lAIy4+xU+zYkSmKhI3aKXxNRl4H51LKWHCzaGKL9Cz5XYezuofGE0lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694030501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KTHCK7+5RgvLybpwYc/reedDMWdBTvA42H4ni4MhQbo=; b=L4rdNLZNYQrnCgK/R4FzNKuW0qVOfeH9WxdQ0BgY3PsqIJaZkniIMFTpXm4Y+8/kQ8JzV1 cQGFo3rqciFIyg/ONCnXHr5ht311NJ2SqQYhrS1zV77BaJyGMpORR1h3yelcKohvM2whQ+ G1SbOZksJ+4g/mG+QfBdzLVIoi4JesbOdR+RsSfN3v36bpU2hswSFdTGlNf9udx7ueNWlG FH/7i+RwSvlN0uN+Sc6ggZuVTqjZlPKf43VG9JzL5A71YKV6t5H0ItdPFAm6zs8eUnL79O T3CWERXwcoXUNV6pqoD28SmeiNmZL2NGNYFfccrU1CQh+c03xx1jjAubGnm8lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RgtYc63RDzWB5; Wed, 6 Sep 2023 20:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386K1e78031165; Wed, 6 Sep 2023 20:01:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386K1elT031162; Wed, 6 Sep 2023 20:01:40 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:01:40 GMT Message-Id: <202309062001.386K1elT031162@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 7cf084043b4f - 2023Q3 - databases/rocksdb: Fix build on i386 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 7cf084043b4f86c9bff67a979b89000197df1993 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cf084043b4f86c9bff67a979b89000197df1993 commit 7cf084043b4f86c9bff67a979b89000197df1993 Author: Po-Chuan Hsieh AuthorDate: 2023-09-05 02:10:12 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-06 20:01:22 +0000 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::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::max(); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 errors generated. (cherry picked from commit dffdaab0c8a9fadd083d0d6967231c97fb1ad053) --- ...utilities-transactions-pessimistic_transaction.cc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/databases/rocksdb/files/patch-utilities-transactions-pessimistic_transaction.cc b/databases/rocksdb/files/patch-utilities-transactions-pessimistic_transaction.cc new file mode 100644 index 000000000000..1eb9de9bfafc --- /dev/null +++ b/databases/rocksdb/files/patch-utilities-transactions-pessimistic_transaction.cc @@ -0,0 +1,20 @@ +--- 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::max(); ++ : std::numeric_limits::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::max(); ++ : std::numeric_limits::max(); + }); + } + }