Issue #13. Fix result array size.

Author: Artur Zakirov

src/rum_ts_utils.c

@@ -1519,13 +1519,13 @@ rum_ts_join_pos(PG_FUNCTION_ARGS)
 	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;
+				countRes = 0;
+	int			i1 = 0, i2 = 0;
+	Size		size;
 	WordEntryPos pos1 = 0,
 				pos2 = 0,
 			   *pos;
 
-	result = palloc(VARHDRSZ + sizeof(WordEntryPos) * (count1 + count2));
 	pos = palloc(sizeof(WordEntryPos) * (count1 + count2));
 
 	Assert(count1 > 0 && count2 > 0);
@@ -1577,6 +1577,11 @@ rum_ts_join_pos(PG_FUNCTION_ARGS)
 		i2++;
 	}
 
+	Assert(countRes <= (count1 + count2));
+
+	size = VARHDRSZ + 2 * sizeof(WordEntryPos) * countRes;
+	result = palloc(size);
+
 	size = compress_pos(result->vl_dat, pos, countRes) + VARHDRSZ;
 	SET_VARSIZE(result, size);
 

tests/pglist_tests.py

@@ -83,21 +83,14 @@ def test_order_by(self):
         """Tests SELECT constructions to 'pglist' base"""
         try:
             self.init_pglist_data(self.node)
-            indexes = self.node.execute(
-                "pglist",
-                "SELECT count(*) FROM pg_class c "
-                "  JOIN pg_index i ON i.indexrelid = c.oid"
-                "  JOIN pg_class c2 ON i.indrelid = c2.oid"
-                "  WHERE c.relkind = 'i' AND c2.relname = 'pglist' AND "
-                "    c.relname = 'rumidx_orderby_sent'")
-            if indexes[0][0] == 0:
-                print("Creating index 'rumidx_orderby_sent'")
 
-                self.node.safe_psql(
-                    "pglist",
-                    "CREATE INDEX rumidx_orderby_sent ON pglist USING rum ("
-                    "  fts rum_tsvector_timestamp_ops, sent) "
-                    "  WITH (attach=sent, to=fts, order_by_attach=t)")
+            print("Creating index 'rumidx_orderby_sent'")
+
+            self.node.safe_psql(
+                "pglist",
+                "CREATE INDEX rumidx_orderby_sent ON pglist USING rum ("
+                "  fts rum_tsvector_timestamp_ops, sent) "
+                "  WITH (attach=sent, to=fts, order_by_attach=t)")
 
             print("Running tests")
 
@@ -121,6 +114,29 @@ def test_order_by(self):
                 ),
                 b'222813\n'
             )
+
+            self.node.safe_psql("pglist", "DROP INDEX rumidx_orderby_sent");
+
+            print("Creating index 'pglist_rum_idx'")
+
+            self.node.safe_psql(
+                "pglist",
+                "CREATE INDEX pglist_rum_idx ON pglist USING rum ("
+                "  fts rum_tsvector_ops)")
+
+            print("Running tests")
+
+            self.assertEqual(
+                self.node.execute(
+                    "pglist",
+                    "SELECT id FROM pglist "
+                    "WHERE fts @@ to_tsquery('english', 'postgres:*') "
+                    "ORDER BY fts <=> to_tsquery('english', 'postgres:*') "
+                    "LIMIT 9"
+                )[0][0],
+                816114
+            )
+
         except Exception as e:
             self.printlog(os.path.join(self.node.logs_dir, "postgresql.log"))
             raise e