Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite3448e8

Browse files
committed
Merge branch 'master' into rel_future_strings
2 parents9fedc28 +34922aa commite3448e8

File tree

4 files changed

+37
-15
lines changed

4 files changed

+37
-15
lines changed

‎LICENSE

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
Copyright (c) 2015-2016, Postgres Professional
2-
3-
Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
1+
pg_pathman is released under the PostgreSQL License, a liberal Open Source license, similar to the BSD or MIT licenses.
42

3+
Copyright (c) 2015-2017, Postgres Professional
4+
Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
55
Portions Copyright (c) 1994, The Regents of the University of California
66

77
Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.
88

9-
IN NO EVENT SHALLTHE UNIVERSITY OF CALIFORNIABE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IFTHE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9+
IN NO EVENT SHALLPOSTGRES PROFESSIONALBE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IFPOSTGRES PROFESSIONAL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1010

11-
THE UNIVERSITY OF CALIFORNIASPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, ANDTHE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
11+
POSTGRES PROFESSIONALSPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, ANDPOSTGRES PROFESSIONAL HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ create_hash_partitions(relation REGCLASS,
9999
attributeTEXT,
100100
partitions_countINTEGER,
101101
partition_dataBOOLEAN DEFAULT TRUE,
102-
partition_namesTEXT[] DEFAULTNULL,
103-
tablespacesTEXT[] DEFAULTNULL)
102+
partition_namesTEXT[] DEFAULTNULL,
103+
tablespacesTEXT[] DEFAULTNULL)
104104
```
105105
Performs HASH partitioning for`relation` by integer key`attribute`. The`partitions_count` parameter specifies the number of partitions to create; it cannot be changed afterwards. If`partition_data` is`true` then all the data will be automatically copied from the parent table to partitions. Note that data migration may took a while to finish and the table will be locked until transaction commits. See`partition_table_concurrently()` for a lock-free way to migrate data. Partition creation callback is invoked for each partition if set beforehand (see`set_init_callback()`).
106106

@@ -665,11 +665,11 @@ SELECT disable_pathman_for('range_rel');
665665
```
666666
All sections and data will remain unchanged and will be handled by the standard PostgreSQL inheritance mechanism.
667667

668-
##Feedback
668+
##Feedback
669669
Do not hesitate to post your issues, questions and new ideas at the[issues](https://github.com/postgrespro/pg_pathman/issues) page.
670670

671671
##Authors
672-
Ildar Musin <i.musin@postgrespro.ru> Postgres Professional Ltd., Russia
673-
Alexander Korotkov <a.korotkov@postgrespro.ru> Postgres Professional Ltd., Russia
674-
Dmitry Ivanov <d.ivanov@postgrespro.ru> Postgres Professional Ltd., Russia
672+
Ildar Musin <i.musin@postgrespro.ru> Postgres Professional Ltd., Russia
673+
Alexander Korotkov <a.korotkov@postgrespro.ru> Postgres Professional Ltd., Russia
674+
Dmitry Ivanov <d.ivanov@postgrespro.ru> Postgres Professional Ltd., Russia
675675

‎README.rus.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,6 @@ SELECT disable_pathman_for('range_rel');
488488
Если у вас есть вопросы или предложения, а также если вы обнаружили ошибки, напишите нам в разделе[issues](https://github.com/postgrespro/pg_pathman/issues).
489489

490490
##Авторы
491-
Ильдар Мусин <i.musin@postgrespro.ru> Postgres Professional, Россия
492-
Александр Коротков <a.korotkov@postgrespro.ru> Postgres Professional, Россия
493-
Дмитрий Иванов <d.ivanov@postgrespro.ru> Postgres Professional, Россия
491+
Ильдар Мусин <i.musin@postgrespro.ru> Postgres Professional, Россия
492+
Александр Коротков <a.korotkov@postgrespro.ru> Postgres Professional, Россия
493+
Дмитрий Иванов <d.ivanov@postgrespro.ru> Postgres Professional, Россия

‎src/hooks.c

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include"xact_handling.h"
2626

2727
#include"access/transam.h"
28+
#include"catalog/pg_authid.h"
2829
#include"miscadmin.h"
2930
#include"optimizer/cost.h"
3031
#include"optimizer/restrictinfo.h"
@@ -567,14 +568,35 @@ pathman_post_parse_analysis_hook(ParseState *pstate, Query *query)
567568
/* Check that pg_pathman is the last extension loaded */
568569
if (post_parse_analyze_hook!=pathman_post_parse_analysis_hook)
569570
{
570-
char*spl_value;/* value of "shared_preload_libraries" GUC */
571+
Oidsave_userid;
572+
intsave_sec_context;
573+
boolneed_priv_escalation= !superuser();/* we might be a SU */
574+
char*spl_value;/* value of "shared_preload_libraries" GUC */
571575

576+
/* Do we have to escalate privileges? */
577+
if (need_priv_escalation)
578+
{
579+
/* Get current user's Oid and security context */
580+
GetUserIdAndSecContext(&save_userid,&save_sec_context);
581+
582+
/* Become superuser in order to bypass sequence ACL checks */
583+
SetUserIdAndSecContext(BOOTSTRAP_SUPERUSERID,
584+
save_sec_context |SECURITY_LOCAL_USERID_CHANGE);
585+
}
586+
587+
/* TODO: add a test for this case (non-privileged user etc) */
588+
589+
/* Only SU can read this GUC */
572590
#ifPG_VERSION_NUM >=90600
573591
spl_value=GetConfigOptionByName("shared_preload_libraries",NULL, false);
574592
#else
575593
spl_value=GetConfigOptionByName("shared_preload_libraries",NULL);
576594
#endif
577595

596+
/* Restore user's privileges */
597+
if (need_priv_escalation)
598+
SetUserIdAndSecContext(save_userid,save_sec_context);
599+
578600
ereport(ERROR,
579601
(errmsg("extension conflict has been detected"),
580602
errdetail("shared_preload_libraries = \"%s\"",spl_value),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp