Re: Skytools for 10 — RPM missing

2017-12-14 11:58 GMT+02:00 Christoph Berg <myon(at)debian(dot)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