@@ -166,14 +166,14 @@ typedef struct tagVariableStatEntry
166
166
Variable * variable ;
167
167
Package * package ;
168
168
Levels levels ;
169
- void * * user_fctx ; /* pointer to funcctx->user_fctx */
169
+ void * * user_fctx ; /* pointer to funcctx->user_fctx */
170
170
} VariableStatEntry ;
171
171
172
172
typedef struct tagPackageStatEntry
173
173
{
174
174
HASH_SEQ_STATUS * status ;
175
175
Levels levels ;
176
- void * * user_fctx ; /* pointer to funcctx->user_fctx */
176
+ void * * user_fctx ; /* pointer to funcctx->user_fctx */
177
177
} PackageStatEntry ;
178
178
179
179
#ifdef PGPRO_EE
@@ -1391,8 +1391,9 @@ remove_package(PG_FUNCTION_ARGS)
1391
1391
1392
1392
package = getPackage (package_name , true);
1393
1393
/*
1394
- * Need to remove variables before packages because here calls hash_seq_term()
1395
- * which uses "entry->status->hashp->frozen" but memory context of "hashp"
1394
+ * Need to remove variables before removing package because
1395
+ * remove_variables_package() calls hash_seq_term() which uses
1396
+ * "entry->status->hashp->frozen" but memory context of "hashp"
1396
1397
* for regular variables can be deleted in removePackageInternal().
1397
1398
*/
1398
1399
remove_variables_package (& variables_stats , package );
@@ -1488,8 +1489,9 @@ remove_packages(PG_FUNCTION_ARGS)
1488
1489
PG_RETURN_VOID ();
1489
1490
1490
1491
/*
1491
- * Need to remove variables before packages because here calls hash_seq_term()
1492
- * which uses "entry->status->hashp->frozen" but memory context of "hashp"
1492
+ * Need to remove variables before removing packages because
1493
+ * remove_variables_all() calls hash_seq_term() which uses
1494
+ * "entry->status->hashp->frozen" but memory context of "hashp"
1493
1495
* for regular variables can be deleted in removePackageInternal().
1494
1496
*/
1495
1497
remove_variables_all (& variables_stats );
@@ -2266,9 +2268,10 @@ removeObject(TransObject *object, TransObjectType type)
2266
2268
}
2267
2269
2268
2270
/*
2269
- * Need to remove variables before state because here calls hash_seq_term()
2270
- * which uses "entry->status->hashp->frozen" but memory context of "hashp"
2271
- * for regular variables can be deleted in removeState()->freeValue().
2271
+ * Need to remove variables before removing state because
2272
+ * remove_variables_variable() calls hash_seq_term() which uses
2273
+ * "entry->status->hashp->frozen" but memory context of "hashp"
2274
+ * for regular variables can be deleted in removeState() in freeValue().
2272
2275
*/
2273
2276
/* Remove object from hash table */
2274
2277
hash_search (hash , object -> name , HASH_REMOVE , & found );
@@ -2358,8 +2361,8 @@ rollbackSavepoint(TransObject *object, TransObjectType type, bool sub)
2358
2361
* Package inside autonomous transaction should not be detected
2359
2362
* as 'object has been changed in upper level' because in this
2360
2363
* case we will remove state in releaseSavepoint() but this
2361
- * state may be used pgvRestoreContext(). So atxlevel should
2362
- * be 0 in case rollback of autonomous transaction.
2364
+ * state may be used in pgvRestoreContext(). So atxlevel should
2365
+ * be 0 in case of rollback of autonomous transaction.
2363
2366
*/
2364
2367
GetActualState (object )-> levels .atxlevel = sub ? getNestLevelATX () : 0 ;
2365
2368
#endif
0 commit comments