Tests was corrected.

Fixed bugs with the functions shared_ispell_reset(), shared_ispell_dicts(), shared_ispell_stoplists().

Author: Artur Zakirov

Makefile

@@ -4,10 +4,12 @@ MODULE_big = shared_ispell
 OBJS = src/shared_ispell.o
 
 EXTENSION = shared_ispell
-DATA = sql/shared_ispell--1.1.0.sql
+DATA = shared_ispell--1.1.0.sql
 
 REGRESS = shared_ispell
 
+EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/postgresql.conf
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -17,4 +19,7 @@ subdir = contrib/shared_ispell
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
-endif
+endif
+
+installcheck:
+	@echo "installcheck is disabled"

README.md

@@ -40,6 +40,9 @@ the config file (or update the current values)
     # libraries to load
     shared_preload_libraries = 'shared_ispell'
 
+    # known GUC prefixes
+    custom_variable_classes = 'shared_ispell'
+
     # config of the shared memory
     shared_ispell.max_size = 32MB
 

expected/shared_ispell.out

@@ -1,9 +1,22 @@
 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,
                         DictFile=ispell_sample,
-                        AffFile=ispell_sample
+                        AffFile=ispell_sample,
+                        Stopwords=english
 );
 SELECT ts_lexize('shared_ispell', 'skies');
  ts_lexize 
@@ -95,6 +108,18 @@ 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,
@@ -191,3 +216,46 @@ 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
+(2 rows)
+
+SELECT * FROM shared_ispell_stoplists();
+ stop_name | words | bytes 
+-----------+-------+-------
+ english   |   127 |  2112
+(1 row)
+
+SELECT shared_ispell_reset();
+ shared_ispell_reset 
+---------------------
+ 
+(1 row)
+
+SELECT shared_ispell_mem_available();
+ shared_ispell_mem_available 
+-----------------------------
+                     1048528
+(1 row)
+
+SELECT shared_ispell_mem_used();
+ shared_ispell_mem_used 
+------------------------
+                     48
+(1 row)
+

postgresql.conf

@@ -0,0 +1,2 @@
+shared_preload_libraries = 'shared_ispell'
+shared_ispell.max_size = 1MB

sql/shared_ispell--1.1.0.sql renamed to shared_ispell--1.1.0.sql

@@ -1,10 +1,14 @@
 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,
                         DictFile=ispell_sample,
-                        AffFile=ispell_sample
+                        AffFile=ispell_sample,
+                        Stopwords=english
 );
 
 SELECT ts_lexize('shared_ispell', 'skies');
@@ -24,6 +28,9 @@ 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,
@@ -47,3 +54,14 @@ SELECT ts_lexize('shared_hunspell', 'footklubber');
 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 shared_ispell_reset();
+
+SELECT shared_ispell_mem_available();
+SELECT shared_ispell_mem_used();

sql/shared_ispell.sql

@@ -57,10 +57,10 @@
 #include "tsearch/ts_locale.h"
 #include "access/htup_details.h"
 #include "funcapi.h"
+#include "utils/builtins.h"
 
 #include "shared_ispell.h"
 #include "tsearch/dicts/spell.h"
-#include "regex/regguts.h"
 
 PG_MODULE_MAGIC;
 
@@ -247,6 +247,28 @@ get_shared_stop_list(char *stop)
 	return NULL;
 }
 
+/*
+ * Cleares IspellDict fields which are used for store affix list.
+ */
+static void
+clean_dict_affix(IspellDict *dict)
+{
+	dict->maffixes = 0;
+	dict->naffixes = 0;
+	dict->Affix = NULL;
+
+	dict->Suffix = NULL;
+	dict->Prefix = NULL;
+
+	dict->AffixData = NULL;
+	dict->lenAffixData = 0;
+	dict->nAffixData = 0;
+
+	dict->CompoundAffix = NULL;
+
+	dict->avail = 0;
+}
+
 /*
  * Initializes the dictionary for use in backends - checks whether such dictionary
  * and list of stopwords is already used, and if not then parses it and loads it into
@@ -278,6 +300,9 @@ init_shared_dict(DictInfo *info, char *dictFile, char *affFile, char *stopFile)
 	/* lookup if the dictionary (words and affixes) is already loaded in the shared segment */
 	shdict = get_shared_dict(dictFile, affFile);
 
