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

Commit726d27c

Browse files
committed
Fix for 'triggered dynamic library load' bug.
This is fix for a very rare case when we don't load aqo as shared library duringstartup perform 'CREATE EXTENSION aqo' command in the backend and the firstquery in another backend is 'UPDATE aqo_queries...'. In this case AFTER UPDATE triggercauses AQO _PG_init() routine call. All hooks will be initialized at the end of UPDATEquery execution. Thereby, ExecutorEnd hook will be called without the ExecutorStart.
1 parente3941d2 commit726d27c

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

‎aqo.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ _PG_init(void)
9898
ExplainOnePlan_hook=print_into_explain;
9999

100100
init_deactivated_queries_storage();
101-
102101
AQOMemoryContext=AllocSetContextCreate(TopMemoryContext,"AQOMemoryContext",ALLOCSET_DEFAULT_SIZES);
103102
}
104103

‎postprocessing.c

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static void update_query_stat_row(double *et, int *et_size,
4545
doublecardinality_error,
4646
int64*n_exec);
4747
staticvoidStoreToQueryContext(QueryDesc*queryDesc);
48-
staticvoidExtractFromQueryContext(QueryDesc*queryDesc);
48+
staticboolExtractFromQueryContext(QueryDesc*queryDesc);
4949
staticvoidRemoveFromQueryContext(QueryDesc*queryDesc);
5050

5151
/*
@@ -408,7 +408,8 @@ learn_query_stat(QueryDesc *queryDesc)
408408
QueryStat*stat=NULL;
409409
instr_timeendtime;
410410

411-
ExtractFromQueryContext(queryDesc);
411+
if (!ExtractFromQueryContext(queryDesc))
412+
gotoend;
412413

413414
if (query_context.explain_only)
414415
{
@@ -486,6 +487,7 @@ learn_query_stat(QueryDesc *queryDesc)
486487
}
487488
RemoveFromQueryContext(queryDesc);
488489

490+
end:
489491
if (prev_ExecutorEnd_hook)
490492
prev_ExecutorEnd_hook(queryDesc);
491493
else
@@ -495,7 +497,6 @@ learn_query_stat(QueryDesc *queryDesc)
495497
* standard_ExecutorEnd clears the queryDesc->planstate. After this point no
496498
* one operation with the plan can be made.
497499
*/
498-
//ExtractFromQueryContext(queryDesc);
499500
}
500501

501502
/*
@@ -531,20 +532,27 @@ StoreToQueryContext(QueryDesc *queryDesc)
531532
/*
532533
* Restore AQO data, related to the query.
533534
*/
534-
staticvoid
535+
staticbool
535536
ExtractFromQueryContext(QueryDesc*queryDesc)
536537
{
537538
EphemeralNamedRelationenr;
538-
intqcsize=sizeof(QueryContextData);
539-
MemoryContextoldCxt;
540539

541-
Assert(queryDesc->queryEnv!=NULL);
540+
/* This is a very rare case when we don't load aqo as shared library during
541+
* startup perform 'CREATE EXTENSION aqo' command in the backend and first
542+
* query in any another backend is 'UPDATE aqo_queries...'. In this case
543+
* ExecutorEnd hook will be executed without ExecutorStart hook.
544+
*/
545+
if (queryDesc->queryEnv==NULL)
546+
return false;
542547

543-
oldCxt=MemoryContextSwitchTo(AQOMemoryContext);
544548
enr=get_ENR(queryDesc->queryEnv,AQOPrivateData);
545-
memcpy(&query_context,enr->reldata,qcsize);
546549

547-
MemoryContextSwitchTo(oldCxt);
550+
if (enr==NULL)
551+
return false;
552+
553+
memcpy(&query_context,enr->reldata,sizeof(QueryContextData));
554+
555+
return true;
548556
}
549557

550558
staticvoid

0 commit comments

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