MIME-Version: 1.0
In-Reply-To: <20171214095802.GA16859@msg.df7cb.de>
References: 
 <CAGnEboiSJKXoRVFz3G+SqYoX1c2wG11C08n46sK_21Q5Koq+5w@mail.gmail.com>
 <1513199824.19931.133.camel@gunduz.org> <20171214095802.GA16859@msg.df7cb.de>
From: Victor Yegorov <vyegorov@gmail.com>
Date: Fri, 15 Dec 2017 15:17:30 +0200
Message-ID: 
 <CAGnEbogK2EsxgsUVbHic6+dw9RbnV6x=Lzvwqfen2p+XGbDEPA@mail.gmail.com>
Subject: =?UTF-8?Q?Re=3A_Skytools_for_10_=E2=80=94_RPM_missing?=
To: Christoph Berg <myon@debian.org>,
 =?UTF-8?B?RGV2cmltIEfDvG5kw7x6?= <devrim@gunduz.org>,
	Victor Yegorov <vyegorov@gmail.com>, pgsql-pkg-yum@postgresql.org
Content-Type: multipart/alternative; boundary="f403045c5b3ca47950056060d2fb"
Precedence: bulk

--f403045c5b3ca47950056060d2fb
Content-Type: text/plain; charset="UTF-8"

