From fd64e6bae7521ce24a24e033c96c3697aae2f42d Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Fri, 8 Jun 2018 13:38:31 +0900 Subject: [PATCH] Change version to 1.1.6. 1.1.5 has a crash bug in Describe message of extended protocol path. If server receives the message after invalidation of corresponding query cache, pg_hint_plan crashes. On the way fixing it, this version took in the following commit of core. 80e12a6218 Change more places to be less trusting of RestrictInfo.is_pushed_down. --- COPYRIGHT | 2 +- Makefile | 6 +++--- SPECS/pg_hint_plan95.spec | 12 ++++++++---- pg_hint_plan--1.1.5--1.1.6.sql | 6 ++++++ pg_hint_plan--1.1.5.sql => pg_hint_plan--1.1.6.sql | 0 pg_hint_plan.control | 2 +- 6 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 pg_hint_plan--1.1.5--1.1.6.sql rename pg_hint_plan--1.1.5.sql => pg_hint_plan--1.1.6.sql (100%) diff --git a/COPYRIGHT b/COPYRIGHT index 498483e..631bdc8 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,4 @@ -Copyright (c) 2012-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION +Copyright (c) 2012-2018, 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 7060d9e..5f0f7f7 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ # # pg_hint_plan: Makefile # -# Copyright (c) 2012-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright (c) 2012-2018, NIPPON TELEGRAPH AND TELEPHONE CORPORATION # MODULES = pg_hint_plan -HINTPLANVER = 1.1.5 +HINTPLANVER = 1.1.6 REGRESS = init base_plan pg_hint_plan ut-init ut-A ut-S ut-J ut-L ut-G ut-R ut-fdw ut-T ut-fini @@ -14,7 +14,7 @@ REGRESSION_EXPECTED = expected/init.out expected/base_plan.out expected/pg_hint_ REGRESS_OPTS = --encoding=UTF8 EXTENSION = pg_hint_plan -DATA = pg_hint_plan--1.1.5.sql pg_hint_plan--1.1.4--1.1.5.sql pg_hint_plan--1.1.3--1.1.4.sql +DATA = pg_hint_plan--1.1.6.sql pg_hint_plan--1.1.5--1.1.6.sql pg_hint_plan--1.1.4--1.1.5.sql pg_hint_plan--1.1.3--1.1.4.sql EXTRA_CLEAN = sql/ut-fdw.sql expected/ut-fdw.out diff --git a/SPECS/pg_hint_plan95.spec b/SPECS/pg_hint_plan95.spec index 07e0b1f..e4ce7c3 100644 --- a/SPECS/pg_hint_plan95.spec +++ b/SPECS/pg_hint_plan95.spec @@ -1,5 +1,5 @@ # SPEC file for pg_store_plans -# Copyright(C) 2016-2017 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright(C) 2016-2018 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define _pgdir /usr/pgsql-9.5 %define _bindir %{_pgdir}/bin @@ -13,7 +13,7 @@ ## Set general information for pg_store_plans. Summary: Optimizer hint on PostgreSQL 9.5 Name: pg_hint_plan95 -Version: 1.1.5 +Version: 1.1.6 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -56,7 +56,8 @@ rm -rf %{buildroot} install -d %{buildroot}%{_libdir} install pg_hint_plan.so %{buildroot}%{_libdir}/pg_hint_plan.so install -d %{buildroot}%{_datadir}/extension -install -m 644 pg_hint_plan--1.1.5.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.5.sql +install -m 644 pg_hint_plan--1.1.6.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.6.sql +install -m 644 pg_hint_plan--1.1.5--1.1.6.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.5--1.1.6.sql install -m 644 pg_hint_plan--1.1.4--1.1.5.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.4--1.1.5.sql install -m 644 pg_hint_plan--1.1.3--1.1.4.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.3--1.1.4.sql install -m 644 pg_hint_plan.control %{buildroot}%{_datadir}/extension/pg_hint_plan.control @@ -68,13 +69,16 @@ rm -rf %{buildroot} %defattr(0755,root,root) %{_libdir}/pg_hint_plan.so %defattr(0644,root,root) -%{_datadir}/extension/pg_hint_plan--1.1.5.sql +%{_datadir}/extension/pg_hint_plan--1.1.6.sql +%{_datadir}/extension/pg_hint_plan--1.1.5--1.1.6.sql %{_datadir}/extension/pg_hint_plan--1.1.4--1.1.5.sql %{_datadir}/extension/pg_hint_plan--1.1.3--1.1.4.sql %{_datadir}/extension/pg_hint_plan.control # History of pg_hint_plan. %changelog +* Fri Jun 08 2018 Kyotaro Horiguchi +- Fixed a crash bug. * Thu Jul 27 2017 Kyotaro Horiguchi - Fixed a crash bug. * Fri May 19 2017 Kyotaro Horiguchi diff --git a/pg_hint_plan--1.1.5--1.1.6.sql b/pg_hint_plan--1.1.5--1.1.6.sql new file mode 100644 index 0000000..ffeeca7 --- /dev/null +++ b/pg_hint_plan--1.1.5--1.1.6.sql @@ -0,0 +1,6 @@ +/* pg_hint_plan/pg_hint_plan--1.1.4--1.1.5.sql */ + +-- complain if script is sourced in psql, rather than via CREATE EXTENSION +\echo Use "CREATE EXTENSION pg_hint_plan" to load this file. \quit + +-- Nothing to do from 1.1.4 diff --git a/pg_hint_plan--1.1.5.sql b/pg_hint_plan--1.1.6.sql similarity index 100% rename from pg_hint_plan--1.1.5.sql rename to pg_hint_plan--1.1.6.sql diff --git a/pg_hint_plan.control b/pg_hint_plan.control index b2f42ab..067bc41 100644 --- a/pg_hint_plan.control +++ b/pg_hint_plan.control @@ -1,6 +1,6 @@ # pg_hint_plan extension comment = '' -default_version = '1.1.5' +default_version = '1.1.6' relocatable = false schema = hint_plan -- 2.11.0