[PGPRO-12159] Code review.

Refactoring has been performed. The code is
divided into more logical blocks using added
functions and macros with clear names.

Tags: rum

Author: Arseny Kositsyn

Makefile

@@ -45,14 +45,14 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
-$(EXTENSION)--$(EXTVERSION).sql: rum_init.sql
-	cat $^ > $@
-
 # rum_debug_funcs tests only for enterprise
 ifneq ($(PGPRO_EDITION), enterprise)
 	REGRESS := $(filter-out rum_debug_funcs, $(REGRESS))
 endif
 
+$(EXTENSION)--$(EXTVERSION).sql: rum_init.sql
+	cat $^ > $@
+
 #
 # On versions 12 and 13 isolation tests cannot be run using pgxs.
 # Override installcheck target to avoid the error. This is just a

expected/rum_debug_funcs.out

@@ -8013,7 +8013,7 @@ SELECT * FROM rum_leaf_data_page_items('test_with_addinfo_idx_true', 22);
 (736 rows)
 
 DROP TABLE test_debug_table;
--- Проверяем с позициями лексем
+-- Check with the positions of the lexemes
 CREATE TABLE test_debug_table_with_weight(t text, a tsvector, r text);
 CREATE FUNCTION fill_test_debug_weight_trigger() RETURNS trigger AS $$
 begin
@@ -8638,12 +8638,12 @@ SELECT * FROM rum_page_opaque_info('test_with_weight_idx', 21);
 (1 row)
 
 SELECT * FROM rum_internal_data_page_items('test_with_weight_idx', 21);
- is_high_key | block_number | tuple_id | add_info_is_null |                      add_info                       
--------------+--------------+----------+------------------+-----------------------------------------------------
+ is_high_key | block_number | tuple_id | add_info_is_null |                    add_info                    
+-------------+--------------+----------+------------------+------------------------------------------------
  t           |              | (0,0)    | t                | 
- f           |           23 | (39,43)  | f                | high key positions in posting tree is not supported
- f           |           22 | (74,9)   | f                | high key positions in posting tree is not supported
- f           |           24 | (98,9)   | f                | high key positions in posting tree is not supported
+ f           |           23 | (39,43)  | f                | varlena types in posting tree is not supported
+ f           |           22 | (74,9)   | f                | varlena types in posting tree is not supported
+ f           |           24 | (98,9)   | f                | varlena types in posting tree is not supported
  f           |           25 | (0,0)    | t                | 
 (5 rows)
 
@@ -8654,9 +8654,9 @@ SELECT * FROM rum_page_opaque_info('test_with_weight_idx', 22);
 (1 row)
 
 SELECT * FROM rum_leaf_data_page_items('test_with_weight_idx', 22);
- is_high_key | tuple_id | add_info_is_null |                      add_info                       
--------------+----------+------------------+-----------------------------------------------------
- t           | (74,9)   | f                | high key positions in posting tree is not supported
+ is_high_key | tuple_id | add_info_is_null |                    add_info                    
+-------------+----------+------------------+------------------------------------------------
+ t           | (74,9)   | f                | varlena types in posting tree is not supported
  f           | (40,1)   | f                | 1A,9
  f           | (40,2)   | f                | 1A,9
  f           | (40,3)   | f                | 1A,9

expected/rum_debug_funcs_1.out

@@ -7273,7 +7273,7 @@ SELECT * FROM rum_leaf_data_page_items('test_with_addinfo_idx_true', 22);
 (763 rows)
 
 DROP TABLE test_debug_table;
--- Проверяем с позициями лексем
+-- Check with the positions of the lexemes
 CREATE TABLE test_debug_table_with_weight(t text, a tsvector, r text);
 CREATE FUNCTION fill_test_debug_weight_trigger() RETURNS trigger AS $$
 begin

rum_init.sql

@@ -1752,51 +1752,101 @@ CREATE FUNCTION rum_page_opaque_info(
 AS 'MODULE_PATHNAME', 'rum_page_opaque_info'
 LANGUAGE C STRICT PARALLEL SAFE;
 
-CREATE FUNCTION rum_leaf_data_page_items(
-    IN rel_name text,
-    IN blk_num int4,
-    OUT is_high_key bool,
-    OUT tuple_id tid,
-    OUT add_info_is_null bool,
-    OUT add_info varchar)
+CREATE OR REPLACE FUNCTION
+rum_page_items_info(rel_name text, blk_num int4, page_type int4)
 RETURNS SETOF record
-AS 'MODULE_PATHNAME', 'rum_leaf_data_page_items'
-LANGUAGE C STRICT PARALLEL SAFE;
+AS 'MODULE_PATHNAME', 'rum_page_items_info'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION rum_leaf_data_page_items(
+    rel_name text, 
+    blk_num int4
+)
+RETURNS TABLE(
+  is_high_key bool, 
+  tuple_id tid, 
+  add_info_is_null bool, 
+  add_info varchar
+) 
+AS $$
+    SELECT * 
+    FROM rum_page_items_info(rel_name, blk_num, 0)
+        AS rum_page_items_info(
+            is_high_key bool, 
+            tuple_id tid, 
+            add_info_is_null bool, 
+            add_info varchar
+        );
+$$ LANGUAGE sql;
 
 CREATE FUNCTION rum_internal_data_page_items(
-    IN rel_name text,
-    IN blk_num int4,
-    OUT is_high_key bool,
-    OUT block_number int4,
-    OUT tuple_id tid,
-    OUT add_info_is_null bool,
-    OUT add_info varchar)
-RETURNS SETOF record
-AS 'MODULE_PATHNAME', 'rum_internal_data_page_items'
-LANGUAGE C STRICT PARALLEL SAFE;
+    rel_name text, 
+    blk_num int4
+)
+RETURNS TABLE(
+    is_high_key bool, 
+    block_number int4, 
+    tuple_id tid, 
+    add_info_is_null bool, 
+    add_info varchar
+) 
+AS $$
+    SELECT * 
+    FROM rum_page_items_info(rel_name, blk_num, 1)
+        AS rum_page_items_info(
+            is_high_key bool, 
+            block_number int4, 
+            tuple_id tid, 
+            add_info_is_null bool, 
+            add_info varchar
+        );
+$$ LANGUAGE sql;
 
 CREATE FUNCTION rum_leaf_entry_page_items(
-    IN rel_name text,
-    IN blk_num int4,
-    OUT key varchar,
-    OUT attrnum int4,
-    OUT category varchar,
-    OUT tuple_id tid,
-    OUT add_info_is_null bool,
-    OUT add_info varchar,
-    OUT is_postring_tree bool,
-    OUT postring_tree_root int4)
-RETURNS SETOF record
-AS 'MODULE_PATHNAME', 'rum_leaf_entry_page_items'
-LANGUAGE C STRICT PARALLEL SAFE;
+    rel_name text, 
+    blk_num int4
+)
+RETURNS TABLE(
+    key varchar, 
+    attrnum int4, 
+    category varchar, 
+    tuple_id tid, 
+    add_info_is_null bool, 
+    add_info varchar, 
+    is_postring_tree bool, 
+    postring_tree_root int4
+) 
+AS $$
+  SELECT *
+  FROM rum_page_items_info(rel_name, blk_num, 2)
+      AS rum_page_items_info(
+          key varchar,
+          attrnum int4,
+          category varchar,
+          tuple_id tid,
+          add_info_is_null bool,
+          add_info varchar,
+          is_postring_tree bool,
+          postring_tree_root int4
+      );
+$$ LANGUAGE sql;
 
 CREATE FUNCTION rum_internal_entry_page_items(
-    IN rel_name text,
-    IN blk_num int4,
-    OUT key varchar,
-    OUT attrnum int4,
-    OUT category varchar,
-    OUT down_link int4)
-RETURNS SETOF record
-AS 'MODULE_PATHNAME', 'rum_internal_entry_page_items'
-LANGUAGE C STRICT PARALLEL SAFE;
+    rel_name text, 
+    blk_num int4
+)
+RETURNS TABLE(
+    key varchar, 
+    attrnum int4, 
+    category varchar, 
+    down_link int4) 
+AS $$
+  SELECT *
+  FROM rum_page_items_info(rel_name, blk_num, 3)
+      AS rum_page_items_info(
+          key varchar, 
+          attrnum int4, 
+          category varchar, 
+          down_link int4
+      );
+$$ LANGUAGE sql;

sql/rum_debug_funcs.sql

@@ -85,7 +85,7 @@ SELECT * FROM rum_leaf_data_page_items('test_with_addinfo_idx_true', 22);
 
 DROP TABLE test_debug_table;
 
--- Проверяем с позициями лексем
+-- Check with the positions of the lexemes
 CREATE TABLE test_debug_table_with_weight(t text, a tsvector, r text);
 
 CREATE FUNCTION fill_test_debug_weight_trigger() RETURNS trigger AS $$