shared_ispell uses new version of IspellDict struct

Author: Artur Zakirov

expected/shared_ispell.out

@@ -1,16 +1,4 @@
 CREATE EXTENSION shared_ispell;
-SELECT shared_ispell_mem_available();
- shared_ispell_mem_available 
------------------------------
-                     1048528
-(1 row)
-
-SELECT shared_ispell_mem_used();
- shared_ispell_mem_used 
-------------------------
-                     48
-(1 row)
-
 -- Test ISpell dictionary with ispell affix file
 CREATE TEXT SEARCH DICTIONARY shared_ispell (
                         Template=shared_ispell,
@@ -60,12 +48,6 @@ SELECT ts_lexize('shared_ispell', 'rebooking');
  {booking,book}
 (1 row)
 
-SELECT ts_lexize('shared_ispell', 'rebook');
- ts_lexize 
------------
- 
-(1 row)
-
 SELECT ts_lexize('shared_ispell', 'unbookings');
  ts_lexize 
 -----------
@@ -108,18 +90,6 @@ SELECT ts_lexize('shared_ispell', 'footballyklubber');
  {foot,ball,klubber}
 (1 row)
 
-SELECT shared_ispell_mem_available();
- shared_ispell_mem_available 
------------------------------
-                      980312
-(1 row)
-
-SELECT shared_ispell_mem_used();
- shared_ispell_mem_used 
-------------------------
-                  68264
-(1 row)
-
 -- Test ISpell dictionary with hunspell affix file
 CREATE TEXT SEARCH DICTIONARY shared_hunspell (
                         Template=shared_ispell,
@@ -168,12 +138,6 @@ SELECT ts_lexize('shared_hunspell', 'rebooking');
  {booking,book}
 (1 row)
 
-SELECT ts_lexize('shared_hunspell', 'rebook');
- ts_lexize 
------------
- 
-(1 row)
-
 SELECT ts_lexize('shared_hunspell', 'unbookings');
  ts_lexize 
 -----------
@@ -216,29 +180,17 @@ SELECT ts_lexize('shared_hunspell', 'footballyklubber');
  {foot,ball,klubber}
 (1 row)
 
-SELECT shared_ispell_mem_available();
- shared_ispell_mem_available 
------------------------------
-                      914208
-(1 row)
-
-SELECT shared_ispell_mem_used();
- shared_ispell_mem_used 
-------------------------
-                 134368
-(1 row)
-
-SELECT * FROM shared_ispell_dicts();
-   dict_name   |   affix_name    | words | affixes | bytes 
----------------+-----------------+-------+---------+-------
- ispell_sample | hunspell_sample |     8 |       0 | 66104
- ispell_sample | ispell_sample   |     8 |       0 | 66104
+SELECT dict_name, affix_name, words, affixes FROM shared_ispell_dicts();
+   dict_name   |   affix_name    | words | affixes 
+---------------+-----------------+-------+---------
+ ispell_sample | hunspell_sample |     8 |       7
+ ispell_sample | ispell_sample   |     8 |       7
 (2 rows)
 
-SELECT * FROM shared_ispell_stoplists();
- stop_name | words | bytes 
------------+-------+-------
- english   |   127 |  2112
+SELECT stop_name, words FROM shared_ispell_stoplists();
+ stop_name | words 
+-----------+-------
+ english   |   127
 (1 row)
 
 SELECT shared_ispell_reset();
@@ -247,15 +199,15 @@ SELECT shared_ispell_reset();
 
 (1 row)
 
-SELECT shared_ispell_mem_available();
- shared_ispell_mem_available 
------------------------------
-                     1048528
+SELECT ts_lexize('shared_ispell', 'skies');
+ ts_lexize 
+-----------
+ {sky}
 (1 row)
 
-SELECT shared_ispell_mem_used();
- shared_ispell_mem_used 
-------------------------
-                     48
+SELECT ts_lexize('shared_hunspell', 'skies');
+ ts_lexize 
+-----------
+ {sky}
 (1 row)
 

sql/shared_ispell.sql

@@ -1,8 +1,5 @@
 CREATE EXTENSION shared_ispell;
 
-SELECT shared_ispell_mem_available();
-SELECT shared_ispell_mem_used();
-
 -- Test ISpell dictionary with ispell affix file
 CREATE TEXT SEARCH DICTIONARY shared_ispell (
                         Template=shared_ispell,
@@ -18,7 +15,6 @@ SELECT ts_lexize('shared_ispell', 'foot');
 SELECT ts_lexize('shared_ispell', 'foots');
 SELECT ts_lexize('shared_ispell', 'rebookings');
 SELECT ts_lexize('shared_ispell', 'rebooking');
-SELECT ts_lexize('shared_ispell', 'rebook');
 SELECT ts_lexize('shared_ispell', 'unbookings');
 SELECT ts_lexize('shared_ispell', 'unbooking');
 SELECT ts_lexize('shared_ispell', 'unbook');
@@ -28,9 +24,6 @@ SELECT ts_lexize('shared_ispell', 'footballklubber');
 SELECT ts_lexize('shared_ispell', 'ballyklubber');
 SELECT ts_lexize('shared_ispell', 'footballyklubber');
 
-SELECT shared_ispell_mem_available();
-SELECT shared_ispell_mem_used();
-
 -- Test ISpell dictionary with hunspell affix file
 CREATE TEXT SEARCH DICTIONARY shared_hunspell (
                         Template=shared_ispell,
@@ -45,7 +38,6 @@ SELECT ts_lexize('shared_hunspell', 'foot');
 SELECT ts_lexize('shared_hunspell', 'foots');
 SELECT ts_lexize('shared_hunspell', 'rebookings');
 SELECT ts_lexize('shared_hunspell', 'rebooking');
-SELECT ts_lexize('shared_hunspell', 'rebook');
 SELECT ts_lexize('shared_hunspell', 'unbookings');
 SELECT ts_lexize('shared_hunspell', 'unbooking');
 SELECT ts_lexize('shared_hunspell', 'unbook');
@@ -55,13 +47,10 @@ SELECT ts_lexize('shared_hunspell', 'footballklubber');
 SELECT ts_lexize('shared_hunspell', 'ballyklubber');
 SELECT ts_lexize('shared_hunspell', 'footballyklubber');
 
-SELECT shared_ispell_mem_available();
-SELECT shared_ispell_mem_used();
-
-SELECT * FROM shared_ispell_dicts();
-SELECT * FROM shared_ispell_stoplists();
+SELECT dict_name, affix_name, words, affixes FROM shared_ispell_dicts();
+SELECT stop_name, words FROM shared_ispell_stoplists();
 
 SELECT shared_ispell_reset();
 
-SELECT shared_ispell_mem_available();
-SELECT shared_ispell_mem_used();
+SELECT ts_lexize('shared_ispell', 'skies');
+SELECT ts_lexize('shared_hunspell', 'skies');

src/shared_ispell.c

@@ -179,14 +179,13 @@ ispell_shmem_startup()
 	segment = ShmemInitStruct(SEGMENT_NAME,
 							max_ispell_mem_size(),
 							&found);
+	segment_info = (SegmentInfo *) segment;
 
 	/* Was the shared memory segment already initialized? */
 	if (!found)
 	{
 		memset(segment, 0, max_ispell_mem_size());
 
-		segment_info = (SegmentInfo *) segment;
-
 		#if PG_VERSION_NUM >= 90600
 		segment_info->lock = &(GetNamedLWLockTranche("shared_ispell"))->lock;
 		#else
@@ -265,6 +264,9 @@ clean_dict_affix(IspellDict *dict)
 	dict->nAffixData = 0;
 
 	dict->CompoundAffix = NULL;
+	dict->CompoundAffixFlags = NULL;
+	dict->nCompoundAffixFlag = 0;
+	dict->mCompoundAffixFlag = 0;
 
 	dict->avail = 0;
 }
@@ -316,7 +318,13 @@ init_shared_dict(DictInfo *info, char *dictFile, char *affFile, char *stopFile)
 		NIImportDictionary(dict, get_tsearch_config_filename(dictFile, "dict"));
 
 		dict->usecompound = info->dict.usecompound;
-		memcpy(dict->flagval, &(info->dict.flagval), 65000);
+
+		dict->nCompoundAffixFlag = dict->mCompoundAffixFlag =
+			info->dict.nCompoundAffixFlag;
+		dict->CompoundAffixFlags = (CompoundAffixFlag *) palloc0(
+			dict->nCompoundAffixFlag * sizeof(CompoundAffixFlag));
+		memcpy(dict->CompoundAffixFlags, info->dict.CompoundAffixFlags,
+			   dict->nCompoundAffixFlag * sizeof(CompoundAffixFlag));
 
 		/*
 		 * If affix->useFlagAliases == true then AffixData is generated
@@ -342,11 +350,12 @@ init_shared_dict(DictInfo *info, char *dictFile, char *affFile, char *stopFile)
 		/* check available space in shared segment */
 		size = sizeIspellDict(dict, dictFile, affFile);
 		if (size > segment_info->available)
-			elog(ERROR, "shared dictionary %s.dict / %s.affix needs %d B, only %ld B available",
+			elog(ERROR, "shared dictionary %s.dict / %s.affix needs %d B, only %zd B available",
 				dictFile, affFile, size, segment_info->available);
 
 		/* fine, there's enough space - copy the dictionary */
 		shdict = copyIspellDict(dict, dictFile, affFile, size, dict->nspell);
+		shdict->dict.naffixes = info->dict.naffixes;
 
 		/* add the new dictionary to the linked list (of SharedIspellDict structures) */
 		shdict->next = segment_info->shdict;
@@ -377,7 +386,7 @@ init_shared_dict(DictInfo *info, char *dictFile, char *affFile, char *stopFile)
 
 			size = sizeStopList(&stoplist, stopFile);
 			if (size > segment_info->available)
-				elog(ERROR, "shared stoplist %s.stop needs %d B, only %ld B available",
+				elog(ERROR, "shared stoplist %s.stop needs %d B, only %zd B available",
 					stopFile, size, segment_info->available);
 
 			/* fine, there's enough space - copy the stoplist */