From nobody Tue Sep 5 02:10:33 2023 X-Original-To: dev-commits-ports-main@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 4Rfpr95SDnz4sJRJ; Tue, 5 Sep 2023 02:10:33 +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 4Rfpr93rSkz3T1Y; Tue, 5 Sep 2023 02:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693879833; 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=SP0blGAjIVLXQCWy+5/poX6x6gu3B945Xl1lWGcy8fo=; b=SCSFwvX1doy9yGvIB3pytMnmaDkZseh01w6lIQXMgLTfe0YLGFYUf5/IMielNt50bituIq ib0pIr/eOqPc30JrkO2z1S4gTCJhAdSjDtRRrcjdc8cQrVGeA15wni0ZMSq9ACr0bXhiJB RiCXEAEschFMHIEP2T/DZEEA0gzeeWCHCRBGwafG/ZY4XJPzCjom9J9tinOEFh+rvvwSn5 L09ond8JbHUmwpXKdmZoFETKX+x0IqpwdYfPVMuSQErGaqs3ETo00Lcmu4wClYkNB+hb/0 hDF6AqaRbWGq3mjcjPWM91RgalfLpgJBKRY6+YLcxnFQlp/w8omWGtbnv2bUtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693879833; a=rsa-sha256; cv=none; b=k0s6u6dOowEZBJhmn+UGox9VL0KWjUW1SE7XQfFm1tW4+xjolClAHxvZNhpT+M+ThRO9XJ gM+gxJSMvPYk8B1iUBqHofKsTZw6gUxhZv/82ZabTv7FbvRZGnQqslskmw8x9nj666IyrY vMusMdwOk20T8Pgxiv7jf2uNhRMqqcAZhRHrs2N7ZV0t6Xy8bsKsaqkSj8kq1Zt6Lzgx1F 4U1zhjI5Ezj7yeaZ/cO93pLu0jBnf3Y+T7XxfnRvx9kCsY9CoDCHdcH25FAMfLwaZP+NEq 4HhQ5FEfBuGfyiwpbHIqWRA5FyiNIS/fVuiVefbIipyxcagxLbtbB06d4ruZLw== 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=1693879833; 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=SP0blGAjIVLXQCWy+5/poX6x6gu3B945Xl1lWGcy8fo=; b=MfbCQmzZybkeb9pSNE/oDWKvKxUYeHGTsWSECajuHMTCsHYApX7Us7O2NNmDzfslLJGmI5 6IHMb1upA1jLGVhBcHEzKArIgHDER5yXCMvk5wcj/l6jCquGtEvDRGTdkHJD6H7isTUnyd IH3LMzvr+tiLpoojjbjoXxCk4Hy+W/wZ7O+ppi89rG4FFDpHrYLE/rzbIspAMgAGXc4DrU PUjSsxbmC2LD7R4pP9/CKr6lgckoI53e6nk80kxGjx9ZTCqK6L3YOOHL2MkEgxGgnNXFaK OkKHa/FaZJGEblUUNUPt/kXK/zKd8Vw+/Y/Kh2EUB8EqZWVEQuhGkYeQyX19YQ== 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 4Rfpr92wcsz15s; Tue, 5 Sep 2023 02:10:33 +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 3852AXUF059568; Tue, 5 Sep 2023 02:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3852AX40059565; Tue, 5 Sep 2023 02:10:33 GMT (envelope-from git) Date: Tue, 5 Sep 2023 02:10:33 GMT Message-Id: <202309050210.3852AX40059565@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: dffdaab0c8a9 - main - databases/rocksdb: Fix build on i386 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: dffdaab0c8a9fadd083d0d6967231c97fb1ad053 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=dffdaab0c8a9fadd083d0d6967231c97fb1ad053 commit dffdaab0c8a9fadd083d0d6967231c97fb1ad053 Author: Po-Chuan Hsieh AuthorDate: 2023-09-05 02:10:12 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-05 02:10:12 +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. --- ...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(); + }); + } + }