提交: fce09b4501bae0b686170904d00480b327a6220d - pg_hint_plan (git)

firtst release

Commit MetaInfo

• 修訂: fce09b4501bae0b686170904d00480b327a6220d (tree)
• 時間: 2016-01-15 12:24:26
• 作者: Kyotaro Horiguchi <horiguchi.kyotaro@lab....>
• Commiter: Kyotaro Horiguchi

Log Message

Prepare for 1.1.3/PG95.

The pg_hint_plan version of master branch is left as 1.1.2. This
commit corrects the pg_hint_plan version, and edits RPM building
environment for PostgreSQL 9.5.

Change Summary

• modified: Makefile
• delete: SPECS/pg_hint_plan94.spec
• delete: pg_hint_plan--1.1.2.sql => pg_hint_plan--1.1.3.sql
• modified: pg_hint_plan.control

差異

--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 #
 # pg_hint_plan: Makefile
 #
-# Copyright (c) 2012-2014, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+# Copyright (c) 2012-2015, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
 #
 
 MODULES = pg_hint_plan
-HINTPLANVER = 1.1.2
+HINTPLANVER = 1.1.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-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.2.sql
+DATA = pg_hint_plan--1.1.3.sql
 
 EXTRA_CLEAN = sql/ut-fdw.sql expected/ut-fdw.out
 
@@ -23,8 +23,8 @@ PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 
 STARBALL = pg_dbms_stats-$(DBMSSTATSVER).tar.gz
-STARBALL94 = pg_hint_plan94-$(HINTPLANVER).tar.gz
-STARBALLS = $(STARBALL) $(STARBALL94)
+STARBALL95 = pg_hint_plan95-$(HINTPLANVER).tar.gz
+STARBALLS = $(STARBALL) $(STARBALL95)
 
 TARSOURCES = Makefile *.c  *.h \
 	pg_hint_plan--*.sql \
@@ -34,7 +34,7 @@ TARSOURCES = Makefile *.c  *.h \
 
 installcheck: $(REGRESSION_EXPECTED)
 
-rpms: rpm94
+rpms: rpm95
 
 # pg_hint_plan.c includes core.c and make_join_rel.c
 pg_hint_plan.o: core.c make_join_rel.c # pg_stat_statements.c
@@ -49,7 +49,7 @@ $(STARBALLS): $(TARSOURCES)
 	tar -chzf $@ $(addprefix $(subst .tar.gz,,$@)/, $^)
 	rm $(subst .tar.gz,,$@)
 
-rpm94: $(STARBALL94)
-	MAKE_ROOT=`pwd` rpmbuild -bb SPECS/pg_hint_plan94.spec
+rpm95: $(STARBALL95)
+	MAKE_ROOT=`pwd` rpmbuild -bb SPECS/pg_hint_plan95.spec
 
 

--- a/SPECS/pg_hint_plan94.spec
+++ /dev/null
@@ -1,84 +0,0 @@
-# SPEC file for pg_hint_plan
-# Copyright(C) 2012-2014 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
-
-%define _pgdir   /usr/pgsql-9.4
-%define _bindir  %{_pgdir}/bin
-%define _libdir  %{_pgdir}/lib
-%define _datadir %{_pgdir}/share
-%if "%(echo ${MAKE_ROOT})" != ""
-  %define _rpmdir %(echo ${MAKE_ROOT})/RPMS
-  %define _sourcedir %(echo ${MAKE_ROOT})
-%endif
-
-## Set general information for pg_hint_plan.
-Summary:    Optimizer hint for PostgreSQL 9.4
-Name:       pg_hint_plan94
-Version:    1.1.2
-Release:    1%{?dist}
-License:    BSD
-Group:      Applications/Databases
-Source0:    %{name}-%{version}.tar.gz
-#URL:        http://example.com/pg_hint_plan/
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
-Vendor:     NIPPON TELEGRAPH AND TELEPHONE CORPORATION
-
-## We use postgresql-devel package
-BuildRequires:  postgresql94-devel
-Requires:  postgresql94-libs
-
-## Description for "pg_hint_plan"
-%description
-pg_hint_plan provides capability to force arbitrary plan to PostgreSQL' planner
-to optimize queries by hand directly.
-
-If you have query plan better than which PostgreSQL chooses, you can force your
-plan by adding special comment block with optimizer hint before the query you
-want to optimize.  You can control scan method, join method, join order, and
-planner-related GUC parameters during planning.
-
-Note that this package is available for only PostgreSQL 9.4.
-
-## pre work for build pg_hint_plan
-%prep
-PATH=/usr/pgsql-9.4/bin:$PATH
-if [ "${MAKE_ROOT}" != "" ]; then
-  pushd ${MAKE_ROOT}
-  make clean %{name}-%{version}.tar.gz
-  popd
-fi
-if [ ! -d %{_rpmdir} ]; then mkdir -p %{_rpmdir}; fi
-%setup -q
-
-## Set variables for build environment
-%build
-PATH=/usr/pgsql-9.4/bin:$PATH
-make USE_PGXS=1 %{?_smp_mflags}
-
-## Set variables for install
-%install
-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.2.sql %{buildroot}%{_datadir}/extension/pg_hint_plan--1.1.2.sql
-install -m 644 pg_hint_plan.control %{buildroot}%{_datadir}/extension/pg_hint_plan.control
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(0755,root,root)
-%{_libdir}/pg_hint_plan.so
-%defattr(0644,root,root)
-%{_datadir}/extension/pg_hint_plan--1.1.2.sql
-%{_datadir}/extension/pg_hint_plan.control
-
-# History of pg_hint_plan.
-%changelog
-* Thu Dec 17 2014 Kyotaro Horiguchi
-- Support 9.4. New rev 1.1.2.
-* Mon Sep 02 2013 Takashi Suzuki
-- Initial cut for 1.1.0
-* Mon Sep 24 2012 Shigeru Hanada <[e-mail]>
-- Initial cut for 1.0.0
-

--- a/pg_hint_plan--1.1.2.sql
+++ b/pg_hint_plan--1.1.3.sql
@@ -1,4 +1,4 @@
-/* pg_hint_plan/pg_hint_plan--1.1.2.sql */
+/* pg_hint_plan/pg_hint_plan--1.1.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

--- a/pg_hint_plan.control
+++ b/pg_hint_plan.control
@@ -1,6 +1,6 @@
 # pg_hint_plan extension
 
 comment = ''
-default_version = '1.1.2'
+default_version = '1.1.3'
 relocatable = false
 schema = hint_plan