2017-12-14 11:58 GMT+02:00 Christoph Berg <myon@debian.org>:
>
> On the Debian side, we started moving to the split packages from
> https://github.com/pgq . Unfortunately, there's a whole bunch of them,
> and we have only packaged pgq and pgqd yet. The whole thing there
> looks like a big mess :(
>

Indeed.

I've looked into the build process, things are crashing on
`sql/txid/txid.c` for me:

    txid.c: In function 'txid_current_snapshot':
    txid.c:207:6: error: 'SerializableSnapshot' undeclared (first use in
this function)
      if (SerializableSnapshot == NULL)
          ^

Poking around git on `git log -S SerializableSnapshot` and `git log --
contrib/txid/txid.c` I can see,
that stuff from `skytools` to expose snapshots had been integrated into
core years ago (commit 18e3fcc).

Looking at the `sql/txid/Makefile`, they do nothing for that directory if
we're on 8.3+.
Versions checks stopped working on 10:

    -bash-4.2$ export PGVER=10.1
    -bash-4.2$ test $PGVER "<" "8.3" && echo "false" || echo "true"
    false
    -bash-4.2$ export PGVER=9.6.6
    -bash-4.2$ test $PGVER "<" "8.3" && echo "false" || echo "true"
    true

I assume that this subdirectory can be excluded from the `Makefile`, 8.3
EOL came years ago.
Doing so makes things compile fine for me.

Patch is as simple as:

diff --git a/rpm/redhat/master/skytools/master/skytools.spec
b/rpm/redhat/master/skytools/master/skytools.spec
index dbdb423..bda4715 100644
--- a/rpm/redhat/master/skytools/master/skytools.spec
+++ b/rpm/redhat/master/skytools/master/skytools.spec
@@ -58,6 +58,7 @@ rmdir lib
 %if %{pgmajorversion} != 92
 sed -ie '/^#include
<parser\/keywords.h>/s:parser/keywords.h:common/keywords.h:'
sql/pgq/triggers/stringutil.c
 %endif
+sed -ie '/^SUBDIRS/s:ticker txid$:ticker:' sql/Makefile
 ./autogen.sh
 %configure --with-pgconfig=%{pginstdir}/bin/pg_config --with-asciidoc


Devrim, do you think it's possible to add this change and add `skytools` to
10 repo?

-- 
Victor Yegorov

--f403045c5b3ca47950056060d2fb
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div class=3D"gmail_extra"><div class=3D"gmail_quote">2017=
-12-14 11:58 GMT+02:00 Christoph Berg <span dir=3D"ltr">&lt;<a href=3D"mail=
to:myon@debian.org" target=3D"_blank">myon@debian.org</a>&gt;</span>:<block=
quote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1=
px solid rgb(204,204,204);padding-left:1ex">On the Debian side, we started =
moving to the split packages from<br>
<a href=3D"https://github.com/pgq" rel=3D"noreferrer" target=3D"_blank">htt=
ps://github.com/pgq</a> . Unfortunately, there&#39;s a whole bunch of them,=
<br>
and we have only packaged pgq and pgqd yet. The whole thing there<br>
looks like a big mess :(<br></blockquote><div><br></div><div>Indeed.</div><=
div><br></div><div>I&#39;ve looked into the build process, things are crash=
ing on `sql/txid/txid.c` for me:</div><div><br></div><div>=C2=A0 =C2=A0 txi=
d.c: In function &#39;txid_current_snapshot&#39;:</div><div>=C2=A0 =C2=A0 t=
xid.c:207:6: error: &#39;SerializableSnapshot&#39; undeclared (first use in=
 this function)</div><div>=C2=A0 =C2=A0 =C2=A0 if (SerializableSnapshot =3D=
=3D NULL)</div><div>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ^=C2=A0</div><div><b=
r></div><div>Poking around git on `git log -S SerializableSnapshot` and `gi=
t log -- contrib/txid/txid.c` I can see,</div><div>that stuff from `skytool=
s` to expose snapshots had been integrated into core years ago (commit=C2=
=A018e3fcc).<br></div><div><br></div><div>Looking at the `sql/txid/Makefile=
`, they do nothing for that directory if we&#39;re on 8.3+.</div><div>Versi=
ons checks stopped working on 10:</div><div><div><br></div><div>=C2=A0 =C2=
=A0 -bash-4.2$ export PGVER=3D10.1</div><div>=C2=A0 =C2=A0 -bash-4.2$ test =
$PGVER &quot;&lt;&quot; &quot;8.3&quot; &amp;&amp; echo &quot;false&quot; |=
| echo &quot;true&quot;</div><div>=C2=A0 =C2=A0 false</div><div>=C2=A0 =C2=
=A0 -bash-4.2$ export PGVER=3D9.6.6</div><div>=C2=A0 =C2=A0 -bash-4.2$ test=
 $PGVER &quot;&lt;&quot; &quot;8.3&quot; &amp;&amp; echo &quot;false&quot; =
|| echo &quot;true&quot;</div><div>=C2=A0 =C2=A0 true</div></div><div><br><=
/div><div>I assume that this subdirectory can be excluded from the `Makefil=
e`, 8.3 EOL came years ago.</div><div>Doing so makes things compile fine fo=
r me.<br></div><div><br></div><div>Patch is as simple as:</div><div><br></d=
iv><div><div>diff --git a/rpm/redhat/master/skytools/master/skytools.spec b=
/rpm/redhat/master/skytools/master/skytools.spec</div><div>index dbdb423..b=
da4715 100644</div><div>--- a/rpm/redhat/master/skytools/master/skytools.sp=
ec</div><div>+++ b/rpm/redhat/master/skytools/master/skytools.spec</div><di=
v>@@ -58,6 +58,7 @@ rmdir lib</div><div>=C2=A0%if %{pgmajorversion} !=3D 92=
</div><div>=C2=A0sed -ie &#39;/^#include &lt;parser\/keywords.h&gt;/s:parse=
r/keywords.h:common/keywords.h:&#39; sql/pgq/triggers/stringutil.c</div><di=
v>=C2=A0%endif</div><div>+sed -ie &#39;/^SUBDIRS/s:ticker txid$:ticker:&#39=
; sql/Makefile</div><div>=C2=A0./autogen.sh</div><div>=C2=A0%configure --wi=
th-pgconfig=3D%{pginstdir}/bin/pg_config --with-asciidoc</div><div><br></di=
v></div><div><br></div><div>Devrim, do you think it&#39;s possible to add t=
his change and add `skytools` to 10 repo?</div></div><div><br></div>-- <br>=
<div class=3D"gmail-m_3457581094033513532gmail_signature"><div dir=3D"ltr">=
<div>Victor Yegorov</div></div></div>
</div></div>

--f403045c5b3ca47950056060d2fb--