fa70830 isn't correct.

za-arthur · za-arthur · commit 8b55719f90f1 · 2018-05-16T15:33:04.000+03:00
Fix the bug by creating child context of entry-&gt;dictCtx.
diff --git a/Makefile b/Makefile
@@ -23,4 +23,4 @@ endif
 
 # Disabled because these tests require "shared_preload_libraries=shared_ispell",
 # which typical installcheck users do not have (e.g. buildfarm clients).
-installcheck: REGRESS=
+#installcheck: REGRESS=
diff --git a/src/shared_ispell.c b/src/shared_ispell.c
@@ -283,11 +283,15 @@ clean_dict_affix(IspellDict *dict)
  * of the shared memory (using SegmentInfo->lock).
  */
 static void
-init_shared_dict(DictInfo *info, char *dictFile, char *affFile, char *stopFile)
+init_shared_dict(DictInfo *info, MemoryContext infoCntx,
+				 char *dictFile, char *affFile, char *stopFile)
 {
 	int			size;
 	SharedIspellDict *shdict = NULL;
 	SharedStopList *shstop = NULL;
+	MemoryContext oldctx;
+
+	oldctx = MemoryContextSwitchTo(infoCntx);
 
 	/* DICTIONARY + AFFIXES */
 
@@ -413,8 +417,9 @@ init_shared_dict(DictInfo *info, char *dictFile, char *affFile, char *stopFile)
 	else
 		memset(info->stopFile, 0, sizeof(info->stopFile));
 
+	MemoryContextSwitchTo(oldctx);
 	/* save current context as long-lived */
-	info->saveCntx = CurrentMemoryContext;
+	info->infoCntx = infoCntx;
 }
 
 Datum dispell_init(PG_FUNCTION_ARGS);
@@ -576,7 +581,15 @@ dispell_init(PG_FUNCTION_ARGS)
 	/* search if the dictionary is already initialized */
 	LWLockAcquire(segment_info->lock, LW_EXCLUSIVE);
 
-	init_shared_dict(info, dictFile, affFile, stopFile);
+	/*
+	 * Current context is a long lived context. Create child context to store
+	 * DictInfo internal data.
+	 */
+	info->infoCntx = AllocSetContextCreate(CurrentMemoryContext,
+										   "shared_ispell context",
+										   ALLOCSET_DEFAULT_SIZES);
+
+	init_shared_dict(info, info->infoCntx, dictFile, affFile, stopFile);
 
 	LWLockRelease(segment_info->lock);
 
@@ -605,8 +618,7 @@ dispell_lexize(PG_FUNCTION_ARGS)
 	/* do we need to reinit the dictionary? was the dict reset since the lookup */
 	if (timestamp_cmp_internal(info->lookup, segment_info->lastReset) < 0)
 	{
-		DictInfo		saveInfo = *info;
-		MemoryContext	ctx;
+		DictInfo	saveInfo = *info;
 
 		/* relock in exclusive mode */
 		LWLockRelease(segment_info->lock);
@@ -617,15 +629,11 @@ dispell_lexize(PG_FUNCTION_ARGS)
 		 * info here
 		 */
 
-		MemoryContextResetAndDeleteChildren(saveInfo.saveCntx);
-		ctx = MemoryContextSwitchTo(saveInfo.saveCntx);
-
+		MemoryContextResetAndDeleteChildren(saveInfo.infoCntx);
 		MemSet(info, 0, sizeof(*info));
 
-		init_shared_dict(info, saveInfo.dictFile,
+		init_shared_dict(info, saveInfo.infoCntx, saveInfo.dictFile,
 						 saveInfo.affixFile, saveInfo.stopFile);
-
-		MemoryContextSwitchTo(ctx);
 	}
 
 	res = NINormalizeWord(&(info->dict), txt);
diff --git a/src/shared_ispell.h b/src/shared_ispell.h
@@ -69,7 +69,7 @@ typedef struct DictInfo
 	SharedStopList	   *shstop;
 
 	/* MemoryContext of dict local content */
-	MemoryContext		saveCntx;
+	MemoryContext		infoCntx;
 } DictInfo;
 
 #endif
