hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改\d查询表信息的storage_type大小写的不一致问题

Browse Source
This commit is contained in:
wang-mingxuanHedgehog
2024-08-09 16:29:45 +08:00
parent 88cce35ea0
commit 39231e3991
10 changed files with 92 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gausskernel/optimizer/commands/indexcmds.cpp
View File

@ -1284,7 +1284,7 @@ ObjectAddress DefineIndex(Oid relationId, IndexStmt* stmt, Oid indexRelationId,
CheckPredicate((Expr*)stmt->whereClause);
if (RelationIsUstoreFormat(rel)) {
DefElem* def = makeDefElem("storage_type", (Node*)makeString(TABLE_ACCESS_METHOD_USTORE));
DefElem* def = makeDefElem("storage_type", (Node*)makeString(TABLE_ACCESS_METHOD_USTORE_LOWER));
if (stmt->options == NULL) {
stmt->options = list_make1(def);
} else {

2
src/gausskernel/optimizer/commands/tablecmds.cpp
View File

@ -1284,7 +1284,7 @@ static List* AddDefaultOptionsIfNeed(List* options, const char relkind, CreateSt
res = list_make2(def1, def2);
if (g_instance.attr.attr_storage.enable_ustore && u_sess->attr.attr_sql.enable_default_ustore_table &&
relkind != RELKIND_MATVIEW && !IsSystemNamespace(relnamespace) && !assignedStorageType) {
DefElem* def3 = makeDefElem("storage_type", (Node*)makeString(TABLE_ACCESS_METHOD_USTORE));
DefElem* def3 = makeDefElem("storage_type", (Node*)makeString(TABLE_ACCESS_METHOD_USTORE_LOWER));
res = lappend(res, def3);
}
} else {

1
src/include/utils/rel_gs.h
View File

@ -184,6 +184,7 @@ typedef struct RelationMetaData {
*/
#define TABLE_ACCESS_METHOD_ASTORE "ASTORE"
#define TABLE_ACCESS_METHOD_USTORE "USTORE"
#define TABLE_ACCESS_METHOD_USTORE_LOWER "ustore"
#define FILESYSTEM_GENERAL "general"
#define FILESYSTEM_HDFS "hdfs"

76
src/test/regress/expected/alter_table_003.out
View File

@ -1315,11 +1315,11 @@ NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index "t1_f9_key" for tab
f5 | integer | | plain | |
f3 | integer | not null | plain | |
Indexes:
"t_pri_pkey" PRIMARY KEY, ubtree (f2, f3) WITH (storage_type=USTORE) TABLESPACE pg_default
"t_pri_pkey" PRIMARY KEY, ubtree (f2, f3) WITH (storage_type=ustore) TABLESPACE pg_default
Referenced by:
TABLE "t1" CONSTRAINT "t1_f1_fkey" FOREIGN KEY (f1, f2) REFERENCES t_pri(f2, f3)
Has OIDs: no
Options: orientation=row, compression=no, storage_type=USTORE
Options: orientation=row, compression=no, storage_type=ustore
select conname, contype, conkey, confkey, conbin, consrc, conincluding from pg_constraint
where conrelid = (select oid from pg_class where relname = 't_pri') order by conname;
@ -1342,16 +1342,16 @@ select conname, contype, conkey, confkey, conbin, consrc, conincluding from pg_c
f6 | integer | | plain | |
f7 | integer | | plain | |
Indexes:
"t1_pkey" PRIMARY KEY, ubtree (f8) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f3_f4_key" UNIQUE CONSTRAINT, ubtree (f3, f4) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f4_f5_f6_f7_key" UNIQUE CONSTRAINT, ubtree (f4, f5) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f9_key" UNIQUE CONSTRAINT, ubtree (f9) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_pkey" PRIMARY KEY, ubtree (f8) WITH (storage_type=ustore) TABLESPACE pg_default
"t1_f3_f4_key" UNIQUE CONSTRAINT, ubtree (f3, f4) WITH (storage_type=ustore) TABLESPACE pg_default
"t1_f4_f5_f6_f7_key" UNIQUE CONSTRAINT, ubtree (f4, f5) WITH (storage_type=ustore) TABLESPACE pg_default
"t1_f9_key" UNIQUE CONSTRAINT, ubtree (f9) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"t1_f5_check" CHECK (f5 = 10)
Foreign-key constraints:
"t1_f1_fkey" FOREIGN KEY (f1, f2) REFERENCES t_pri(f2, f3)
Has OIDs: no
Options: orientation=row, compression=no, storage_type=USTORE
Options: orientation=row, compression=no, storage_type=ustore
select conname, contype, conkey, confkey, conbin, consrc, conincluding from pg_constraint
where conrelid = (select oid from pg_class where relname = 't1') order by conname;
@ -3138,7 +3138,7 @@ alter table t1 add f8 int, add f9 text first, add f10 float after f3;
f5 | boolean | | plain | |
f8 | integer | | plain | |
Indexes:
"t1_pkey" PRIMARY KEY, ubtree (f1) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_pkey" PRIMARY KEY, ubtree (f1) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no, toast.storage_type=USTORE
@ -3201,7 +3201,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "t1_pkey" for
f5 | boolean | | plain | |
f6 | text | | extended | |
Indexes:
"t1_pkey" PRIMARY KEY, ubtree (f7) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_pkey" PRIMARY KEY, ubtree (f7) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no, toast.storage_type=USTORE
@ -3240,7 +3240,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "t1_pkey" for
f5 | boolean | | plain | |
f6 | text | | extended | |
Indexes:
"t1_pkey" PRIMARY KEY, ubtree (f7) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_pkey" PRIMARY KEY, ubtree (f7) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no, toast.storage_type=USTORE
@ -3281,7 +3281,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "t1_pkey" for
f5 | boolean | | plain | |
f6 | text | | extended | |
Indexes:
"t1_pkey" PRIMARY KEY, ubtree (f7) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_pkey" PRIMARY KEY, ubtree (f7) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no, toast.storage_type=USTORE
@ -3318,7 +3318,7 @@ alter table t1 add f6 int first, add f7 float after f3;
f4 | bit(8) | | extended | |
f5 | boolean | | plain | |
Indexes:
"t1_f1_key" UNIQUE CONSTRAINT, ubtree (f1) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f1_key" UNIQUE CONSTRAINT, ubtree (f1) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -3354,9 +3354,9 @@ NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index "t1_f7_key" for tab
f4 | bit(8) | | extended | |
f5 | boolean | | plain | |
Indexes:
"t1_f1_key" UNIQUE CONSTRAINT, ubtree (f1) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f6_key" UNIQUE CONSTRAINT, ubtree (f6) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f7_key" UNIQUE CONSTRAINT, ubtree (f7) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f1_key" UNIQUE CONSTRAINT, ubtree (f1) WITH (storage_type=ustore) TABLESPACE pg_default
"t1_f6_key" UNIQUE CONSTRAINT, ubtree (f6) WITH (storage_type=ustore) TABLESPACE pg_default
"t1_f7_key" UNIQUE CONSTRAINT, ubtree (f7) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -3393,8 +3393,8 @@ NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index "t1_f7_key" for tab
f4 | bit(8) | | extended | |
f5 | boolean | | plain | |
Indexes:
"t1_f6_key" UNIQUE CONSTRAINT, ubtree (f6) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f7_key" UNIQUE CONSTRAINT, ubtree (f7) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f6_key" UNIQUE CONSTRAINT, ubtree (f6) WITH (storage_type=ustore) TABLESPACE pg_default
"t1_f7_key" UNIQUE CONSTRAINT, ubtree (f7) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -3432,8 +3432,8 @@ NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index "t1_f7_key" for tab
f4 | bit(8) | | extended | |
f5 | boolean | | plain | |
Indexes:
"t1_f6_key" UNIQUE CONSTRAINT, ubtree (f6) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f7_key" UNIQUE CONSTRAINT, ubtree (f7) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f6_key" UNIQUE CONSTRAINT, ubtree (f6) WITH (storage_type=ustore) TABLESPACE pg_default
"t1_f7_key" UNIQUE CONSTRAINT, ubtree (f7) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -3625,7 +3625,7 @@ alter table t1 add f6 text first, add f7 float after f3;
f4 | bit(8) | | extended | |
f5 | boolean | | plain | |
Indexes:
"t1_pkey" PRIMARY KEY, ubtree (f1) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_pkey" PRIMARY KEY, ubtree (f1) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no, toast.storage_type=USTORE
@ -3666,7 +3666,7 @@ ERROR: Incorrect column definition, there can be only one auto_increment column
f4 | bit(8) | | extended | |
f5 | boolean | | plain | |
Indexes:
"t1_pkey" PRIMARY KEY, ubtree (f1) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_pkey" PRIMARY KEY, ubtree (f1) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -3709,7 +3709,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "t1_pkey" for
f4 | bit(8) | | extended | |
f5 | boolean | | plain | |
Indexes:
"t1_pkey" PRIMARY KEY, ubtree (f6) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_pkey" PRIMARY KEY, ubtree (f6) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -4318,11 +4318,11 @@ NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index "t1_f9_key" for tab
f5 | integer | | plain | |
f3 | integer | not null | plain | |
Indexes:
"t_pri_pkey" PRIMARY KEY, ubtree (f2, f3) WITH (storage_type=USTORE) TABLESPACE pg_default
"t_pri_pkey" PRIMARY KEY, ubtree (f2, f3) WITH (storage_type=ustore) TABLESPACE pg_default
Referenced by:
TABLE "t1" CONSTRAINT "t1_f1_fkey" FOREIGN KEY (f1, f2) REFERENCES t_pri(f2, f3)
Has OIDs: no
Options: orientation=row, compression=no, storage_type=USTORE
Options: orientation=row, compression=no, storage_type=ustore
select conname, contype, conkey, confkey, conbin, consrc, conincluding from pg_constraint
where conrelid = (select oid from pg_class where relname = 't_pri') order by conname;
@ -4345,16 +4345,16 @@ select conname, contype, conkey, confkey, conbin, consrc, conincluding from pg_c
f6 | integer | | plain | |
f7 | integer | | plain | |
Indexes:
"t1_pkey" PRIMARY KEY, ubtree (f8) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f4_f5_f6_f7_key" UNIQUE CONSTRAINT, ubtree (f4, f5) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f9_key" UNIQUE CONSTRAINT, ubtree (f9) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_lower_abs_key" UNIQUE CONSTRAINT, ubtree (lower(f3::text), abs(f4)) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_pkey" PRIMARY KEY, ubtree (f8) WITH (storage_type=ustore) TABLESPACE pg_default
"t1_f4_f5_f6_f7_key" UNIQUE CONSTRAINT, ubtree (f4, f5) WITH (storage_type=ustore) TABLESPACE pg_default
"t1_f9_key" UNIQUE CONSTRAINT, ubtree (f9) WITH (storage_type=ustore) TABLESPACE pg_default
"t1_lower_abs_key" UNIQUE CONSTRAINT, ubtree (lower(f3::text), abs(f4)) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"t1_f5_check" CHECK (f5 = 10)
Foreign-key constraints:
"t1_f1_fkey" FOREIGN KEY (f1, f2) REFERENCES t_pri(f2, f3)
Has OIDs: no
Options: orientation=row, compression=no, storage_type=USTORE
Options: orientation=row, compression=no, storage_type=ustore
select conname, contype, conkey, confkey, conbin, consrc, conincluding from pg_constraint
where conrelid = (select oid from pg_class where relname = 't1') order by conname;
@ -6516,7 +6516,7 @@ NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "t1_pkey" for tab
f4 | bit(8) | | extended | |
f5 | boolean | | plain | |
Indexes:
"t1_pkey" PRIMARY KEY, ubtree (f1) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_pkey" PRIMARY KEY, ubtree (f1) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -6550,7 +6550,7 @@ insert into t1(f2, f3, f4, f5) values('a', '2022-11-08 19:56:10.158564', x'41',
f4 | bit(8) | | extended | |
f5 | boolean | | plain | |
Indexes:
"t1_pkey" PRIMARY KEY, ubtree (f1) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_pkey" PRIMARY KEY, ubtree (f1) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -7214,11 +7214,11 @@ NOTICE: CREATE TABLE / UNIQUE will create implicit index "t1_f4_f5_f6_f7_key" f
f2 | integer | not null | plain | |
f3 | integer | not null | plain | |
Indexes:
"t_pri_pkey" PRIMARY KEY, ubtree (f2, f3) WITH (storage_type=USTORE) TABLESPACE pg_default
"t_pri_pkey" PRIMARY KEY, ubtree (f2, f3) WITH (storage_type=ustore) TABLESPACE pg_default
Referenced by:
TABLE "t1" CONSTRAINT "t1_f1_fkey" FOREIGN KEY (f1, f2) REFERENCES t_pri(f2, f3)
Has OIDs: no
Options: orientation=row, compression=no, storage_type=USTORE
Options: orientation=row, compression=no, storage_type=ustore
\d+ t1
Table "public.t1"
@ -7232,14 +7232,14 @@ Options: orientation=row, compression=no, storage_type=USTORE
f6 | integer | | plain | |
f7 | integer | | plain | |
Indexes:
"t1_f4_f5_f6_f7_key" UNIQUE CONSTRAINT, ubtree (f4, f5) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_lower_abs_key" UNIQUE CONSTRAINT, ubtree (lower(f3::text), abs(f4)) WITH (storage_type=USTORE) TABLESPACE pg_default
"t1_f4_f5_f6_f7_key" UNIQUE CONSTRAINT, ubtree (f4, f5) WITH (storage_type=ustore) TABLESPACE pg_default
"t1_lower_abs_key" UNIQUE CONSTRAINT, ubtree (lower(f3::text), abs(f4)) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"t1_f5_check" CHECK (f5 = 10)
Foreign-key constraints:
"t1_f1_fkey" FOREIGN KEY (f1, f2) REFERENCES t_pri(f2, f3)
Has OIDs: no
Options: orientation=row, compression=no, storage_type=USTORE
Options: orientation=row, compression=no, storage_type=ustore
select conname, contype, conkey, confkey, conbin, consrc, conincluding from pg_constraint
where conrelid = (select oid from pg_class where relname = 't_pri') order by conname;
@ -7272,7 +7272,7 @@ Indexes:
Referenced by:
TABLE "t1" CONSTRAINT "t1_f1_fkey" FOREIGN KEY (f1, f2) REFERENCES t_pri(f2, f3)
Has OIDs: no
Options: orientation=row, compression=no, storage_type=USTORE
Options: orientation=row, compression=no, storage_type=ustore
\d+ t1
Table "public.t1"
@ -7293,7 +7293,7 @@ Check constraints:
Foreign-key constraints:
"t1_f1_fkey" FOREIGN KEY (f1, f2) REFERENCES t_pri(f2, f3)
Has OIDs: no
Options: orientation=row, compression=no, storage_type=USTORE
Options: orientation=row, compression=no, storage_type=ustore
select conname, contype, conkey, confkey, conbin, consrc, conincluding from pg_constraint
where conrelid = (select oid from pg_class where relname = 't_pri') order by conname;

28
src/test/regress/expected/alter_table_modify_ustore.out
View File

@ -37,7 +37,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "test_at_modif
a | integer | | plain | |
b | integer | not null AUTO_INCREMENT | plain | |
Indexes:
"test_at_modify_pkey" PRIMARY KEY, ubtree (b) WITH (storage_type=USTORE) TABLESPACE pg_default
"test_at_modify_pkey" PRIMARY KEY, ubtree (b) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -51,7 +51,7 @@ NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index "test_at_modify_b_k
b | character varying(8) | not null | extended | |
Indexes:
"test_at_modify_pkey" PRIMARY KEY, ubtree (b) WITH (storage_type=ustore) TABLESPACE pg_default
"test_at_modify_b_key" UNIQUE CONSTRAINT, ubtree (b) WITH (storage_type=USTORE) TABLESPACE pg_default
"test_at_modify_b_key" UNIQUE CONSTRAINT, ubtree (b) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -1077,7 +1077,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "test_at_chang
a | integer | | plain | |
b1 | integer | not null AUTO_INCREMENT | plain | |
Indexes:
"test_at_change_pkey" PRIMARY KEY, ubtree (b1) WITH (storage_type=USTORE) TABLESPACE pg_default
"test_at_change_pkey" PRIMARY KEY, ubtree (b1) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -1091,7 +1091,7 @@ NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index "test_at_change_b_k
b | character varying(8) | not null | extended | |
Indexes:
"test_at_change_pkey" PRIMARY KEY, ubtree (b) WITH (storage_type=ustore) TABLESPACE pg_default
"test_at_change_b_key" UNIQUE CONSTRAINT, ubtree (b) WITH (storage_type=USTORE) TABLESPACE pg_default
"test_at_change_b_key" UNIQUE CONSTRAINT, ubtree (b) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no
@ -2100,7 +2100,7 @@ NOTICE: ALTER TABLE / ADD UNIQUE will create implicit index "pt_at_modify_b_tab
b | smallint | not null | plain | |
Indexes:
"pt_at_modify_pkey" PRIMARY KEY, ubtree (b, a) LOCAL WITH (storage_type=ustore) TABLESPACE pg_default
"pt_at_modify_b_tableoid_key" UNIQUE CONSTRAINT, ubtree (b) WITH (storage_type=USTORE) TABLESPACE pg_default
"pt_at_modify_b_tableoid_key" UNIQUE CONSTRAINT, ubtree (b) WITH (storage_type=ustore) TABLESPACE pg_default
Partition By RANGE(a)
Number of partitions: 3 (View pg_partition to check each partition range.)
Has OIDs: no
@ -2396,7 +2396,7 @@ NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pk_test11_f11" f
f12 | character varying(20) |
f13 | boolean |
Indexes:
"pk_test11_f11" PRIMARY KEY, ubtree (f11) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_test11_f11" PRIMARY KEY, ubtree (f11) WITH (storage_type=ustore) TABLESPACE pg_default
ALTER TABLE test11 MODIFY COLUMN f11 int;
\d test11
@ -2439,7 +2439,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "pk_test11_f11
f13 | boolean |
f11 | integer | not null
Indexes:
"pk_test11_f11" PRIMARY KEY, ubtree (f11) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_test11_f11" PRIMARY KEY, ubtree (f11) WITH (storage_type=ustore) TABLESPACE pg_default
insert into test11(f11,f12,f13) values(NULL,'1',true); --ERROR
ERROR: null value in column "f11" violates not-null constraint
@ -2456,7 +2456,7 @@ NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pk_test11_f11" f
f12 | character varying(20) | not null
f13 | boolean |
Indexes:
"pk_test11_f11" PRIMARY KEY, ubtree (f11, f12) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_test11_f11" PRIMARY KEY, ubtree (f11, f12) WITH (storage_type=ustore) TABLESPACE pg_default
ALTER TABLE test11 MODIFY COLUMN f11 int;
\d test11
@ -2499,7 +2499,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "pk_test11_f11
f13 | boolean |
f11 | integer | not null
Indexes:
"pk_test11_f11" PRIMARY KEY, ubtree (f11) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_test11_f11" PRIMARY KEY, ubtree (f11) WITH (storage_type=ustore) TABLESPACE pg_default
insert into test11(f11,f12,f13) values(NULL,'1',true); --ERROR
ERROR: null value in column "f11" violates not-null constraint
@ -2535,7 +2535,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "range_range_p
gender | character varying | not null | extended | |
birthday | date | not null | plain | |
Indexes:
"range_range_pkey" PRIMARY KEY, ubtree (id, birthday) LOCAL WITH (storage_type=USTORE) TABLESPACE pg_default
"range_range_pkey" PRIMARY KEY, ubtree (id, birthday) LOCAL WITH (storage_type=ustore) TABLESPACE pg_default
Partition By RANGE(id) Subpartition By RANGE(birthday)
Number of partitions: 3 (View pg_partition to check each partition range.)
Number of subpartitions: 6 (View pg_partition to check each subpartition range.)
@ -2589,7 +2589,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "range_range_p
gender | character varying | not null | extended | |
birthday | date | not null | plain | |
Indexes:
"range_range_pkey" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE pg_default
"range_range_pkey" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE pg_default
Partition By RANGE(id) Subpartition By RANGE(birthday)
Number of partitions: 3 (View pg_partition to check each partition range.)
Number of subpartitions: 6 (View pg_partition to check each subpartition range.)
@ -2643,7 +2643,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "range_range_p
gender | character varying | not null | extended | |
birthday | date | not null | plain | |
Indexes:
"range_range_pkey" PRIMARY KEY, ubtree (gender) WITH (storage_type=USTORE) TABLESPACE pg_default
"range_range_pkey" PRIMARY KEY, ubtree (gender) WITH (storage_type=ustore) TABLESPACE pg_default
Partition By RANGE(id) Subpartition By RANGE(birthday)
Number of partitions: 3 (View pg_partition to check each partition range.)
Number of subpartitions: 6 (View pg_partition to check each subpartition range.)
@ -2686,7 +2686,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "multi_keys_ra
f3 | integer | | plain | |
f1 | integer | not null | plain | |
Indexes:
"multi_keys_range_pkey" PRIMARY KEY, ubtree (f1, f2) LOCAL WITH (storage_type=USTORE) TABLESPACE pg_default
"multi_keys_range_pkey" PRIMARY KEY, ubtree (f1, f2) LOCAL WITH (storage_type=ustore) TABLESPACE pg_default
Partition By RANGE(f1, f2)
Number of partitions: 3 (View pg_partition to check each partition range.)
Has OIDs: no
@ -2727,7 +2727,7 @@ NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "multi_keys_li
f3 | integer | | plain | |
f1 | integer | not null | plain | |
Indexes:
"multi_keys_list_pkey" PRIMARY KEY, ubtree (f1, f2) LOCAL WITH (storage_type=USTORE) TABLESPACE pg_default
"multi_keys_list_pkey" PRIMARY KEY, ubtree (f1, f2) LOCAL WITH (storage_type=ustore) TABLESPACE pg_default
Partition By LIST(f1, f2)
Number of partitions: 3 (View pg_partition to check each partition range.)
Has OIDs: no

2
src/test/regress/expected/function_get_table_def.out
View File

@ -775,7 +775,7 @@ select pg_get_tabledef('test_us');
us2 character varying(20) NOT NULL +
) +
WITH (orientation=row, storage_type=ustore, compression=no); +
ALTER TABLE test_us ADD CONSTRAINT u1 PRIMARY KEY USING ubtree (us2) WITH (storage_type=USTORE);
ALTER TABLE test_us ADD CONSTRAINT u1 PRIMARY KEY USING ubtree (us2) WITH (storage_type=ustore);
(1 row)

2
src/test/regress/expected/generated_col.out
View File

@ -608,7 +608,7 @@ SELECT * FROM gtest25 ORDER BY a;
c | integer | default 42
x | integer | generated always as ((c * 4)) stored
Indexes:
"gtest25_pkey" PRIMARY KEY, ubtree (a) WITH (storage_type=USTORE) TABLESPACE pg_default
"gtest25_pkey" PRIMARY KEY, ubtree (a) WITH (storage_type=ustore) TABLESPACE pg_default
DROP TABLE gtest25;
-- ALTER TABLE ... ALTER COLUMN

48
src/test/regress/expected/inherits01.out
View File

@ -1972,8 +1972,8 @@ ALTER TABLE kid_2020 ALTER COLUMN num SET DEFAULT 1;
num | integer | default 2
salary | real |
Indexes:
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:
@ -2025,8 +2025,8 @@ ALTER TABLE kid_2020 ALTER id DROP not null;
num | integer | default 2
salary | real |
Indexes:
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:
@ -2059,8 +2059,8 @@ ALTER TABLE father DROP COLUMN IF EXISTS num;-- father without num, child have n
wai_id | integer |
salary | real |
Indexes:
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:
@ -2092,8 +2092,8 @@ ALTER TABLE kid_2023 no inherit father;
wai_id | integer |
salary | real |
Indexes:
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:
@ -2123,8 +2123,8 @@ ALTER TABLE kid_2022 RENAME CONSTRAINT father_salary_check to new_salary_check
wai_id | integer |
salary | real |
Indexes:
"new_index_name" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"new_index_name" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:
@ -2170,8 +2170,8 @@ LINE 2: ALTER TABLE father ALTER COLUMN id TYPE int;
wai_id | integer |
salary | real |
Indexes:
"new_index_name" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"new_index_name" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:
@ -2372,8 +2372,8 @@ ALTER TABLE kid_2020 ALTER COLUMN num SET DEFAULT 1;
num | integer | default 2
salary | real |
Indexes:
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:
@ -2425,8 +2425,8 @@ ALTER TABLE kid_2020 ALTER id DROP not null;
num | integer | default 2
salary | real |
Indexes:
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:
@ -2459,8 +2459,8 @@ ALTER TABLE father DROP COLUMN IF EXISTS num;-- father without num, child withou
wai_id | integer |
salary | real |
Indexes:
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:
@ -2492,8 +2492,8 @@ ALTER TABLE kid_2023 no inherit father;
wai_id | integer |
salary | real |
Indexes:
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"pk_father" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:
@ -2522,8 +2522,8 @@ ALTER TABLE kid_2022 RENAME CONSTRAINT father_salary_check to new_salary_check
wai_id | integer |
salary | real |
Indexes:
"new_index_name" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"new_index_name" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:
@ -2578,8 +2578,8 @@ LINE 2: ALTER TABLE father ALTER COLUMN id TYPE int;
wai_id | integer |
salary | real |
Indexes:
"new_index_name" PRIMARY KEY, ubtree (id) WITH (storage_type=USTORE) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=USTORE) TABLESPACE pg_default
"new_index_name" PRIMARY KEY, ubtree (id) WITH (storage_type=ustore) TABLESPACE example1
"father_md_attr_key" UNIQUE CONSTRAINT, ubtree (md_attr) WITH (storage_type=ustore) TABLESPACE pg_default
Check constraints:
"father_salary_check" CHECK (salary > 0::double precision)
Foreign-key constraints:

2
src/test/regress/expected/optimizing_index_scan_ustore.out
View File

@ -32,7 +32,7 @@ NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "t_ustore_pkey" f
c4 | character varying(20) | collate C | extended | |
c5 | bigint | | plain | |
Indexes:
"t_ustore_pkey" PRIMARY KEY, ubtree (c1) WITH (storage_type=USTORE) TABLESPACE pg_default
"t_ustore_pkey" PRIMARY KEY, ubtree (c1) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no

20
src/test/regress/expected/prefixkey_index.out
View File

@ -2666,11 +2666,11 @@ CREATE UNIQUE INDEX prefix_index_fraw ON test_prefix_ustore (fraw(9));
fraw | raw | | extended | |
fbytea | bytea | | extended | |
Indexes:
"prefix_index_fraw" UNIQUE, ubtree (fraw(9)) WITH (storage_type=USTORE) TABLESPACE pg_default
"prefix_index_fblob" ubtree (fblob(5)) WITH (storage_type=USTORE) TABLESPACE pg_default
"prefix_index_fchar_fbytea" ubtree (fchar(5), fbytea(5)) WITH (storage_type=USTORE) TABLESPACE pg_default
"prefix_index_ftext" ubtree (ftext(5)) WITH (storage_type=USTORE) TABLESPACE pg_default
"prefix_index_fvchar" ubtree (fvchar(5)) WITH (storage_type=USTORE) TABLESPACE pg_default
"prefix_index_fraw" UNIQUE, ubtree (fraw(9)) WITH (storage_type=ustore) TABLESPACE pg_default
"prefix_index_fblob" ubtree (fblob(5)) WITH (storage_type=ustore) TABLESPACE pg_default
"prefix_index_fchar_fbytea" ubtree (fchar(5), fbytea(5)) WITH (storage_type=ustore) TABLESPACE pg_default
"prefix_index_ftext" ubtree (ftext(5)) WITH (storage_type=ustore) TABLESPACE pg_default
"prefix_index_fvchar" ubtree (fvchar(5)) WITH (storage_type=ustore) TABLESPACE pg_default
Has OIDs: no
Options: orientation=row, storage_type=ustore, compression=no, toast.storage_type=ustore
@ -2689,11 +2689,11 @@ select pg_get_tabledef('test_prefix_ustore'::regclass);
fbytea bytea +
) +
WITH (orientation=row, storage_type=ustore, compression=no); +
CREATE UNIQUE INDEX prefix_index_fraw ON test_prefix_ustore USING ubtree (fraw(9)) WITH (storage_type=USTORE) TABLESPACE pg_default; +
CREATE INDEX prefix_index_fblob ON test_prefix_ustore USING ubtree (fblob(5)) WITH (storage_type=USTORE) TABLESPACE pg_default; +
CREATE INDEX prefix_index_ftext ON test_prefix_ustore USING ubtree (ftext(5)) WITH (storage_type=USTORE) TABLESPACE pg_default; +
CREATE INDEX prefix_index_fvchar ON test_prefix_ustore USING ubtree (fvchar(5)) WITH (storage_type=USTORE) TABLESPACE pg_default; +
CREATE INDEX prefix_index_fchar_fbytea ON test_prefix_ustore USING ubtree (fchar(5), fbytea(5)) WITH (storage_type=USTORE) TABLESPACE pg_default;
CREATE UNIQUE INDEX prefix_index_fraw ON test_prefix_ustore USING ubtree (fraw(9)) WITH (storage_type=ustore) TABLESPACE pg_default; +
CREATE INDEX prefix_index_fblob ON test_prefix_ustore USING ubtree (fblob(5)) WITH (storage_type=ustore) TABLESPACE pg_default; +
CREATE INDEX prefix_index_ftext ON test_prefix_ustore USING ubtree (ftext(5)) WITH (storage_type=ustore) TABLESPACE pg_default; +
CREATE INDEX prefix_index_fvchar ON test_prefix_ustore USING ubtree (fvchar(5)) WITH (storage_type=ustore) TABLESPACE pg_default; +
CREATE INDEX prefix_index_fchar_fbytea ON test_prefix_ustore USING ubtree (fchar(5), fbytea(5)) WITH (storage_type=ustore) TABLESPACE pg_default;
(1 row)
set enable_seqscan=false;