Change version to 1.2.3.

1.2.2 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.

64ad85860c Change more places to be less trusting of RestrictInfo.is_pushed_down.

diff --git a/COPYRIGHT b/COPYRIGHT
index 498483e..631bdc8 100644 (file)
--- 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 6a9e791..9937526 100644 (file)
--- 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.2.2
+HINTPLANVER = 1.2.3
 
 REGRESS = init base_plan pg_hint_plan ut-init ut-A ut-S ut-J ut-L ut-G ut-R ut-fdw ut-W 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.2.2.sql pg_hint_plan--1.2.1--1.2.2.sql pg_hint_plan--1.2.0--1.2.1.sql pg_hint_plan--1.1.3--1.2.0.sql
+DATA = pg_hint_plan--1.2.3.sql pg_hint_plan--1.2.2--1.2.3.sql pg_hint_plan--1.2.1--1.2.2.sql pg_hint_plan--1.2.0--1.2.1.sql pg_hint_plan--1.1.3--1.2.0.sql
 
 EXTRA_CLEAN = sql/ut-fdw.sql expected/ut-fdw.out RPMS
 

diff --git a/SPECS/pg_hint_plan96.spec b/SPECS/pg_hint_plan96.spec
index 8d896d4..59ea9b9 100644 (file)
--- a/SPECS/pg_hint_plan96.spec
+++ b/SPECS/pg_hint_plan96.spec
@@ -1,5 +1,5 @@
 # SPEC file for pg_store_plans
-# Copyright(C) 2017 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+# Copyright(C) 2018 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
 
 %define _pgdir   /usr/pgsql-9.6
 %define _bindir  %{_pgdir}/bin
@@ -14,7 +14,7 @@
 ## Set general information for pg_store_plans.
 Summary:    Optimizer hint on PostgreSQL 9.6
 Name:       pg_hint_plan96
-Version:    1.2.2
+Version:    1.2.3
 Release:    1%{?dist}
 License:    BSD
 Group:      Applications/Databases
@@ -57,7 +57,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.2.2.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.2.2.sql
+install -m 644 pg_hint_plan--1.2.3.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.2.3.sql
+install -m 644 pg_hint_plan--1.2.2--1.2.3.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.2.2--1.2.3.sql
 install -m 644 pg_hint_plan--1.2.1--1.2.2.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.2.1--1.2.2.sql
 install -m 644 pg_hint_plan--1.2.0--1.2.1.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.2.0--1.2.1.sql
 install -m 644 pg_hint_plan--1.1.3--1.2.0.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.3--1.2.0.sql
@@ -70,7 +71,8 @@ rm -rf %{buildroot}
 %defattr(0755,root,root)
 %{_libdir}/pg_hint_plan.so
 %defattr(0644,root,root)
-%{_datadir}/extension/pg_hint_plan--1.2.2.sql
+%{_datadir}/extension/pg_hint_plan--1.2.3.sql
+%{_datadir}/extension/pg_hint_plan--1.2.2--1.2.3.sql
 %{_datadir}/extension/pg_hint_plan--1.2.1--1.2.2.sql
 %{_datadir}/extension/pg_hint_plan--1.2.0--1.2.1.sql
 %{_datadir}/extension/pg_hint_plan--1.1.3--1.2.0.sql
@@ -78,6 +80,8 @@ rm -rf %{buildroot}
 
 # 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.2.2--1.2.3.sql b/pg_hint_plan--1.2.2--1.2.3.sql
new file mode 100644 (file)
index 0000000..2a728bb
--- /dev/null
+++ b/pg_hint_plan--1.2.2--1.2.3.sql
@@ -0,0 +1,6 @@
+/* pg_hint_plan/pg_hint_plan--1.2.2--1.2.3.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 upgrading from 1.2.2.

diff --git a/pg_hint_plan--1.2.2.sql b/pg_hint_plan--1.2.3.sql
similarity index 92%
rename from pg_hint_plan--1.2.2.sql
rename to pg_hint_plan--1.2.3.sql
index 0996292..6661a92 100644 (file)
--- a/pg_hint_plan--1.2.2.sql
+++ b/pg_hint_plan--1.2.3.sql
@@ -1,4 +1,4 @@
-/* pg_hint_plan/pg_hint_plan--1.2.2.sql */
+/* pg_hint_plan/pg_hint_plan--1.2.3.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

diff --git a/pg_hint_plan.c b/pg_hint_plan.c
index ee45a78..8b45846 100644 (file)
--- a/pg_hint_plan.c
+++ b/pg_hint_plan.c
@@ -3,7 +3,7 @@
  * pg_hint_plan.c
  *               hinting on how to execute a query for PostgreSQL
  *
- * Copyright (c) 2012-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+ * Copyright (c) 2012-2018, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
  *
  *-------------------------------------------------------------------------
  */

diff --git a/pg_hint_plan.control b/pg_hint_plan.control
index e55b849..2db5d4d 100644 (file)
--- a/pg_hint_plan.control
+++ b/pg_hint_plan.control
@@ -1,6 +1,6 @@
 # pg_hint_plan extension
 
 comment = ''
-default_version = '1.2.2'
+default_version = '1.2.3'
 relocatable = false
 schema = hint_plan