pgroonga_query_expand: support "text" as synonym column type

pgroonga · Oct 5, 2017 · 04b7ddf · 04b7ddf
1 parent 2e6c055
commit 04b7ddf
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 39 deletions.
diff --git a/expected/function/query-expand/invalid-type.out b/expected/function/query-expand/invalid-type.out
@@ -0,0 +1,7 @@
+CREATE TABLE synonyms (
+  term text PRIMARY KEY,
+  synonym int
+);
+SELECT pgroonga_query_expand('synonyms', 'term', 'synonym', 'PGroonga');
+ERROR:  pgroonga: query_expand: synonyms column isn't text type nor text[] type: <synonyms>.<synonym>
+DROP TABLE synonyms;
diff --git a/expected/function/query-expand/not-text-array-synonyms.out b/expected/function/query-expand/not-text-array-synonyms.out
diff --git a/expected/function/query-expand/text.out b/expected/function/query-expand/text.out
@@ -0,0 +1,14 @@
+CREATE TABLE synonyms (
+  term text,
+  synonym text
+);
+CREATE INDEX synonyms_term_index ON synonyms (term);
+INSERT INTO synonyms VALUES ('PGroonga', 'PGroonga');
+INSERT INTO synonyms VALUES ('PGroonga', 'Groonga PostgreSQL');
+SELECT pgroonga_query_expand('synonyms', 'term', 'synonym', 'PGroonga');
+        pgroonga_query_expand         
+--------------------------------------
+ ((Groonga PostgreSQL) OR (PGroonga))
+(1 row)
+
+DROP TABLE synonyms;
diff --git a/sql/function/query-expand/invalid-type.sql b/sql/function/query-expand/invalid-type.sql
@@ -0,0 +1,8 @@
+CREATE TABLE synonyms (
+  term text PRIMARY KEY,
+  synonym int
+);
+
+SELECT pgroonga_query_expand('synonyms', 'term', 'synonym', 'PGroonga');
+
+DROP TABLE synonyms;
diff --git a/sql/function/query-expand/not-text-array-synonyms.sql b/sql/function/query-expand/not-text-array-synonyms.sql
diff --git a/sql/function/query-expand/text.sql b/sql/function/query-expand/text.sql
@@ -0,0 +1,13 @@
+CREATE TABLE synonyms (
+  term text,
+  synonym text
+);
+
+CREATE INDEX synonyms_term_index ON synonyms (term);
+
+INSERT INTO synonyms VALUES ('PGroonga', 'PGroonga');
+INSERT INTO synonyms VALUES ('PGroonga', 'Groonga PostgreSQL');
+
+SELECT pgroonga_query_expand('synonyms', 'term', 'synonym', 'PGroonga');
+
+DROP TABLE synonyms;
diff --git a/src/pgrn-query-expand.c b/src/pgrn-query-expand.c
@@ -82,8 +82,6 @@ func_query_expander_postgresql(grn_ctx *ctx,
 	{
 		Datum synonymsDatum;
 		bool isNULL;
-		ArrayType *synonymsArray;
-		int i, n;
 
 		if (currentData.scan)
 			tuple = index_getnext(currentData.scan, ForwardScanDirection);
@@ -100,36 +98,58 @@ func_query_expander_postgresql(grn_ctx *ctx,
 		if (isNULL)
 			continue;
 
-		synonymsArray = DatumGetArrayTypeP(synonymsDatum);
-		n = ARR_DIMS(synonymsArray)[0];
-		if (n == 0)
-			continue;
-
-		if (ith_synonyms == 0)
-			GRN_TEXT_PUTC(ctx, expandedTerm, '(');
-		else
-			GRN_TEXT_PUTS(ctx, expandedTerm, " OR ");
-
-		for (i = 1; i <= n; i++)
+		if (currentData.synonymsAttribute->atttypid == TEXTOID)
 		{
-			Datum synonymDatum;
-			bool isNULL;
 			text *synonym;
+			synonym = DatumGetTextP(synonymsDatum);
 
-			synonymDatum = array_ref(synonymsArray, 1, &i, -1,
-									 currentData.synonymsAttribute->attlen,
-									 currentData.synonymsAttribute->attbyval,
-									 currentData.synonymsAttribute->attalign,
-									 &isNULL);
-			synonym = DatumGetTextP(synonymDatum);
-			if (i > 1)
+			if (ith_synonyms == 0)
+				GRN_TEXT_PUTC(ctx, expandedTerm, '(');
+			else
 				GRN_TEXT_PUTS(ctx, expandedTerm, " OR ");
+
 			GRN_TEXT_PUTC(ctx, expandedTerm, '(');
 			GRN_TEXT_PUT(ctx, expandedTerm,
 						 VARDATA_ANY(synonym),
 						 VARSIZE_ANY_EXHDR(synonym));
 			GRN_TEXT_PUTC(ctx, expandedTerm, ')');
 		}
+		else
+		{
+			ArrayType *synonymsArray;
+			int i, n;
+
+			synonymsArray = DatumGetArrayTypeP(synonymsDatum);
+			n = ARR_DIMS(synonymsArray)[0];
+			if (n == 0)
+				continue;
+
+			if (ith_synonyms == 0)
+				GRN_TEXT_PUTC(ctx, expandedTerm, '(');
+			else
+				GRN_TEXT_PUTS(ctx, expandedTerm, " OR ");
+
+			for (i = 1; i <= n; i++)
+			{
+				Datum synonymDatum;
+				bool isNULL;
+				text *synonym;
+
+				synonymDatum = array_ref(synonymsArray, 1, &i, -1,
+										 currentData.synonymsAttribute->attlen,
+										 currentData.synonymsAttribute->attbyval,
+										 currentData.synonymsAttribute->attalign,
+										 &isNULL);
+				synonym = DatumGetTextP(synonymDatum);
+				if (i > 1)
+					GRN_TEXT_PUTS(ctx, expandedTerm, " OR ");
+				GRN_TEXT_PUTC(ctx, expandedTerm, '(');
+				GRN_TEXT_PUT(ctx, expandedTerm,
+							 VARDATA_ANY(synonym),
+							 VARSIZE_ANY_EXHDR(synonym));
+				GRN_TEXT_PUTC(ctx, expandedTerm, ')');
+			}
+		}
 
 		ith_synonyms++;
 
@@ -182,12 +202,14 @@ PGrnFindSynonymsAttribute(const char *tableName,
 		if (strncmp(attribute->attname.data, columnName, columnNameSize) != 0)
 			continue;
 
-		if (attribute->atttypid != TEXTARRAYOID)
+		if (!(attribute->atttypid == TEXTOID ||
+			  attribute->atttypid == TEXTARRAYOID))
 		{
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_NAME),
 					 errmsg("pgroonga: query_expand: "
-							"synonyms column isn't text[] type: <%s>.<%.*s>",
+							"synonyms column isn't text type nor text[] type: "
+							"<%s>.<%.*s>",
 							tableName,
 							(int)columnNameSize, columnName)));
 		}