postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-28 01:30:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix segfault in cagg_update_view_definition

Browse Source 
Since relation_close will decrease the reference counter this
might lead to the relation being freed while we are still using
the view query. This patch changes cagg_update_view_definition
to release the relations later and also keeps the locks till
the end of the transaction.
This commit is contained in:
Sven Klemm 2020-06-30 16:38:29 +02:00 committed by Sven Klemm
parent 4e41672161
commit 3e5e5255f2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tsl/src/continuous_aggs/create.c
View File

@ -1802,7 +1802,6 @@ cagg_update_view_definition(ContinuousAgg *agg, Hypertable *mat_ht,
Oid user_view_oid = relation_oid(agg->data.user_view_schema, agg->data.user_view_name);
Relation user_view_rel = relation_open(user_view_oid, AccessShareLock);
Query *user_query = get_view_query(user_view_rel);
relation_close(user_view_rel, AccessShareLock);
FinalizeQueryInfo fqi;
MatTableColumnInfo mattblinfo;
@ -1823,7 +1822,6 @@ cagg_update_view_definition(ContinuousAgg *agg, Hypertable *mat_ht,
rtable = list_delete_first(rtable);
direct_query->rtable = list_delete_first(rtable);
OffsetVarNodes((Node *) direct_query, -2, 0);
relation_close(direct_view_rel, AccessShareLock);
Assert(list_length(direct_query->rtable) == 1);
CAggTimebucketInfo timebucket_exprinfo = cagg_validate_query(direct_query);
@ -1852,6 +1850,10 @@ cagg_update_view_definition(ContinuousAgg *agg, Hypertable *mat_ht,
view_tle->resname = user_tle->resname;
}
/* keep locks until end of transaction */
relation_close(direct_view_rel, NoLock);
relation_close(user_view_rel, NoLock);
SWITCH_TO_TS_USER(NameStr(agg->data.user_view_schema), uid, saved_uid, sec_ctx);
StoreViewQuery(user_view_oid, view_query, true);
CommandCounterIncrement();