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

Commitba2530b

Browse files
authored
Merge pull request#269 from postgrespro/PGPRO-8122
PGPRO-8238, PGPRO-8122: Fix build with master at 5df319f3d. Corrected number of args in some functions.
2 parents8a347d6 +d752a80 commitba2530b

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

‎src/include/compat/pg_compat.h

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,12 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
779779
/*
780780
* ExecBRUpdateTriggers()
781781
*/
782-
#ifPG_VERSION_NUM >=150000/* for commit 7103ebb7aae8 */
782+
#ifPG_VERSION_NUM >=160000
783+
#defineExecBRUpdateTriggersCompat(estate,epqstate,relinfo, \
784+
tupleid,fdw_trigtuple,newslot) \
785+
ExecBRUpdateTriggers((estate), (epqstate), (relinfo), (tupleid), \
786+
(fdw_trigtuple), (newslot), NULL, NULL)
787+
#elifPG_VERSION_NUM >=150000/* for commit 7103ebb7aae8 */
783788
#defineExecBRUpdateTriggersCompat(estate,epqstate,relinfo, \
784789
tupleid,fdw_trigtuple,newslot) \
785790
ExecBRUpdateTriggers((estate), (epqstate), (relinfo), (tupleid), \
@@ -809,7 +814,12 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
809814
/*
810815
* ExecBRDeleteTriggers()
811816
*/
812-
#ifPG_VERSION_NUM >=110000
817+
#ifPG_VERSION_NUM >=160000
818+
#defineExecBRDeleteTriggersCompat(estate,epqstate,relinfo,tupleid, \
819+
fdw_trigtuple,epqslot) \
820+
ExecBRDeleteTriggers((estate), (epqstate), (relinfo), (tupleid), \
821+
(fdw_trigtuple), (epqslot), NULL, NULL)
822+
#elifPG_VERSION_NUM >=110000
813823
#defineExecBRDeleteTriggersCompat(estate,epqstate,relinfo,tupleid, \
814824
fdw_trigtuple,epqslot) \
815825
ExecBRDeleteTriggers((estate), (epqstate), (relinfo), (tupleid), \
@@ -1028,15 +1038,19 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
10281038
/*
10291039
* ExecInsertIndexTuples. Since 12 slot contains tupleid.
10301040
* Since 14: new fields "resultRelInfo", "update".
1041+
* Since 16: new bool field "onlySummarizing".
10311042
*/
1032-
#ifPG_VERSION_NUM >=140000
1033-
#defineExecInsertIndexTuplesCompat(resultRelInfo,slot,tupleid,estate,update,noDupError,specConflict,arbiterIndexes) \
1043+
#ifPG_VERSION_NUM >=160000
1044+
#defineExecInsertIndexTuplesCompat(resultRelInfo,slot,tupleid,estate,update,noDupError,specConflict,arbiterIndexes,onlySummarizing) \
1045+
ExecInsertIndexTuples((resultRelInfo), (slot), (estate), (update), (noDupError), (specConflict), (arbiterIndexes), (onlySummarizing))
1046+
#elifPG_VERSION_NUM >=140000
1047+
#defineExecInsertIndexTuplesCompat(resultRelInfo,slot,tupleid,estate,update,noDupError,specConflict,arbiterIndexes,onlySummarizing) \
10341048
ExecInsertIndexTuples((resultRelInfo), (slot), (estate), (update), (noDupError), (specConflict), (arbiterIndexes))
10351049
#elifPG_VERSION_NUM >=120000
1036-
#defineExecInsertIndexTuplesCompat(resultRelInfo,slot,tupleid,estate,update,noDupError,specConflict,arbiterIndexes) \
1050+
#defineExecInsertIndexTuplesCompat(resultRelInfo,slot,tupleid,estate,update,noDupError,specConflict,arbiterIndexes,onlySummarizing) \
10371051
ExecInsertIndexTuples((slot), (estate), (noDupError), (specConflict), (arbiterIndexes))
10381052
#else
1039-
#defineExecInsertIndexTuplesCompat(resultRelInfo,slot,tupleid,estate,update,noDupError,specConflict,arbiterIndexes) \
1053+
#defineExecInsertIndexTuplesCompat(resultRelInfo,slot,tupleid,estate,update,noDupError,specConflict,arbiterIndexes,onlySummarizing) \
10401054
ExecInsertIndexTuples((slot), (tupleid), (estate), (noDupError), (specConflict), (arbiterIndexes))
10411055
#endif
10421056

‎src/utility_stmt_hooking.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,10 +564,14 @@ PathmanCopyFrom(
564564

565565
#ifPG_VERSION_NUM >=140000/* reworked in 1375422c7826 */
566566
/*
567-
* Call ExecInitRangeTable() should be first because in 14 it initializes
567+
* Call ExecInitRangeTable() should be first because in 14+ it initializes
568568
* field "estate->es_result_relations":
569569
*/
570+
#ifPG_VERSION_NUM >=160000
571+
ExecInitRangeTable(estate,range_table,cstate->rteperminfos);
572+
#else
570573
ExecInitRangeTable(estate,range_table);
574+
#endif
571575
estate->es_result_relations=
572576
(ResultRelInfo**)palloc0(list_length(range_table)*sizeof(ResultRelInfo*));
573577
estate->es_result_relations[0]=parent_rri;
@@ -749,7 +753,7 @@ PathmanCopyFrom(
749753
/* ... and create index entries for it */
750754
if (child_rri->ri_NumIndices>0)
751755
recheckIndexes=ExecInsertIndexTuplesCompat(estate->es_result_relation_info,
752-
slot,&(tuple->t_self),estate, false, false,NULL,NIL);
756+
slot,&(tuple->t_self),estate, false, false,NULL,NIL, false);
753757
}
754758
#ifdefPG_SHARDMAN
755759
/* Handle foreign tables */

0 commit comments

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