[patch] extensions_path GUC
One problem we have with PostGIS is you cannot test an extension
unless you have access to the system extension dir.
The following patch tries to address that by allowing to specify
a per-cluster extension path via an "extensions_path" GUC.
It is more a request-for-comments rather than a ready patch, as
I hadn't considered all use cases like upgrades of already-loaded
extensions and the possibility ot have a list of directories to
seek for extensions.
Anyway, patch is attached.
--strk;
() Free GIS & Flash consultant/developer
/\ http://strk.keybit.net/services.html
Attachments:
0001-Add-extensions_path-GUC.patchtext/x-diff; charset=us-asciiDownload
>From 9bba783d6581bc445b8a24fc8e615969fc16ab90 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 23 Oct 2015 12:00:51 +0200
Subject: [PATCH] Add extensions_path GUC
---
src/backend/commands/extension.c | 37 ++++++++++++++++++++++++++-----------
src/backend/utils/misc/guc.c | 14 ++++++++++++++
src/include/commands/extension.h | 3 +++
3 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index 67b16a7..df4e5df 100644
--- a/src/backend/commands/extension.c
+++ b/src/backend/commands/extension.c
@@ -64,6 +64,7 @@
/* Globally visible state variables */
bool creating_extension = false;
Oid CurrentExtensionObject = InvalidOid;
+char *Extension_path = NULL; /* set by guc.c */
/*
* Internal data structure to hold the results of parsing a control file
@@ -348,15 +349,29 @@ is_extension_script_filename(const char *filename)
return (extension != NULL) && (strcmp(extension, ".sql") == 0);
}
+static void
+get_extension_path(char *ret_path)
+{
+ char sharepath[MAXPGPATH];
+ if ( Extension_path )
+ {
+ snprintf(ret_path, MAXPGPATH, "%s", Extension_path);
+ }
+ else
+ {
+ get_share_path(my_exec_path, sharepath);
+ snprintf(ret_path, MAXPGPATH, "%s/extension", sharepath);
+ }
+}
+
static char *
get_extension_control_directory(void)
{
- char sharepath[MAXPGPATH];
char *result;
- get_share_path(my_exec_path, sharepath);
result = (char *) palloc(MAXPGPATH);
- snprintf(result, MAXPGPATH, "%s/extension", sharepath);
+
+ get_extension_path(result);
return result;
}
@@ -364,13 +379,13 @@ get_extension_control_directory(void)
static char *
get_extension_control_filename(const char *extname)
{
- char sharepath[MAXPGPATH];
- char *result;
+ char extpath[MAXPGPATH];
+ char *result;
- get_share_path(my_exec_path, sharepath);
+ get_extension_path(extpath);
result = (char *) palloc(MAXPGPATH);
- snprintf(result, MAXPGPATH, "%s/extension/%s.control",
- sharepath, extname);
+ snprintf(result, MAXPGPATH, "%s/%s.control",
+ extpath, extname);
return result;
}
@@ -378,7 +393,7 @@ get_extension_control_filename(const char *extname)
static char *
get_extension_script_directory(ExtensionControlFile *control)
{
- char sharepath[MAXPGPATH];
+ char extpath[MAXPGPATH];
char *result;
/*
@@ -391,9 +406,9 @@ get_extension_script_directory(ExtensionControlFile *control)
if (is_absolute_path(control->directory))
return pstrdup(control->directory);
- get_share_path(my_exec_path, sharepath);
+ get_extension_path(extpath);
result = (char *) palloc(MAXPGPATH);
- snprintf(result, MAXPGPATH, "%s/%s", sharepath, control->directory);
+ snprintf(result, MAXPGPATH, "%s/%s", extpath, control->directory);
return result;
}
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index fda0fb9..f76d07b 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -33,6 +33,7 @@
#include "access/xact.h"
#include "catalog/namespace.h"
#include "commands/async.h"
+#include "commands/extension.h"
#include "commands/prepare.h"
#include "commands/vacuum.h"
#include "commands/variable.h"
@@ -2943,6 +2944,19 @@ static struct config_string ConfigureNamesString[] =
},
{
+ {"extensions_path", PGC_SUSET, CLIENT_CONN_OTHER,
+ gettext_noop("Sets the path for extensions."),
+ gettext_noop("If an extension control file needs to be opened "
+ "the system will search this path for "
+ "the specified file."),
+ GUC_SUPERUSER_ONLY
+ },
+ &Extension_path,
+ NULL, /* will be handled by get_extension_control_directory */
+ NULL, NULL, NULL
+ },
+
+ {
{"krb_server_keyfile", PGC_SIGHUP, CONN_AUTH_SECURITY,
gettext_noop("Sets the location of the Kerberos server key file."),
NULL,
diff --git a/src/include/commands/extension.h b/src/include/commands/extension.h
index 0423350..bf6f44b 100644
--- a/src/include/commands/extension.h
+++ b/src/include/commands/extension.h
@@ -27,6 +27,9 @@
extern PGDLLIMPORT bool creating_extension;
extern Oid CurrentExtensionObject;
+/* Path to find extension control files in,
+ * defaults to sharedir/extension */
+extern char *Extension_path;
extern ObjectAddress CreateExtension(CreateExtensionStmt *stmt);
--
1.9.1
On 10/23/2015 01:33 PM, Sandro Santilli wrote:
One problem we have with PostGIS is you cannot test an extension
unless you have access to the system extension dir.The following patch tries to address that by allowing to specify
a per-cluster extension path via an "extensions_path" GUC.It is more a request-for-comments rather than a ready patch, as
I hadn't considered all use cases like upgrades of already-loaded
extensions and the possibility ot have a list of directories to
seek for extensions.
This was discussed a while ago already, see
/messages/by-id/51AE0845.8010600@ocharles.org.uk.
In short, I don't think just setting extensions_path is enough or
desirable, but I would welcome a patch that makes "make check" work for
extensions, by creating a temporary installation.
- Heikki
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
23.10.2015, 13:33, Sandro Santilli kirjoitti:
One problem we have with PostGIS is you cannot test an extension
unless you have access to the system extension dir.The following patch tries to address that by allowing to specify
a per-cluster extension path via an "extensions_path" GUC.It is more a request-for-comments rather than a ready patch, as
I hadn't considered all use cases like upgrades of already-loaded
extensions and the possibility ot have a list of directories to
seek for extensions.Anyway, patch is attached.
This would be very useful. I proposed this previously in February, but
that implementation (almost identical to yours) was rejected.
https://commitfest.postgresql.org/5/170/
/messages/by-id/54E3C31F.8010703@ohmu.fi
Both of these implementations miss a way to override the path for
extension .so files.
/ Oskari
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
On Fri, Oct 23, 2015 at 7:46 PM, Heikki Linnakangas wrote:
On 10/23/2015 01:33 PM, Sandro Santilli wrote:
In short, I don't think just setting extensions_path is enough or desirable,
but I would welcome a patch that makes "make check" work for extensions, by
creating a temporary installation.
Isn't that the existing EXTRA_INSTALL?
--
Michael
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
On 10/23/2015 02:59 PM, Michael Paquier wrote:
On Fri, Oct 23, 2015 at 7:46 PM, Heikki Linnakangas wrote:
On 10/23/2015 01:33 PM, Sandro Santilli wrote:
In short, I don't think just setting extensions_path is enough or desirable,
but I would welcome a patch that makes "make check" work for extensions, by
creating a temporary installation.Isn't that the existing EXTRA_INSTALL?
No. The problem is that "make check" doesn't work extensions built
outside the server source tree. You get an error:
"make check" is not supported.
Do "make install", then "make installcheck" instead.
- Heikki
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
On 10/23/15 11:02 AM, Heikki Linnakangas wrote:
On 10/23/2015 02:59 PM, Michael Paquier wrote:
On Fri, Oct 23, 2015 at 7:46 PM, Heikki Linnakangas wrote:
On 10/23/2015 01:33 PM, Sandro Santilli wrote:
In short, I don't think just setting extensions_path is enough or
desirable,
but I would welcome a patch that makes "make check" work for
extensions, by
creating a temporary installation.Isn't that the existing EXTRA_INSTALL?
No. The problem is that "make check" doesn't work extensions built
outside the server source tree. You get an error:"make check" is not supported.
Do "make install", then "make installcheck" instead.
I would love it if make check worked. make installcheck adds extra
effort to extension develoopment, not to mention leaving your actual
install in a less than pristine state.
Possibly related to this... I'd also like to have other options for
running unit tests, besides pg_regress. I looked at it briefly and the
big PITA about doing it was having to manage the temporary database (and
ideally temporary cluster). If standing those up was separated from
pg_regress it would make it a lot easier for someone to customize how
testing works under PGXS.
--
Jim Nasby, Data Architect, Blue Treble Consulting, Austin TX
Experts in Analytics, Data Architecture and PostgreSQL
Data in Trouble? Get it in Treble! http://BlueTreble.com
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
On Oct 23, 2015, at 9:26 AM, Jim Nasby <Jim.Nasby@BlueTreble.com> wrote:
I would love it if make check worked. make installcheck adds extra effort to extension develoopment, not to mention leaving your actual install in a less than pristine state.
I’ve wanted this for a long time. I think it would have to create a temporary cluster, fire up a server, install the extension(s), run the tests, shut down the server and delete the cluster.
Possibly related to this... I'd also like to have other options for running unit tests, besides pg_regress. I looked at it briefly and the big PITA about doing it was having to manage the temporary database (and ideally temporary cluster). If standing those up was separated from pg_regress it would make it a lot easier for someone to customize how testing works under PGXS.
Right, then pg_regress could just be the default test framework.
Dvaid
Attachments:
smime.p7sapplication/pkcs7-signature; name=smime.p7sDownload
0� *�H��
��0�1 0 + 0� *�H��
�� i0�-0��Q�0
*�H��
0��1 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CA0
150909050437Z
160909073817Z0F1 0 U david@justatheory.com1$0" *�H��
david@justatheory.com0�"0
*�H��
� 0�
� �zg� ��P����������:�BV��h/�a�UcTD��L������V�9
��&��2��O*@@�g� ���E�����!�Ta��G��� ��R�B�����RI �\ g��K��. 7���� ����8��,dr��B��}���F��)�y��n��3 8�]$D) ��g �'
Hz�"�������`EVl�{ <���q�h��A �-���=��:�m���nlxsN~� ����jo���s�FV������1IB8p�1 ���0��0 U 0 0 U �0 U %0++0 U ���D�!���<�rV6
���0 U #0�Sr������\|~�5N���Q�0 U 0�david@justatheory.com0�LU �C0�?0�; +��70�*0.+"http://www.startssl.com/policy.pdf0��+0��0' StartCom Certification Authority0��This certificate was issued according to the Class 1 Validation requirements of the StartCom CA policy, reliance only for the intended purpose in compliance of the relying party obligations.06U /0-0+�)�'�%http://crl.startssl.com/crtu1-crl.crl0��+��009+0�-http://ocsp.startssl.com/sub/class1/client/ca0B+0�6http://aia.startssl.com/certs/sub.class1.client.ca.crt0#U 0�http://www.startssl.com/0
*�H��
� r��������.��;�-a��������� ��L ��O� � 4���}��F�,^��Y�,�'�d���7:�LR|��s=�9v|\K �� C�@�Y����VW� h Ev����M6� �I�oIJ!y����l_�������� ��3������V [�\�n sD����|�~u����P ��Tn� C��_V!�{A�>��;g���^��,�a�d�X�T��vlO7��L��S>���N*i]m���R�tn����/k0�40� � 0
*�H��
0}1 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1)0'U StartCom Certification Authority0
071024210155Z
171024210155Z0��1 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CA0�"0
*�H��
� 0�
� � ���-��)�.����2����A�UG��o���#G�
��B|N�D�����Rp�M-��B��=o��� -�we�5��J�Qpa>O��.�#������.���_�<���V��
[~�*��*�p�z��~�3�W�G� .�������Ml�r[�<C�e�6���f����q������O���"��u��xf�WN�#�u����i���c�gk��v$����Lb�%�������y��`�����_�{`���xK'G�N��� ���0��0U �0�0U �0 U Sr������\|~�5N���Q�0 U #0�N ��@[�i�0�4hC�A��0f+Z0X0'+0�http://ocsp.startssl.com/ca0-+0�!http://www.startssl.com/sfsca.crt0[U T0R0'�%�#�!http://www.startssl.com/sfsca.crl0'�%�#�!http://crl.startssl.com/sfsca.crl0��U y0w0u +��70f0.+"http://www.startssl.com/policy.pdf04+(http://www.startssl.com/intermediate.pdf0
*�H��
�
�}x�,\�c�^� �#wM�q�}��>UK/��^y��X��y �����f�rMI���B6�1ymQ���������Z���0���& ��;�@��#13q����& ����������o� 6�r��_��;�GO>*I�( 7�4����XS1r3��)!����y��6Ko����t��#
_�w�S�r����
�;�B
A�Dp�(f��s����� �����6%�����.W0J3�:b�C�<�8t X����1�<��C��n�=�����t==�wS���T������~���\�wkB�f�|1���5���zU��P)��(���I��j��VB��!����OfI=b��b�\4�-*em��/��SJm�7���N�����[�]'��@���� D9�Kr>���R��7/����|�o���^I@���'��Pa $ z��9�a'L�)��(�
�I��}v��c�H]����D����*��W�}
m�>Q����|�C.�(,�l��Q�1�o0�k0��0��1 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CAQ�0 + ���0 *�H��
1 *�H��
0 *�H��
1
151024201323Z0# *�H��
1e$��Y�~u������lQ.t�0�� +�71��0��0��1 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CAQ�0�� *�H��
1�����0��1 0 UIL10U
StartCom Ltd.1+0)U "Secure Digital Certificate Signing1806U/StartCom Class 1 Primary Intermediate Client CAQ�0
*�H��
� ��a��R�KW��e��%�V��f0{�r���.:�J�~5 ��f�����G�����o�bgg�d��������C����2�7� ��[�<�>E�}5_�� ��A�/,x0|�u��C���"����N_&9 � {>����Z�`b5[����1��<I�I�`���f��]���#Zl7�"���v!�g�0�%Ib���x�H� o��8�-�� ��!Y��9GA��f�t9��S��=A����>k6s;�^`�������;�7�`