From 97ffe52bc6db933f5170beba3fe6acb9c28f33cf Mon Sep 17 00:00:00 2001 From: wangfeihuo Date: Sat, 19 Apr 2025 09:45:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E6=B0=B4=E7=BA=BF?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contrib/dolphin/expected/partition_test4.out | 34 +++++------ contrib/dolphin/expected/prefixkey_index.out | 48 ++++++++-------- contrib/dolphin/expected/test_table_index.out | 2 +- .../test_index_ddl_import_and_export.source | 4 +- .../test_table_ddl_import_and_export.source | 56 +++++++++---------- 5 files changed, 72 insertions(+), 72 deletions(-) diff --git a/contrib/dolphin/expected/partition_test4.out b/contrib/dolphin/expected/partition_test4.out index e278a2a10..c5abe6ae3 100644 --- a/contrib/dolphin/expected/partition_test4.out +++ b/contrib/dolphin/expected/partition_test4.out @@ -345,23 +345,23 @@ alter table test_part_ustore reorganize partition p1,p2 into (partition m1 value ERROR: the bound of the last resulting partition is not equal with specified partition bound alter table test_part_ustore reorganize partition p1,p2 into (partition m1 values less than(100),partition m2 values less than(500)); select pg_get_tabledef('test_part_ustore'); - pg_get_tabledef ------------------------------------------------------------------------------------------------------------------------------ - SET search_path = partition_test4; + - CREATE TABLE test_part_ustore ( + - a integer NOT NULL, + - b integer + - ) + - WITH (orientation=row, storage_type=ustore, compression=no) + - PARTITION BY RANGE (a) + - ( + - PARTITION m1 VALUES LESS THAN (100), + - PARTITION m2 VALUES LESS THAN (500), + - PARTITION p3 VALUES LESS THAN (800), + - PARTITION p4 VALUES LESS THAN (1200) + - ) + - ENABLE ROW MOVEMENT; + - ALTER TABLE test_part_ustore ADD CONSTRAINT test_part_ustore_pkey PRIMARY KEY USING ubtree (a) WITH (storage_type=ustore); + pg_get_tabledef +--------------------------------------------------------------------------------------------------------------------------------------------- + SET search_path = partition_test4; + + CREATE TABLE test_part_ustore ( + + a integer NOT NULL, + + b integer + + ) + + WITH (orientation=row, storage_type=ustore, compression=no) + + PARTITION BY RANGE (a) + + ( + + PARTITION m1 VALUES LESS THAN (100), + + PARTITION m2 VALUES LESS THAN (500), + + PARTITION p3 VALUES LESS THAN (800), + + PARTITION p4 VALUES LESS THAN (1200) + + ) + + ENABLE ROW MOVEMENT; + + ALTER TABLE test_part_ustore ADD CONSTRAINT test_part_ustore_pkey PRIMARY KEY USING ubtree (a) WITH (storage_type=ustore, index_type=rcr); (1 row) select * from test_part_ustore partition(m2); diff --git a/contrib/dolphin/expected/prefixkey_index.out b/contrib/dolphin/expected/prefixkey_index.out index 26409a203..25a97d377 100644 --- a/contrib/dolphin/expected/prefixkey_index.out +++ b/contrib/dolphin/expected/prefixkey_index.out @@ -2338,34 +2338,34 @@ CREATE UNIQUE INDEX prefix_index_fraw ON test_prefix_ustore (fraw(18)); fraw | raw | | extended | | fbytea | bytea | | extended | | Indexes: - "prefix_index_fraw" UNIQUE, ubtree (fraw(18)) 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(18)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default + "prefix_index_fblob" ubtree (fblob(5)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default + "prefix_index_fchar_fbytea" ubtree (fchar(5), fbytea(5)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default + "prefix_index_ftext" ubtree (ftext(5)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default + "prefix_index_fvchar" ubtree (fvchar(5)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default Has OIDs: no Options: orientation=row, storage_type=ustore, compression=no, toast.storage_type=ustore select pg_get_tabledef('test_prefix_ustore'::regclass); - pg_get_tabledef ---------------------------------------------------------------------------------------------------------------------------------------------------- - SET search_path = public; + - CREATE TABLE test_prefix_ustore ( + - id integer, + - fchar character(64), + - fvchar character varying(64), + - ftext text, + - fclob clob, + - fblob blob, + - fraw raw, + - fbytea bytea + - ) + - WITH (orientation=row, storage_type=ustore, compression=no); + - CREATE UNIQUE INDEX prefix_index_fraw ON test_prefix_ustore USING ubtree (fraw(18)) 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; + pg_get_tabledef +------------------------------------------------------------------------------------------------------------------------------------------------------------------- + SET search_path = public; + + CREATE TABLE test_prefix_ustore ( + + id integer, + + fchar character(64), + + fvchar character varying(64), + + ftext text, + + fclob clob, + + fblob blob, + + fraw raw, + + fbytea bytea + + ) + + WITH (orientation=row, storage_type=ustore, compression=no); + + CREATE UNIQUE INDEX prefix_index_fraw ON test_prefix_ustore USING ubtree (fraw(18)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default; + + CREATE INDEX prefix_index_fblob ON test_prefix_ustore USING ubtree (fblob(5)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default; + + CREATE INDEX prefix_index_ftext ON test_prefix_ustore USING ubtree (ftext(5)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default; + + CREATE INDEX prefix_index_fvchar ON test_prefix_ustore USING ubtree (fvchar(5)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default; + + CREATE INDEX prefix_index_fchar_fbytea ON test_prefix_ustore USING ubtree (fchar(5), fbytea(5)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default; (1 row) set enable_seqscan=false; diff --git a/contrib/dolphin/expected/test_table_index.out b/contrib/dolphin/expected/test_table_index.out index 9bd317b2e..bb0697664 100644 --- a/contrib/dolphin/expected/test_table_index.out +++ b/contrib/dolphin/expected/test_table_index.out @@ -122,7 +122,7 @@ ERROR: access method "cbtree" does not support index expressions f2 | integer | | plain | | f3 | integer | | plain | | Indexes: - "test_ubtree_f1_f2_idx" ubtree (f1 DESC, f2) WITH (storage_type=ustore) TABLESPACE pg_default + "test_ubtree_f1_f2_idx" ubtree (f1 DESC, f2) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default Has OIDs: no Options: orientation=row, storage_type=ustore, compression=no diff --git a/contrib/dolphin/output/test_index_ddl_import_and_export.source b/contrib/dolphin/output/test_index_ddl_import_and_export.source index 4b062a5ed..368250d73 100644 --- a/contrib/dolphin/output/test_index_ddl_import_and_export.source +++ b/contrib/dolphin/output/test_index_ddl_import_and_export.source @@ -235,7 +235,7 @@ Table "public.t_create_index_013" --------+------+----------- c | text | Indexes: - "index022" ubtree (c(2676)) WITH (storage_type=ustore) TABLESPACE pg_default + "index022" ubtree (c(2676)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default --导入导出 \! @abs_bindir@/gs_dump dump_index_db -p @portstring@ -f @abs_bindir@/dump_index.sql -F p >/dev/null 2>&1; echo $? @@ -393,7 +393,7 @@ Table "public.t_create_index_013" --------+------+----------- c | text | Indexes: - "index022" ubtree (c(2676)) WITH (storage_type=ustore) TABLESPACE pg_default + "index022" ubtree (c(2676)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default \c postgres drop database if exists restore_index_db; diff --git a/contrib/dolphin/output/test_table_ddl_import_and_export.source b/contrib/dolphin/output/test_table_ddl_import_and_export.source index 5c709fab4..f5dd89a6f 100644 --- a/contrib/dolphin/output/test_table_ddl_import_and_export.source +++ b/contrib/dolphin/output/test_table_ddl_import_and_export.source @@ -230,7 +230,7 @@ Table "public.t_create_table_022" c3 | raw | c4 | bytea | Indexes: - "t_create_table_022_expr_expr1_expr2_expr3_idx" ubtree (c1(1), c2(2676), c3(1), c4(2676)) WITH (storage_type=ustore) TABLESPACE pg_default + "t_create_table_022_expr_expr1_expr2_expr3_idx" ubtree (c1(1), c2(2676), c3(1), c4(2676)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default \d t_create_table_023; Table "public.t_create_table_023" @@ -566,17 +566,17 @@ show create table t_create_table_021; (1 row) show create table t_create_table_022; - Table | Create Table ---------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ - t_create_table_022 | SET search_path = public; + - | CREATE TABLE t_create_table_022 ( + - | c1 clob, + - | c2 blob, + - | c3 raw, + - | c4 bytea + - | ) + - | WITH (orientation=row, storage_type=ustore, compression=no); + - | CREATE INDEX t_create_table_022_expr_expr1_expr2_expr3_idx ON t_create_table_022 USING ubtree (c1(1), c2(2676), c3(1), c4(2676)) WITH (storage_type=ustore) TABLESPACE pg_default; + Table | Create Table +--------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + t_create_table_022 | SET search_path = public; + + | CREATE TABLE t_create_table_022 ( + + | c1 clob, + + | c2 blob, + + | c3 raw, + + | c4 bytea + + | ) + + | WITH (orientation=row, storage_type=ustore, compression=no); + + | CREATE INDEX t_create_table_022_expr_expr1_expr2_expr3_idx ON t_create_table_022 USING ubtree (c1(1), c2(2676), c3(1), c4(2676)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default; (1 row) show create table t_create_table_023; @@ -1020,7 +1020,7 @@ Table "public.t_alter_table_025" c1 | clob | c2 | blob | Indexes: - "t_alter_table_025_expr_expr1_idx" ubtree (c1(1), c2(2676)) WITH (storage_type=ustore) TABLESPACE pg_default + "t_alter_table_025_expr_expr1_idx" ubtree (c1(1), c2(2676)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default \d t_alter_table_026; Table "public.t_alter_table_026" @@ -1029,7 +1029,7 @@ Table "public.t_alter_table_026" c1 | raw | c2 | bytea | Indexes: - "t_alter_table_026_expr_expr1_idx" ubtree (c1(1), c2(2676)) WITH (storage_type=ustore) TABLESPACE pg_default + "t_alter_table_026_expr_expr1_idx" ubtree (c1(1), c2(2676)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default \d t_alter_table_027; Table "public.t_alter_table_027" @@ -1391,7 +1391,7 @@ Table "public.t_create_table_022" c3 | raw | c4 | bytea | Indexes: - "t_create_table_022_expr_expr1_expr2_expr3_idx" ubtree (c1(1), c2(2676), c3(1), c4(2676)) WITH (storage_type=ustore) TABLESPACE pg_default + "t_create_table_022_expr_expr1_expr2_expr3_idx" ubtree (c1(1), c2(2676), c3(1), c4(2676)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default \d t_create_table_023; Table "public.t_create_table_023" @@ -1727,17 +1727,17 @@ show create table t_create_table_021; (1 row) show create table t_create_table_022; - Table | Create Table ---------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ - t_create_table_022 | SET search_path = public; + - | CREATE TABLE t_create_table_022 ( + - | c1 clob, + - | c2 blob, + - | c3 raw, + - | c4 bytea + - | ) + - | WITH (orientation=row, storage_type=ustore, compression=no); + - | CREATE INDEX t_create_table_022_expr_expr1_expr2_expr3_idx ON t_create_table_022 USING ubtree (c1(1), c2(2676), c3(1), c4(2676)) WITH (storage_type=ustore) TABLESPACE pg_default; + Table | Create Table +--------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + t_create_table_022 | SET search_path = public; + + | CREATE TABLE t_create_table_022 ( + + | c1 clob, + + | c2 blob, + + | c3 raw, + + | c4 bytea + + | ) + + | WITH (orientation=row, storage_type=ustore, compression=no); + + | CREATE INDEX t_create_table_022_expr_expr1_expr2_expr3_idx ON t_create_table_022 USING ubtree (c1(1), c2(2676), c3(1), c4(2676)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default; (1 row) show create table t_create_table_023; @@ -2123,7 +2123,7 @@ Table "public.t_alter_table_025" c1 | clob | c2 | blob | Indexes: - "t_alter_table_025_expr_expr1_idx" ubtree (c1(1), c2(2676)) WITH (storage_type=ustore) TABLESPACE pg_default + "t_alter_table_025_expr_expr1_idx" ubtree (c1(1), c2(2676)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default \d t_alter_table_026; Table "public.t_alter_table_026" @@ -2132,7 +2132,7 @@ Table "public.t_alter_table_026" c1 | raw | c2 | bytea | Indexes: - "t_alter_table_026_expr_expr1_idx" ubtree (c1(1), c2(2676)) WITH (storage_type=ustore) TABLESPACE pg_default + "t_alter_table_026_expr_expr1_idx" ubtree (c1(1), c2(2676)) WITH (storage_type=ustore, index_type=rcr) TABLESPACE pg_default \d t_alter_table_027; Table "public.t_alter_table_027" -- Gitee