Change version of 3.1.19 (#115)

Update for new minor version release. * update version tagging * update SPEC files
ossc-db · Oct 12, 2021 · 300d058 · 300d058
1 parent 74b0cb8
commit 300d058
Show file tree

Hide file tree

Showing 9 changed files with 146 additions and 13 deletions.
diff --git a/SPECS/pg_bulkload-pg10.spec b/SPECS/pg_bulkload-pg10.spec
@@ -9,7 +9,7 @@
 
 Summary:        High speed data load utility for PostgreSQL
 Name:           %{sname}
-Version:        3.1.18
+Version:        3.1.19
 Release:        1%{?dist}
 License:        BSD
 Group:          Applications/Databases
@@ -82,6 +82,9 @@ rm -rf %{buildroot}
 rm -rf %{_libdir}/pgxs/src/backend/
 
 %changelog
+* Mon Oct 11 2021 - Masahiro ikeda <masahiro.ikeda.us@hco.ntt.co.jp> 3.1.19-1
+- Support PostgreSQL 14
+- Update to pg_bulkload 3.1.19
 * Tue Jun 01 2021 - Yanmei Sun <yanmei.sun.ep@hco.ntt.co.jp> 3.1.18-1
 - Update to pg_bulkload 3.1.18
 * Fri Feb 05 2021 - Moon Insung <insung.moon.gk@hco.ntt.co.jp> 3.1.17-1

diff --git a/SPECS/pg_bulkload-pg11.spec b/SPECS/pg_bulkload-pg11.spec
@@ -10,7 +10,7 @@
 
 Summary:        High speed data load utility for PostgreSQL
 Name:           %{sname}
-Version:        3.1.18
+Version:        3.1.19
 Release:        1%{?dist}
 License:        BSD
 Group:          Applications/Databases
@@ -31,7 +31,7 @@ When we load huge amount of data to a database, it is common situation that data
 
 %package llvmjit
 Requires: postgresql11-server, postgresql11-llvmjit
-Requires: pg_bulkload = 3.1.18
+Requires: pg_bulkload = 3.1.19
 Summary:  Just-in-time compilation support for pg_bulkload
 
 %description llvmjit
@@ -99,6 +99,9 @@ rm -rf %{buildroot}
 rm -rf %{_libdir}/pgxs/src/backend/
 
 %changelog
+* Mon Oct 11 2021 - Masahiro ikeda <masahiro.ikeda.us@hco.ntt.co.jp> 3.1.19-1
+- Support PostgreSQL 14
+- Update to pg_bulkload 3.1.19
 * Tue Jun 01 2021 - Yanmei Sun <yanmei.sun.ep@hco.ntt.co.jp> 3.1.18-1
 - Update to pg_bulkload 3.1.18
 * Fri Feb 05 2021 - Moon Insung <insung.moon.gk@hco.ntt.co.jp> 3.1.17-1

diff --git a/SPECS/pg_bulkload-pg12.spec b/SPECS/pg_bulkload-pg12.spec
@@ -10,7 +10,7 @@
 
 Summary:        High speed data load utility for PostgreSQL
 Name:           %{sname}
-Version:        3.1.18
+Version:        3.1.19
 Release:        1%{?dist}
 License:        BSD
 Group:          Applications/Databases
@@ -31,7 +31,7 @@ When we load huge amount of data to a database, it is common situation that data
 
 %package llvmjit
 Requires: postgresql12-server, postgresql12-llvmjit
-Requires: pg_bulkload = 3.1.18
+Requires: pg_bulkload = 3.1.19
 Summary:  Just-in-time compilation support for pg_bulkload
 
 %description llvmjit
@@ -99,6 +99,9 @@ rm -rf %{buildroot}
 rm -rf %{_libdir}/pgxs/src/backend/
 
 %changelog
+* Mon Oct 11 2021 - Masahiro ikeda <masahiro.ikeda.us@hco.ntt.co.jp> 3.1.19-1
+- Support PostgreSQL 14
+- Update to pg_bulkload 3.1.19
 * Tue Jun 01 2021 - Yanmei Sun <yanmei.sun.ep@hco.ntt.co.jp> 3.1.18-1
 - Update to pg_bulkload 3.1.18
 * Fri Feb 05 2021 - Moon Insung <insung.moon.gk@hco.ntt.co.jp> 3.1.17-1

diff --git a/SPECS/pg_bulkload-pg13.spec b/SPECS/pg_bulkload-pg13.spec
@@ -10,7 +10,7 @@
 
 Summary:        High speed data load utility for PostgreSQL
 Name:           %{sname}
-Version:        3.1.18
+Version:        3.1.19
 Release:        1%{?dist}
 License:        BSD
 Group:          Applications/Databases
@@ -31,7 +31,7 @@ When we load huge amount of data to a database, it is common situation that data
 
 %package llvmjit
 Requires: postgresql13-server, postgresql13-llvmjit
-Requires: pg_bulkload = 3.1.18
+Requires: pg_bulkload = 3.1.19
 Summary:  Just-in-time compilation support for pg_bulkload
 
 %description llvmjit
@@ -99,6 +99,9 @@ rm -rf %{buildroot}
 rm -rf %{_libdir}/pgxs/src/backend/
 
 %changelog
+* Mon Oct 11 2021 - Masahiro ikeda <masahiro.ikeda.us@hco.ntt.co.jp> 3.1.19-1
+- Support PostgreSQL 14
+- Update to pg_bulkload 3.1.19
 * Tue Jun 01 2021 - Yanmei Sun <yanmei.sun.ep@hco.ntt.co.jp> 3.1.18-1
 - Update to pg_bulkload 3.1.18
 * Fri Feb 05 2021 - Moon Insung <insung.moon.gk@hco.ntt.co.jp> 3.1.17-1

diff --git a/SPECS/pg_bulkload-pg14.spec b/SPECS/pg_bulkload-pg14.spec
@@ -0,0 +1,104 @@
+# SPEC file for pg_bulkload on PostgreSQL 14
+# Copyright (C) 2009-2021 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+
+%define sname                   pg_bulkload
+%define pgmajorversion  14
+
+%define _prefix                 /usr/pgsql-%{pgmajorversion}
+%define _libdir                 %{_prefix}/lib
+%define _bcdir			%{_libdir}/bitcode/pg_bulkload
+
+Summary:        High speed data load utility for PostgreSQL
+Name:           %{sname}
+Version:        3.1.19
+Release:        1%{?dist}
+License:        BSD
+Group:          Applications/Databases
+# You can get the tarball by following: https://github.com/ossc-db/pg_bulkload/archive/%{version}.tar.gz
+Source0:        %{sname}-%{version}.tar.gz
+URL:            http://ossc-db.github.io/pg_bulkload/index.html
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
+
+BuildRequires:  postgresql14-devel, postgresql14
+Requires:       postgresql14
+
+
+%description
+pg_bulkload provides high-speed data loading capability to PostgreSQL users.
+
+When we load huge amount of data to a database, it is common situation that data set to be loaded is valid and consistent. For example, dedicated tools are used to prepare such data, providing data validation in advance. In such cases, we'd like to bypass any overheads within database system to load data as quickly as possible. pg_bulkload is developed to help such situations. Therefore, it is not pg_bulkload's goal to provide detailed data validation. Rather, pg_bulkload asumes that loaded data set is validated by separate means. If you're not in such situation, you should use COPY command in PostgreSQL.
+
+
+%package llvmjit
+Requires: postgresql14-server, postgresql14-llvmjit
+Requires: pg_bulkload = 3.1.19
+Summary:  Just-in-time compilation support for pg_bulkload
+
+%description llvmjit
+Just-in-time compilation support for pg_bulkdload
+
+%prep
+rm -rf %{_libdir}/pgxs/src/backend/
+
+%setup -n %{sname}-%{version}
+
+%build
+USE_PGXS=1 make %{?_smp_mflags} MAJORVERSION=%{pgmajorversion}
+
+%install
+%define pg_contribdir %{_datadir}/contrib
+%define pg_extensiondir %{_datadir}/extension
+
+rm -rf %{buildroot}
+
+install -d %{buildroot}%{_bindir}
+install -d %{buildroot}%{_libdir}
+install -d %{buildroot}%{pg_contribdir}
+install -d %{buildroot}%{pg_extensiondir}
+install -d %{buildroot}%{_bcdir}
+
+install -m 755 bin/pg_bulkload                 %{buildroot}%{_bindir}/pg_bulkload
+install -m 755 bin/postgresql                  %{buildroot}%{_bindir}/postgresql
+install -m 755 lib/pg_bulkload.so              %{buildroot}%{_libdir}/pg_bulkload.so
+install -m 644 lib/pg_bulkload.bc %{buildroot}%{_bcdir}/pg_bulkload.bc
+
+install -m 644 lib/pg_bulkload.sql             %{buildroot}%{pg_contribdir}/pg_bulkload.sql
+install -m 644 lib/uninstall_pg_bulkload.sql   %{buildroot}%{pg_contribdir}/uninstall_pg_bulkload.sql
+install -m 644 lib/pg_bulkload.control         %{buildroot}%{pg_extensiondir}/pg_bulkload.control
+install -m 644 lib/pg_bulkload--1.0.sql        %{buildroot}%{pg_extensiondir}/pg_bulkload--1.0.sql
+install -m 644 lib/pg_bulkload--unpackaged--1.0.sql         %{buildroot}%{pg_extensiondir}/pg_bulkload--unpackaged--1.0.sql
+
+# sample_*.ctl files are needed for rpm users.
+# %{sname}-%{version} is the same path with "%setup -n"'s argument.
+install -m 644 docs/sample_bin.ctl              %{buildroot}%{pg_contribdir}/sample_bin.ctl
+install -m 644 docs/sample_csv.ctl              %{buildroot}%{pg_contribdir}/sample_csv.ctl
+
+%files
+%defattr(755,root,root,755)
+%{_bindir}/pg_bulkload
+%{_bindir}/postgresql
+%{_libdir}/pg_bulkload.so
+%defattr(644,root,root,755)
+#%doc README.pg_bulkload
+%{pg_contribdir}/pg_bulkload.sql
+%{pg_contribdir}/uninstall_pg_bulkload.sql
+%{pg_contribdir}/sample_bin.ctl
+%{pg_contribdir}/sample_csv.ctl
+%{pg_extensiondir}/pg_bulkload.control
+%{pg_extensiondir}/pg_bulkload--1.0.sql
+%{pg_extensiondir}/pg_bulkload--unpackaged--1.0.sql
+
+%files llvmjit
+%defattr(0755,root,root)
+%{_bcdir}
+%defattr(0644,root,root)
+%{_bcdir}/pg_bulkload.bc
+
+%clean
+rm -rf %{buildroot}
+rm -rf %{_libdir}/pgxs/src/backend/
+
+%changelog
+* Mon Oct 11 2021 - Masahiro ikeda <masahiro.ikeda.us@hco.ntt.co.jp> 3.1.19-1
+- Support PostgreSQL 14
+- Update to pg_bulkload 3.1.19
diff --git a/SPECS/pg_bulkload-pg96.spec b/SPECS/pg_bulkload-pg96.spec
@@ -9,7 +9,7 @@
 
 Summary:        High speed data load utility for PostgreSQL
 Name:           %{sname}
-Version:        3.1.18
+Version:        3.1.19
 Release:        1%{?dist}
 License:        BSD
 Group:          Applications/Databases
@@ -82,6 +82,9 @@ rm -rf %{buildroot}
 rm -rf %{_libdir}/pgxs/src/backend/
 
 %changelog
+* Mon Oct 11 2021 - Masahiro ikeda <masahiro.ikeda.us@hco.ntt.co.jp> 3.1.19-1
+- Support PostgreSQL 14
+- Update to pg_bulkload 3.1.19
 * Tue Jun 01 2021 - Yanmei Sun <yanmei.sun.ep@hco.ntt.co.jp> 3.1.18-1
 - Update to pg_bulkload 3.1.18
 * Fri Feb 05 2021 - Moon Insung <insung.moon.gk@hco.ntt.co.jp> 3.1.17-1

diff --git a/docs/pg_bulkload-ja.html b/docs/pg_bulkload-ja.html
@@ -793,13 +793,20 @@ <h3 id="rpm">RPM パッケージからのインストール</h3>
 <h2 id="requirement">動作環境</h2>
 <dl>
 <dt>PostgreSQLバージョン</dt>
-<dd>PostgreSQL 9.3, 9.4, 9.5, 9.6, 10, 11, 12, 13</dd>
+<dd>PostgreSQL 9.6, 10, 11, 12, 13, 14</dd>
 <dt>OS</dt>
-<dd>RHEL 6/7/8</dd>
+<dd>RHEL 7/8</dd>
 </dl>
 
 <h2 id="releasenote">リリースノート</h2>
 
+<p>
+<h4>3.1.19</h4>
+<ul>
+<li>PostgreSQL 14に対応</li>
+</ul>
+</p>
+
 <p>
 <h4>3.1.18</h4>
 <ul>

diff --git a/docs/pg_bulkload.html b/docs/pg_bulkload.html
@@ -871,13 +871,20 @@ <h3 id="rpm">Installation from RPM package</h3>
 <h2 id="requirement">Requirements</h2>
 <dl>
 <dt>PostgreSQL versions</dt>
-<dd>PostgreSQL 9.3, 9.4, 9.5, 9.6, 10, 11, 12, 13</dd>
+<dd>PostgreSQL 9.6, 10, 11, 12, 13, 14</dd>
 <dt>OS</dt>
-<dd>RHEL 6/7/8</dd>
+<dd>RHEL 7/8</dd>
 </dl>
 
 <h2 id="releasenote">Release Notes</h2>
 
+<p>
+<h4>3.1.19</h4>
+<ul>
+<li>Added support for PostgreSQL 14</li>
+</ul>
+</p>
+
 <p>
 <h4>3.1.18</h4>
 <ul>

diff --git a/include/common.h b/include/common.h
@@ -12,7 +12,7 @@
 #ifndef COMMON_H_INCLUDED
 #define COMMON_H_INCLUDED
 
-#define PG_BULKLOAD_VERSION "3.1.18"
+#define PG_BULKLOAD_VERSION "3.1.19"
 
 
 #ifndef PG_BULKLOAD_PRINTF_ATTRIBUTE