fix tests

ildus · ildus · commit 7c93bc9aa8c8 · 2019-07-05T17:06:35.000+02:00
diff --git a/src/include/catalog/pg_attr_compression.h b/src/include/catalog/pg_attr_compression.h
@@ -25,7 +25,7 @@
  *		typedef struct FormData_pg_attr_compression
  * ----------------
  */
-CATALOG(pg_attr_compression,4189,AttrCompressionRelationId)
+CATALOG(pg_attr_compression,5555,AttrCompressionRelationId)
 {
 	Oid			acoid;						/* attribute compression oid */
 	NameData	acname;						/* name of compression AM */
diff --git a/src/include/catalog/pg_type.dat b/src/include/catalog/pg_type.dat
@@ -578,7 +578,7 @@
   typcategory => 'P', typinput => 'index_am_handler_in',
   typoutput => 'index_am_handler_out', typreceive => '-', typsend => '-',
   typalign => 'i' },
-{ oid => '4190',
+{ oid => '5559',
   typname => 'compression_am_handler', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'compression_am_handler_in',
   typoutput => 'compression_am_handler_out', typreceive => '-', typsend => '-',
diff --git a/src/include/catalog/toasting.h b/src/include/catalog/toasting.h
@@ -75,7 +75,7 @@ DECLARE_TOAST(pg_trigger, 2336, 2337);
 DECLARE_TOAST(pg_ts_dict, 4169, 4170);
 DECLARE_TOAST(pg_type, 4171, 4172);
 DECLARE_TOAST(pg_user_mapping, 4173, 4174);
-DECLARE_TOAST(pg_attr_compression, 4187, 4188);
+DECLARE_TOAST(pg_attr_compression, 5556, 5558);
 
 /* shared catalogs */
 DECLARE_TOAST(pg_authid, 4175, 4176);
diff --git a/src/test/regress/expected/create_cm.out b/src/test/regress/expected/create_cm.out
@@ -134,7 +134,7 @@ INSERT INTO cmtest VALUES(repeat('1234567890',1001));
 SELECT * FROM cmtest_deps;
  classid | objsubid | refclassid | refobjsubid | deptype 
 ---------+----------+------------+-------------+---------
-    1259 |        1 |       4189 |           0 | n
+    1259 |        1 |       5555 |           0 | n
 (1 row)
 
 -- check decompression
@@ -178,8 +178,8 @@ SELECT pg_column_compression('cmtest', 'f1');
 SELECT * FROM cmtest_deps;
  classid | objsubid | refclassid | refobjsubid | deptype 
 ---------+----------+------------+-------------+---------
-    1259 |        1 |       4189 |           0 | n
-    4189 |        0 |       1259 |           1 | i
+    1259 |        1 |       5555 |           0 | n
+    5555 |        0 |       1259 |           1 | i
 (2 rows)
 
 -- rewrite
@@ -204,8 +204,8 @@ SELECT pg_column_compression('cmtest', 'f1');
 SELECT * FROM cmtest_deps;
  classid | objsubid | refclassid | refobjsubid | deptype 
 ---------+----------+------------+-------------+---------
-    4189 |        0 |       1259 |           1 | i
-    4189 |        0 |       1259 |           1 | i
+    5555 |        0 |       1259 |           1 | i
+    5555 |        0 |       1259 |           1 | i
 (2 rows)
 
 -- rewrite
@@ -231,7 +231,7 @@ SELECT pg_column_compression('cmtest', 'f1');
 SELECT * FROM cmtest_deps;
  classid | objsubid | refclassid | refobjsubid | deptype 
 ---------+----------+------------+-------------+---------
-    1259 |        1 |       4189 |           0 | n
+    1259 |        1 |       5555 |           0 | n
 (1 row)
 
 -- no rewrites
@@ -244,9 +244,9 @@ INSERT INTO cmtest VALUES(repeat('1234567890',1006));
 SELECT * FROM cmtest_deps;
  classid | objsubid | refclassid | refobjsubid | deptype 
 ---------+----------+------------+-------------+---------
-    1259 |        1 |       4189 |           0 | n
-    4189 |        0 |       1259 |           1 | i
-    4189 |        0 |       1259 |           1 | i
+    1259 |        1 |       5555 |           0 | n
+    5555 |        0 |       1259 |           1 | i
+    5555 |        0 |       1259 |           1 | i
 (3 rows)
 
 -- remove function and related event trigger
diff --git a/src/test/regress/expected/create_cm_1.out b/src/test/regress/expected/create_cm_1.out
@@ -134,7 +134,7 @@ INSERT INTO cmtest VALUES(repeat('1234567890',1001));
 SELECT * FROM cmtest_deps;
  classid | objsubid | refclassid | refobjsubid | deptype 
 ---------+----------+------------+-------------+---------
-    1259 |        1 |       4189 |           0 | n
+    1259 |        1 |       5555 |           0 | n
 (1 row)
 
 -- check decompression
@@ -178,8 +178,8 @@ SELECT pg_column_compression('cmtest', 'f1');
 SELECT * FROM cmtest_deps;
  classid | objsubid | refclassid | refobjsubid | deptype 
 ---------+----------+------------+-------------+---------
-    1259 |        1 |       4189 |           0 | n
-    4189 |        0 |       1259 |           1 | i
+    1259 |        1 |       5555 |           0 | n
+    5555 |        0 |       1259 |           1 | i
 (2 rows)
 
 -- rewrite
@@ -204,8 +204,8 @@ SELECT pg_column_compression('cmtest', 'f1');
 SELECT * FROM cmtest_deps;
  classid | objsubid | refclassid | refobjsubid | deptype 
 ---------+----------+------------+-------------+---------
-    4189 |        0 |       1259 |           1 | i
-    4189 |        0 |       1259 |           1 | i
+    5555 |        0 |       1259 |           1 | i
+    5555 |        0 |       1259 |           1 | i
 (2 rows)
 
 -- rewrite
@@ -231,7 +231,7 @@ SELECT pg_column_compression('cmtest', 'f1');
 SELECT * FROM cmtest_deps;
  classid | objsubid | refclassid | refobjsubid | deptype 
 ---------+----------+------------+-------------+---------
-    1259 |        1 |       4189 |           0 | n
+    1259 |        1 |       5555 |           0 | n
 (1 row)
 
 -- no rewrites
@@ -244,9 +244,9 @@ INSERT INTO cmtest VALUES(repeat('1234567890',1006));
 SELECT * FROM cmtest_deps;
  classid | objsubid | refclassid | refobjsubid | deptype 
 ---------+----------+------------+-------------+---------
-    1259 |        1 |       4189 |           0 | n
-    4189 |        0 |       1259 |           1 | i
-    4189 |        0 |       1259 |           1 | i
+    1259 |        1 |       5555 |           0 | n
+    5555 |        0 |       1259 |           1 | i
+    5555 |        0 |       1259 |           1 | i
 (3 rows)
 
 -- remove function and related event trigger

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`* typedef struct FormData_pg_attr_compression`
`26`	`26`	`* ----------------`
`27`	`27`	`*/`
`28`		`-CATALOG(pg_attr_compression,4189,AttrCompressionRelationId)`
	`28`	`+CATALOG(pg_attr_compression,5555,AttrCompressionRelationId)`
`29`	`29`	`{`
`30`	`30`	`Oid acoid; /* attribute compression oid */`
`31`	`31`	`NameData acname; /* name of compression AM */`