Tests fixes

Artur Zakirov · Artur Zakirov · commit c5e3da5d6b4c · 2016-02-15T11:27:45.000+03:00
diff --git a/contrib/shared_ispell/sql/shared_ispell.sql b/contrib/shared_ispell/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,
@@ -28,9 +25,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,
@@ -55,13 +49,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');
diff --git a/contrib/shared_ispell/src/shared_ispell.c b/contrib/shared_ispell/src/shared_ispell.c
@@ -342,7 +342,7 @@ 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 */
@@ -377,7 +377,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 */
