Rewrite some code and tests

Author: ildus

Makefile

@@ -17,14 +17,16 @@ endif
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 
-gen_parser:
+serialize.c deserialize.c: gen_parser.py nodes.h
 	python gen_parser.py nodes.h `$(PG_CONFIG) --includedir-server`
 else
 subdir = contrib/sr_plan
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 
-gen_parser:
+serialize.c deserialize.c: gen_parser.py nodes.h
 	python gen_parser.py nodes.h '$(top_srcdir)/src/include'
 endif
+
+all: serialize.c

expected/sr_plan.out

@@ -53,11 +53,21 @@ SELECT * FROM test_table WHERE test_attr1 = 15;
 ------------+------------
 (0 rows)
 
+SELECT enable, valid, query FROM sr_plans;
+ enable | valid |                        query                        
+--------+-------+-----------------------------------------------------
+ t      | t     | SELECT * FROM test_table WHERE test_attr1 = _p(10);
+ t      | t     | SELECT * FROM test_table WHERE test_attr1 = 10;
+(2 rows)
+
 DROP TABLE test_table;
-WARNING:  Invalidate saved plan with query:
-	SELECT * FROM test_table WHERE test_attr1 = _p(10);
-WARNING:  Invalidate saved plan with query:
-	SELECT * FROM test_table WHERE test_attr1 = 10;
+SELECT enable, valid, query FROM sr_plans;
+ enable | valid |                        query                        
+--------+-------+-----------------------------------------------------
+ f      | f     | SELECT * FROM test_table WHERE test_attr1 = _p(10);
+ f      | f     | SELECT * FROM test_table WHERE test_attr1 = 10;
+(2 rows)
+
 CREATE TABLE test_table(test_attr1 int, test_attr2 int);
 SELECT * FROM test_table WHERE test_attr1 = _p(10);
  test_attr1 | test_attr2 

nodes.h

@@ -1,9 +1,6 @@
 #define __attribute__(x)
 #include "pg_config.h"
-
-#if PG_VERSION_NUM < 110000
 typedef int __int128
-#endif
 
 #include "postgres.h"
 #include "nodes/plannodes.h"

sql/sr_plan.sql

@@ -18,7 +18,10 @@ SELECT * FROM test_table WHERE test_attr1 = _p(15);
 SELECT * FROM test_table WHERE test_attr1 = 10;
 SELECT * FROM test_table WHERE test_attr1 = 15;
 
+SELECT enable, valid, query FROM sr_plans;
 DROP TABLE test_table;
+SELECT enable, valid, query FROM sr_plans;
+
 CREATE TABLE test_table(test_attr1 int, test_attr2 int);
 
 SELECT * FROM test_table WHERE test_attr1 = _p(10);