From 25bbd09d766d711f93795f8d7fd5e7a8054dfa5b Mon Sep 17 00:00:00 2001 From: zw_yan <106359229+zwyan0@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:43:31 +0900 Subject: [PATCH] Update SEPC file, COPYRIGHT and program version. (#156) * Update SEPC file, COPYRIGHT, program version etc. --- .github/workflows/build.yml | 3 +- .github/workflows/test.yml | 2 - COPYRIGHT | 2 +- Makefile | 2 +- SPECS/pg_bulkload-pg11.spec | 8 +-- SPECS/pg_bulkload-pg12.spec | 8 +-- SPECS/pg_bulkload-pg13.spec | 8 +-- SPECS/pg_bulkload-pg14.spec | 7 +-- SPECS/pg_bulkload-pg15.spec | 6 ++- ...lkload-pg10.spec => pg_bulkload-pg16.spec} | 52 +++++++++---------- bin/Makefile | 2 +- bin/pg_bulkload.c | 2 +- bin/pgut/pgut-fe.c | 2 +- bin/pgut/pgut-fe.h | 2 +- bin/pgut/pgut-list.c | 4 +- bin/pgut/pgut-list.h | 2 +- bin/pgut/pgut.c | 2 +- bin/pgut/pgut.h | 2 +- bin/postgresql | 2 +- bin/recovery.c | 2 +- docs/index.html | 2 +- docs/index_ja.html | 2 +- docs/pg_bulkload-ja.html | 13 ++++- docs/pg_bulkload.html | 13 ++++- docs/pg_timestamp-ja.html | 2 +- docs/pg_timestamp.html | 2 +- docs/sample_bin.ctl | 2 +- docs/sample_csv.ctl | 2 +- include/binary.h | 2 +- include/common.h | 4 +- include/logger.h | 2 +- include/pg_btree.h | 2 +- include/pg_bulkload.h | 2 +- include/pg_loadstatus.h | 2 +- include/pg_profile.h | 2 +- include/pg_strutil.h | 2 +- include/reader.h | 2 +- include/writer.h | 2 +- lib/Makefile | 2 +- lib/binary.c | 2 +- lib/logger.c | 2 +- lib/nbtree/COPYRIGHT.nbtsort | 2 +- lib/nbtree/nbtsort-common.c | 2 +- lib/parser_binary.c | 2 +- lib/parser_csv.c | 2 +- lib/parser_function.c | 2 +- lib/parser_tuple.c | 2 +- lib/pg_btree.c | 2 +- lib/pg_bulkload.c | 2 +- lib/pg_bulkload.sql.in | 2 +- lib/pg_strutil.c | 2 +- lib/pgut/pgut-be.c | 2 +- lib/pgut/pgut-be.h | 2 +- lib/pgut/pgut-ipc.c | 2 +- lib/pgut/pgut-ipc.h | 2 +- lib/pgut/pgut-pthread.c | 2 +- lib/pgut/pgut-pthread.h | 2 +- lib/reader.c | 2 +- lib/source.c | 2 +- lib/writer.c | 2 +- lib/writer_binary.c | 2 +- lib/writer_buffered.c | 2 +- lib/writer_direct.c | 2 +- lib/writer_parallel.c | 2 +- util/Makefile | 2 +- util/pg_timestamp.c | 2 +- util/pg_timestamp.sql.in | 2 +- util/uninstall_pg_timestamp.sql | 2 +- 68 files changed, 129 insertions(+), 111 deletions(-) rename SPECS/{pg_bulkload-pg10.spec => pg_bulkload-pg16.spec} (69%) mode change 100644 => 100755 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 143006c..2ad760a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,8 +23,7 @@ jobs: - "13" - "12" - "11" - - "10" - - "9.6" + env: CACHE_VERSION: 20221222 # to identify cache version diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3f0e512..fff5dd7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,8 +23,6 @@ jobs: - "13.13" - "12.17" - "11.22" - - "10.23" - - "9.6.24" env: CACHE_VERSION: 20221222 # to identify cache version diff --git a/COPYRIGHT b/COPYRIGHT index c0cc1b6..b2114ab 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,4 @@ -Copyright (c) 2008-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION +Copyright (c) 2008-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Makefile b/Makefile index 3b0a2c0..38245d4 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # pg_bulkload: Makefile # -# Copyright (c) 2007-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright (c) 2007-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION # ifndef USE_PGXS top_builddir = ../.. diff --git a/SPECS/pg_bulkload-pg11.spec b/SPECS/pg_bulkload-pg11.spec index 1f4389e..37c7863 100644 --- a/SPECS/pg_bulkload-pg11.spec +++ b/SPECS/pg_bulkload-pg11.spec @@ -1,5 +1,5 @@ # SPEC file for pg_bulkload on PostgreSQL 11 -# Copyright (C) 2009-2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright (C) 2009-2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define sname pg_bulkload %define pgmajorversion 11 @@ -10,7 +10,7 @@ Summary: High speed data load utility for PostgreSQL Name: %{sname} -Version: 3.1.20 +Version: 3.1.21 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -93,11 +93,11 @@ rm -rf %{buildroot} rm -rf %{_libdir}/pgxs/src/backend/ %changelog +* Thu Jan 16 2024 - NTT OSS Center 3.1.21-1 +- Update to pg_bulkload 3.1.21 * Thu Jan 13 2023 - NTT OSS Center 3.1.20-1 -- Support PostgreSQL 15 - Update to pg_bulkload 3.1.20 * Mon Oct 11 2021 - Masahiro ikeda 3.1.19-1 -- Support PostgreSQL 14 - Update to pg_bulkload 3.1.19 * Tue Jun 01 2021 - Yanmei Sun 3.1.18-1 - Update to pg_bulkload 3.1.18 diff --git a/SPECS/pg_bulkload-pg12.spec b/SPECS/pg_bulkload-pg12.spec index e340966..757d961 100644 --- a/SPECS/pg_bulkload-pg12.spec +++ b/SPECS/pg_bulkload-pg12.spec @@ -1,5 +1,5 @@ # SPEC file for pg_bulkload on PostgreSQL 12 -# Copyright (C) 2009-2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright (C) 2009-2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define sname pg_bulkload %define pgmajorversion 12 @@ -10,7 +10,7 @@ Summary: High speed data load utility for PostgreSQL Name: %{sname} -Version: 3.1.20 +Version: 3.1.21 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -93,11 +93,11 @@ rm -rf %{buildroot} rm -rf %{_libdir}/pgxs/src/backend/ %changelog +* Thu Jan 16 2024 - NTT OSS Center 3.1.21-1 +- Update to pg_bulkload 3.1.21 * Thu Jan 13 2023 - NTT OSS Center 3.1.20-1 -- Support PostgreSQL 15 - Update to pg_bulkload 3.1.20 * Mon Oct 11 2021 - Masahiro ikeda 3.1.19-1 -- Support PostgreSQL 14 - Update to pg_bulkload 3.1.19 * Tue Jun 01 2021 - Yanmei Sun 3.1.18-1 - Update to pg_bulkload 3.1.18 diff --git a/SPECS/pg_bulkload-pg13.spec b/SPECS/pg_bulkload-pg13.spec index 73a1819..ddb7811 100755 --- a/SPECS/pg_bulkload-pg13.spec +++ b/SPECS/pg_bulkload-pg13.spec @@ -1,5 +1,5 @@ # SPEC file for pg_bulkload on PostgreSQL 13 -# Copyright (C) 2009-2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright (C) 2009-2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define sname pg_bulkload %define pgmajorversion 13 @@ -10,7 +10,7 @@ Summary: High speed data load utility for PostgreSQL Name: %{sname} -Version: 3.1.20 +Version: 3.1.21 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -93,11 +93,11 @@ rm -rf %{buildroot} rm -rf %{_libdir}/pgxs/src/backend/ %changelog +* Thu Jan 16 2024 - NTT OSS Center 3.1.21-1 +- Update to pg_bulkload 3.1.21 * Thu Jan 13 2023 - NTT OSS Center 3.1.20-1 -- Support PostgreSQL 15 - Update to pg_bulkload 3.1.20 * Mon Oct 11 2021 - Masahiro ikeda 3.1.19-1 -- Support PostgreSQL 14 - Update to pg_bulkload 3.1.19 * Tue Jun 01 2021 - Yanmei Sun 3.1.18-1 - Update to pg_bulkload 3.1.18 diff --git a/SPECS/pg_bulkload-pg14.spec b/SPECS/pg_bulkload-pg14.spec index 64c564e..5cb23fb 100755 --- a/SPECS/pg_bulkload-pg14.spec +++ b/SPECS/pg_bulkload-pg14.spec @@ -1,5 +1,5 @@ # SPEC file for pg_bulkload on PostgreSQL 14 -# Copyright (C) 2009-2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright (C) 2009-2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define sname pg_bulkload %define pgmajorversion 14 @@ -10,7 +10,7 @@ Summary: High speed data load utility for PostgreSQL Name: %{sname} -Version: 3.1.20 +Version: 3.1.21 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -93,8 +93,9 @@ rm -rf %{buildroot} rm -rf %{_libdir}/pgxs/src/backend/ %changelog +* Thu Jan 16 2024 - NTT OSS Center 3.1.21-1 +- Update to pg_bulkload 3.1.21 * Thu Jan 13 2023 - NTT OSS Center 3.1.20-1 -- Support PostgreSQL 15 - Update to pg_bulkload 3.1.20 * Mon Oct 11 2021 - Masahiro ikeda 3.1.19-1 - Support PostgreSQL 14 diff --git a/SPECS/pg_bulkload-pg15.spec b/SPECS/pg_bulkload-pg15.spec index 3caee36..3240690 100755 --- a/SPECS/pg_bulkload-pg15.spec +++ b/SPECS/pg_bulkload-pg15.spec @@ -1,5 +1,5 @@ # SPEC file for pg_bulkload on PostgreSQL 15 -# Copyright (C) 2022-2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright (C) 2022-2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define sname pg_bulkload %define pgmajorversion 15 @@ -10,7 +10,7 @@ Summary: High speed data load utility for PostgreSQL Name: %{sname} -Version: 3.1.20 +Version: 3.1.21 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -93,6 +93,8 @@ rm -rf %{buildroot} rm -rf %{_libdir}/pgxs/src/backend/ %changelog +* Thu Jan 16 2024 - NTT OSS Center 3.1.21-1 +- Update to pg_bulkload 3.1.21 * Thu Jan 13 2023 - NTT OSS Center 3.1.20-1 - Support PostgreSQL 15 - Update to pg_bulkload 3.1.20 diff --git a/SPECS/pg_bulkload-pg10.spec b/SPECS/pg_bulkload-pg16.spec old mode 100644 new mode 100755 similarity index 69% rename from SPECS/pg_bulkload-pg10.spec rename to SPECS/pg_bulkload-pg16.spec index e930c6f..a8ba168 --- a/SPECS/pg_bulkload-pg10.spec +++ b/SPECS/pg_bulkload-pg16.spec @@ -1,15 +1,16 @@ -# SPEC file for pg_bulkload on PostgreSQL 10 -# Copyright (C) 2009-2023 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# SPEC file for pg_bulkload on PostgreSQL 16 +# Copyright (C) 2023-2024 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define sname pg_bulkload -%define pgmajorversion 10 +%define pgmajorversion 16 %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.20 +Version: 3.1.21 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -18,8 +19,8 @@ Source0: %{sname}-%{version}.tar.gz URL: http://ossc-db.github.io/pg_bulkload/index.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n) -BuildRequires: postgresql10-devel, postgresql10 -Requires: postgresql10 +BuildRequires: postgresql16-devel, postgresql16 +Requires: postgresql16 %description @@ -28,6 +29,14 @@ 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: postgresql16-server, postgresql16-llvmjit +Requires: pg_bulkload = %{version} +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/ @@ -46,10 +55,12 @@ 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.control %{buildroot}%{pg_extensiondir}/pg_bulkload.control install -m 644 lib/pg_bulkload--%{version}.sql %{buildroot}%{pg_extensiondir}/pg_bulkload--%{version}.sql @@ -71,28 +82,17 @@ install -m 644 docs/sample_csv.ctl %{buildroot}%{pg_contribdir}/sam %{pg_extensiondir}/pg_bulkload.control %{pg_extensiondir}/pg_bulkload--%{version}.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 -* Thu Jan 13 2023 - NTT OSS Center 3.1.20-1 -- Support PostgreSQL 15 -- Update to pg_bulkload 3.1.20 -* Mon Oct 11 2021 - Masahiro ikeda 3.1.19-1 -- Support PostgreSQL 14 -- Update to pg_bulkload 3.1.19 -* Tue Jun 01 2021 - Yanmei Sun 3.1.18-1 -- Update to pg_bulkload 3.1.18 -* Fri Feb 05 2021 - Moon Insung 3.1.17-1 -- Update to pg_bulkload 3.1.17 -* Wed Jan 22 2020 - Moon Insung 3.1.16-1 -- Update to pg_bulkload 3.1.16 -- Warn users of some risks of using parallel/multi-process mode -- Document restriction that pg_bulkload supports only tables of "heap" access method -* Mon Jan 21 2019 - Moon Insung 3.1.15-1 -- Fixed pg_bulkload to mitigate attacks described in CVE-2018-1058 -- Update to pg_bulkload 3.1.15 -* Thu Nov 02 2017 - Moon Insung 3.1.14-1 -- Support PostgreSQL 10 -- Update to pg_bulkload 3.1.14 +* Thu Jan 16 2024 - NTT OSS Center 3.1.21-1 +- Support PostgreSQL 16 +- Update to pg_bulkload 3.1.21 diff --git a/bin/Makefile b/bin/Makefile index 6403b9a..a94fb7c 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,7 +1,7 @@ # # pg_bulkload: bin/Makefile # -# Copyright (c) 2007-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright (c) 2007-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION # SRCS = pg_bulkload.c recovery.c pgut/pgut.c pgut/pgut-fe.c pgut/pgut-list.c OBJS = $(SRCS:.c=.o) diff --git a/bin/pg_bulkload.c b/bin/pg_bulkload.c index d81384a..a9756b4 100644 --- a/bin/pg_bulkload.c +++ b/bin/pg_bulkload.c @@ -1,7 +1,7 @@ /* * pg_bulkload: bin/pg_bulkload.c * - * Copyright (c) 2007-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2007-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION */ /** diff --git a/bin/pgut/pgut-fe.c b/bin/pgut/pgut-fe.c index a682b5e..2b73dfa 100644 --- a/bin/pgut/pgut-fe.c +++ b/bin/pgut/pgut-fe.c @@ -2,7 +2,7 @@ * * pgut-fe.c * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/bin/pgut/pgut-fe.h b/bin/pgut/pgut-fe.h index 4a0b3a0..ec0d3a3 100644 --- a/bin/pgut/pgut-fe.h +++ b/bin/pgut/pgut-fe.h @@ -2,7 +2,7 @@ * * pgut-fe.h * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/bin/pgut/pgut-list.c b/bin/pgut/pgut-list.c index 52ee197..7722326 100644 --- a/bin/pgut/pgut-list.c +++ b/bin/pgut/pgut-list.c @@ -2,8 +2,8 @@ * * pgut-list.c : copied from postgres/nodes/list.c * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION - * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group + * Copyright (c) 2009-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * *------------------------------------------------------------------------- diff --git a/bin/pgut/pgut-list.h b/bin/pgut/pgut-list.h index ea843c7..615f4d5 100644 --- a/bin/pgut/pgut-list.h +++ b/bin/pgut/pgut-list.h @@ -2,7 +2,7 @@ * * pgut-list.h * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/bin/pgut/pgut.c b/bin/pgut/pgut.c index c26ba40..c0b569b 100644 --- a/bin/pgut/pgut.c +++ b/bin/pgut/pgut.c @@ -2,7 +2,7 @@ * * pgut.c * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/bin/pgut/pgut.h b/bin/pgut/pgut.h index b98f223..c69fd17 100644 --- a/bin/pgut/pgut.h +++ b/bin/pgut/pgut.h @@ -2,7 +2,7 @@ * * pgut.h * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/bin/postgresql b/bin/postgresql index e825f4a..19cb205 100644 --- a/bin/postgresql +++ b/bin/postgresql @@ -12,7 +12,7 @@ # this script doesn't execute pg_bulkload's recovery and call pg_ctl # directory. # -# Copyright (c) 2007-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright (c) 2007-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION # #------------------------------------------------------------------------------ # Acquire a command name diff --git a/bin/recovery.c b/bin/recovery.c index e0ac30d..e4aa45a 100644 --- a/bin/recovery.c +++ b/bin/recovery.c @@ -1,7 +1,7 @@ /* * pg_bulkload: bin/recovery.c * - * Copyright (c) 2007-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2007-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION */ /** diff --git a/docs/index.html b/docs/index.html index 6c717e5..ca47dad 100644 --- a/docs/index.html +++ b/docs/index.html @@ -246,7 +246,7 @@

Conditions

-

Copyright (c) 2007-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION

+

Copyright (c) 2007-2024, NIPPON TELEGRAPH AND TELEPHONE CORPORATION