Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oaZhQ-0000yn-0b for pgsql-hackers@arkaria.postgresql.org; Tue, 20 Sep 2022 09:37:52 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1oaZhO-0004Fy-HV for pgsql-hackers@arkaria.postgresql.org; Tue, 20 Sep 2022 09:37:50 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oaZhO-0004Fp-6R for pgsql-hackers@lists.postgresql.org; Tue, 20 Sep 2022 09:37:50 +0000 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1oaZhL-0007Qw-S2 for pgsql-hackers@lists.postgresql.org; Tue, 20 Sep 2022 09:37:49 +0000 Received: by mail-pj1-x1041.google.com with SMTP id fv3so2478504pjb.0 for ; Tue, 20 Sep 2022 02:37:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:subject:references:in-reply-to:message-id:cc:to:from :date:from:to:cc:subject:date; bh=jJMwjAAcKqVzxrxZdyu8QNouWTG7jwv08ei3VHmayOA=; b=HrQnB9qFwtV8GpoTufzrTwRXLHO2E7zbnXTSwwD+UrQXT52E6qh4kY4JdPW7wBxw6V KVZ2Rwx+OxTf+QNPelgY6Z92l26J+HwZihHJSn7pyoxo+NnjabDhp5OHjuUjApgkPEKr uWMkM5DwiLBVSExVzVZiVzauey5vLnK2j/3N5QP9ZL6qg/7OKcUIrGlSSn6ryxyITQv6 8t4W9E3jHz9s0/61xCMB9CREoNCpL086oGOhX6LhvRavLHcbFhAWzSGr0wIcJB3byB4w X4PNBRe0hWnZa2TrPD/ltxU+9slcNuQGxO+xEVYH3wOCXLWSsOWQEQtKSXyYuxCSCpij 9rEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:subject:references:in-reply-to:message-id:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date; bh=jJMwjAAcKqVzxrxZdyu8QNouWTG7jwv08ei3VHmayOA=; b=T04skkgYEI2aSzJYAat0W5h7otyXWfRtwYYNlob60m5TErA5+Gs0XXhyAyNMY2QLIT NHxyuG8AJR8L97ci/eocM8v2ajHELXqM/VRzO0a9yvs8R32BKgOl08p90vhhKaShr5S0 o6W3xhMMstJJNAE4gGpMJyZSqVDqwPzmjSJINr0v359SC379HtRfJBAzUneErMKn5Lj0 66Q7t18x5nH5/BlZudQu7oJk/XYm+CdqkSXhzG298O1n3RU5YDaQ2B1Pig+HvYlF+SdE R0cMK9+bBsNizDDWdtAP4Kot41ioYoUFUBd2Y5YIgTtgz8abOOf74wES0u3uiAsKY9Ob cJjg== X-Gm-Message-State: ACrzQf0u6rDJr+Z/ILRTikhx6+vOks9FoH/AnwF12pjxzf88lUhBh0AJ ws2qZU0oJZHknASfrft8zkA= X-Google-Smtp-Source: AMsMyM5nPm+L93tAz0R2cuYsP0ylEg+aMADJY/jGweJ0KASh6KWz1tf9jqEqJvtEurYGcGEXbL3C2g== X-Received: by 2002:a17:903:1248:b0:172:f3c7:97a6 with SMTP id u8-20020a170903124800b00172f3c797a6mr3969280plh.128.1663666665729; Tue, 20 Sep 2022 02:37:45 -0700 (PDT) Received: from [198.18.20.106] ([103.125.234.153]) by smtp.gmail.com with ESMTPSA id w16-20020a170902e89000b001725d542190sm961713plg.181.2022.09.20.02.37.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2022 02:37:45 -0700 (PDT) Date: Tue, 20 Sep 2022 17:37:32 +0800 From: Zhang Mingli To: Justin Pryzby Cc: Dilip Kumar , Maxim Orlov , Pavel Borisov , Aleksander Alekseev , pgsql-hackers@lists.postgresql.org, Stephen Frost , Alexander Korotkov , Andres Freund , Ilya Anfimov Message-ID: In-Reply-To: <20220920092643.GB31833@telsasoft.com> References: <20220715121658.GI18011@telsasoft.com> <20220920092643.GB31833@telsasoft.com> Subject: Re: Add 64-bit XIDs into PostgreSQL 15 X-Readdle-Message-ID: a6e43cab-375f-4a32-abcf-398ae7a9720c@Spark MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="632989e2_46111ba5_1b7" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --632989e2_46111ba5_1b7 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, On Sep 20, 2022, 17:26 +0800, Justin Pryzby , wrote: > On Tue, Sep 20, 2022 at 03:37:47PM +0800, Zhang Mingli wrote: > > I want to have a look at these patches, but apply on master failed: > > Yeah, it's likely to break every week or more often. > > You have a few options: > > 0) resolve the conflict yourself; > > 1) apply the patch to the commit that the authors sent it against, or > some commit before the conflicting file(s) were changed in master. Like > maybe "git checkout -b 64bitxids f66d997fd". > > 2) Use the last patch that cfbot successfully created. You can read the > patch on github's web interface, or add cfbot's user as a remote to use > the patch locally for review and/or compilation. Something like "git > remote add cfbot https://github.com/postgresql-cfbot/postgresql; git > fetch cfbot commitfest/39/3594; git checkout -b 64bitxids > cfbot/commitfest/39/3594". (Unfortunately, cfbot currently squishes the > patch series into a single commit and loses the commit message). > > You could also check the git link in the commitfest, to see if the > author has already rebased it, but haven't yet mailed the rebased patch > to the list. In this case, that's not true, but you could probably use > the author's branch on github, too. > https://commitfest.postgresql.org/39/3594/ > > -- > Justin Got it, thanks. Regards, Zhang Mingli --632989e2_46111ba5_1b7 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline
Hi,
On Sep 20, 2022, 17:26 +0800, Justin Pryzby <pry= zby=40telsasoft.com>, wrote:
On Tue, Sep 20, 2022 at 03:37:47PM +0800, Zhang Mingli wrote:
I want to have a look at these patches, but apply on master failed:
Yeah, it's likely to break every week or more often.

You have a few options:

0) resolve the conflict yourself;

1) apply the patch to the commit that the authors sent it against, or
some commit before the conflicting file(s) were changed in master. Like maybe =22git checkout -b 64bitxids f66d997fd=22.

2) Use the last patch that cfbot successfully created. You can read the patch on github's web interface, or add cfbot's user as a remote to use the patch locally for review and/or compilation. Something like =22git remote add cfbot https://github.com/postgresql-cfbot/postgresql; git
fetch cfbot commitfest/39/3594; git checkout -b 64bitxids
cfbot/commitfest/39/3594=22. (Unfortunately, cfbot currently squishes the=
patch series into a single commit and loses the commit message).

You could also check the git link in the commitfest, to see if the
author has already rebased it, but haven't yet mailed the rebased patch to the list. In this case, that's not true, but you could probably use the author's branch on github, too.
https://commitfest.postgresql.org/39/3594/

--
Justin
Got it, thanks.


Regards,
Zhang Mingli
--632989e2_46111ba5_1b7--