+	/* clear dict affix sources */
+	clean_dict_affix(&(info->dict));
+
 	/* load affix list */
 	NIStartBuild(&(info->dict));
 	NIImportAffixes(&(info->dict), get_tsearch_config_filename(affFile, "affix"));
@@ -397,7 +422,7 @@ PG_FUNCTION_INFO_V1(dispell_list_stoplists);
 
 /*
  * Resets the shared dictionary memory, i.e. removes all the dictionaries. This
- * is the only way to remove dictionaries from the memory - either when when
+ * is the only way to remove dictionaries from the memory - either when
  * a dictionary is no longer needed or needs to be reloaded (e.g. to update
  * list of words / affixes).
  */
@@ -791,7 +816,6 @@ dispell_list_dicts(PG_FUNCTION_ARGS)
 {
 	FuncCallContext	   *funcctx;
 	TupleDesc			tupdesc;
-	AttInMetadata	   *attinmeta;
 	SharedIspellDict   *dict;
 
 	/* init on the first call */
@@ -817,8 +841,7 @@ dispell_list_dicts(PG_FUNCTION_ARGS)
 		 * generate attribute metadata needed later to produce tuples from raw
 		 * C strings
 		 */
-		attinmeta = TupleDescGetAttInMetadata(tupdesc);
-		funcctx->attinmeta = attinmeta;
+		funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
 		funcctx->tuple_desc = tupdesc;
 
 		/* switch back to the old context */
@@ -844,14 +867,14 @@ dispell_list_dicts(PG_FUNCTION_ARGS)
 
 		memset(nulls, 0, sizeof(nulls));
 
-		dictname = (text *) palloc(strlen(dict->dictFile) + VARHDRSZ);
-		affname  = (text *) palloc(strlen(dict->affixFile) + VARHDRSZ);
+		dictname = cstring_to_text(dict->dictFile);
+		affname  = cstring_to_text(dict->affixFile);
 
-		SET_VARSIZE(dictname, strlen(dict->dictFile) + VARHDRSZ);
-		SET_VARSIZE(affname,  strlen(dict->affixFile)  + VARHDRSZ);
+		// SET_VARSIZE(dictname, strlen(dict->dictFile) + VARHDRSZ);
+		// SET_VARSIZE(affname,  strlen(dict->affixFile)  + VARHDRSZ);
 
-		strcpy(VARDATA(dictname), dict->dictFile);
-		strcpy(VARDATA(affname),  dict->affixFile);
+		// strcpy(dictname, dict->dictFile);
+		// strcpy(affname,  dict->affixFile);
 
 		values[0] = PointerGetDatum(dictname);
 		values[1] = PointerGetDatum(affname);
@@ -884,7 +907,6 @@ dispell_list_stoplists(PG_FUNCTION_ARGS)
 {
 	FuncCallContext	   *funcctx;
 	TupleDesc			tupdesc;
-	AttInMetadata	   *attinmeta;
 	SharedStopList	   *stoplist;
 
 	/* init on the first call */
@@ -910,8 +932,7 @@ dispell_list_stoplists(PG_FUNCTION_ARGS)
 		 * generate attribute metadata needed later to produce tuples from raw
 		 * C strings
 		 */
-		attinmeta = TupleDescGetAttInMetadata(tupdesc);
-		funcctx->attinmeta = attinmeta;
+		funcctx->attinmeta = TupleDescGetAttInMetadata(tupdesc);
 		funcctx->tuple_desc = tupdesc;
 
 		/* switch back to the old context */
@@ -936,11 +957,11 @@ dispell_list_stoplists(PG_FUNCTION_ARGS)
 
 		memset(nulls, 0, sizeof(nulls));
 
-		stopname = (text *) palloc(strlen(stoplist->stopFile) + VARHDRSZ);
+		stopname = cstring_to_text(stoplist->stopFile);
 
-		SET_VARSIZE(stopname, strlen(stoplist->stopFile) + VARHDRSZ);
+		// SET_VARSIZE(stopname, strlen(stoplist->stopFile) + VARHDRSZ);
 
-		strcpy(VARDATA(stopname), stoplist->stopFile);
+		// strcpy(VARDATA(stopname), stoplist->stopFile);
 
 		values[0] = PointerGetDatum(stopname);
 		values[1] = UInt32GetDatum(stoplist->stop.len);