• R/O
  • HTTP
  • SSH
  • HTTPS

pg_hint_plan: コミット

firtst release


コミットメタ情報

リビジョン6f4b79877bb4ce41a25b8cf6eb436c246105558f (tree)
日時2018-11-13 16:01:35
作者Kyotaro Horiguchi <horiguchi.kyotaro@lab....>
コミッターKyotaro Horiguchi

ログメッセージ

Change target version to PG11 and fix the SPEC file

Change targetr version to PG11. SPEC file was changed so that genearte
a subpackage llvmjit, which installs a bitcode file needed for JIT
compilation.

変更サマリ

  • modified: Makefile (diff)
  • delete: SPECS/{pg_hint_plan10.spec => pg_hint_plan11.spec}

差分

--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,8 @@ PG_CONFIG = pg_config
2222 PGXS := $(shell $(PG_CONFIG) --pgxs)
2323 include $(PGXS)
2424
25-STARBALL10 = pg_hint_plan10-$(HINTPLANVER).tar.gz
26-STARBALLS = $(STARBALL10)
25+STARBALL11 = pg_hint_plan11-$(HINTPLANVER).tar.gz
26+STARBALLS = $(STARBALL11)
2727
2828 TARSOURCES = Makefile *.c *.h COPYRIGHT* \
2929 pg_hint_plan--*.sql \
@@ -35,7 +35,7 @@ LDFLAGS+=-Wl,--build-id
3535
3636 installcheck: $(REGRESSION_EXPECTED)
3737
38-rpms: rpm10
38+rpms: rpm11
3939
4040 # pg_hint_plan.c includes core.c and make_join_rel.c
4141 pg_hint_plan.o: core.c make_join_rel.c # pg_stat_statements.c
@@ -50,7 +50,7 @@ $(STARBALLS): $(TARSOURCES)
5050 tar -chzf $@ $(addprefix $(subst .tar.gz,,$@)/, $^)
5151 rm $(subst .tar.gz,,$@)
5252
53-rpm10: $(STARBALL10)
54- MAKE_ROOT=`pwd` rpmbuild -bb SPECS/pg_hint_plan10.spec
53+rpm11: $(STARBALL11)
54+ MAKE_ROOT=`pwd` rpmbuild -bb SPECS/pg_hint_plan11.spec
5555
5656
--- a/SPECS/pg_hint_plan10.spec
+++ b/SPECS/pg_hint_plan11.spec
@@ -1,10 +1,11 @@
11 # SPEC file for pg_store_plans
22 # Copyright(C) 2018 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
33
4-%define _pgdir /usr/pgsql-10
4+%define _pgdir /usr/pgsql-11
55 %define _bindir %{_pgdir}/bin
66 %define _libdir %{_pgdir}/lib
77 %define _datadir %{_pgdir}/share
8+%define _bcdir %{_libdir}/bitcode/pg_hint_plan
89
910 %if "%(echo ${MAKE_ROOT})" != ""
1011 %define _rpmdir %(echo ${MAKE_ROOT})/RPMS
@@ -12,8 +13,8 @@
1213 %endif
1314
1415 ## Set general information for pg_store_plans.
15-Summary: Optimizer hint on PostgreSQL 10
16-Name: pg_hint_plan10
16+Summary: Optimizer hint on PostgreSQL 11
17+Name: pg_hint_plan11
1718 Version: 1.3.2
1819 Release: 1%{?dist}
1920 License: BSD
@@ -24,8 +25,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
2425 Vendor: NIPPON TELEGRAPH AND TELEPHONE CORPORATION
2526
2627 ## We use postgresql-devel package
27-BuildRequires: postgresql10-devel
28-Requires: postgresql10-libs
28+BuildRequires: postgresql11-devel
29+Requires: postgresql11-server
2930
3031 ## Description for "pg_hint_plan"
3132 %description
@@ -33,11 +34,19 @@ Requires: postgresql10-libs
3334 pg_hint_plan provides capability to tweak execution plans to be
3435 executed on PostgreSQL.
3536
36-Note that this package is available for only PostgreSQL 10.
37+Note that this package is available for only PostgreSQL 11.
38+
39+%package llvmjit
40+Requires: postgresql11-server, postgresql11-llvmjit
41+Requires: pg_hint_plan11 = 1.3.1
42+Summary: Just-in-time compilation support for pg_hint_plan11
43+
44+%description llvmjit
45+Just-in-time compilation support for pg_hint_plan11
3746
3847 ## pre work for build pg_hint_plan
3948 %prep
40-PATH=/usr/pgsql-10/bin:$PATH
49+PATH=/usr/pgsql-11/bin:$PATH
4150 if [ "${MAKE_ROOT}" != "" ]; then
4251 pushd ${MAKE_ROOT}
4352 make clean %{name}-%{version}.tar.gz
@@ -48,7 +57,7 @@ if [ ! -d %{_rpmdir} ]; then mkdir -p %{_rpmdir}; fi
4857
4958 ## Set variables for build environment
5059 %build
51-PATH=/usr/pgsql-10/bin:$PATH
60+PATH=/usr/pgsql-11/bin:$PATH
5261 make USE_PGXS=1 %{?_smp_mflags}
5362
5463 ## Set variables for install
@@ -59,6 +68,8 @@ install pg_hint_plan.so %{buildroot}%{_libdir}/pg_hint_plan.so
5968 install -d %{buildroot}%{_datadir}/extension
6069 install -m 644 pg_hint_plan--1.3.2.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.3.2.sql
6170 install -m 644 pg_hint_plan.control %{buildroot}%{_datadir}/extension/pg_hint_plan.control
71+install -d %{buildroot}%{_bcdir}
72+install -m 644 pg_hint_plan.bc %{buildroot}%{_bcdir}/pg_hint_plan.bc
6273
6374 %clean
6475 rm -rf %{buildroot}
@@ -70,10 +81,16 @@ rm -rf %{buildroot}
7081 %{_datadir}/extension/pg_hint_plan--1.3.2.sql
7182 %{_datadir}/extension/pg_hint_plan.control
7283
84+%files llvmjit
85+%defattr(0755,root,root)
86+%{_bcdir}
87+%defattr(0644,root,root)
88+%{_bcdir}/pg_hint_plan.bc
89+
7390 # History of pg_hint_plan.
7491 %changelog
7592 * Tue Nov 13 2018 Kyotaro Horiguchi
76-- Support PostgreSQL 11. Version 1.3.1.
93+- Support PostgreSQL 11. Version 1.3.2.
7794 * Tue Jun 08 2018 Kyotaro Horiguchi
7895 - Fixed a crash bug. Version 1.3.1.
7996 * Tue Oct 10 2017 Kyotaro Horiguchi
旧リポジトリブラウザで表示