Style fixes

Artur Zakirov · Artur Zakirov · commit 86bc9c9ef68d · 2016-10-14T12:18:52.000+03:00
diff --git a/rum_ts_utils.c b/rum_ts_utils.c
@@ -1319,19 +1319,19 @@ rum_tsvector_config(PG_FUNCTION_ARGS)
 Datum
 rum_ts_join_pos(PG_FUNCTION_ARGS)
 {
-	Datum	addInfo1 = PG_GETARG_DATUM(0);
-	Datum	addInfo2 = PG_GETARG_DATUM(1);
-	char	*in1 = VARDATA_ANY(addInfo1),
-			*in2 = VARDATA_ANY(addInfo2);
-	bytea	*result;
-	int		count1 = count_pos(in1, VARSIZE_ANY_EXHDR(addInfo1)),
-			count2 = count_pos(in2, VARSIZE_ANY_EXHDR(addInfo2)),
-			countRes = 0,
-			i1 = 0, i2 = 0, size;
-	uint16	pos1, pos2, *pos;
-
-	result = palloc(VARHDRSZ + sizeof(uint16) * (count1 + count2));
-	pos = palloc(sizeof(uint16) * (count1 + count2));
+	Datum		addInfo1 = PG_GETARG_DATUM(0);
+	Datum		addInfo2 = PG_GETARG_DATUM(1);
+	char	   *in1 = VARDATA_ANY(addInfo1),
+			   *in2 = VARDATA_ANY(addInfo2);
+	bytea	   *result;
+	int			count1 = count_pos(in1, VARSIZE_ANY_EXHDR(addInfo1)),
+				count2 = count_pos(in2, VARSIZE_ANY_EXHDR(addInfo2)),
+				countRes = 0,
+				i1 = 0, i2 = 0, size;
+	WordEntryPos pos1, pos2, *pos;
+
+	result = palloc(VARHDRSZ + sizeof(WordEntryPos) * (count1 + count2));
+	pos = palloc(sizeof(WordEntryPos) * (count1 + count2));
 
 	Assert(count1 > 0 && count2 > 0);
 
diff --git a/rumvalidate.c b/rumvalidate.c
@@ -160,7 +160,8 @@ rumvalidate(Oid opclassoid)
 											opcintype, opcintype, INT2OID);
 				break;
 			case RUM_ADDINFO_JOIN:
-				ok = true; /* XXX */
+				ok = check_amproc_signature(procform->amproc, BYTEAOID, false,
+											2, 2, opckeytype, opckeytype);
 				break;
 			default:
 				ereport(INFO,
