Skip to content

Commit

Permalink
Merge branch 'main' into update-pk
Browse files Browse the repository at this point in the history
  • Loading branch information
@aunjgr
aunjgr authored Jan 16, 2025
2 parents 1903b64 + 1392f1f commit 6a2f5cd
Show file tree
Hide file tree
Showing 7 changed files with 1,026 additions and 2 deletions.
2 changes: 1 addition & 1 deletion test/distributed/cases/fulltext/fulltext2.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ insert into ab01 values (1,2,'da');
insert into ab01 values (2,3,'e4r34f');
select * from ab01;
create fulltext index f01 on ab01 (col2);
-- @bvt:issue#20213
-- @bvt:issue#20123
create fulltext index f02 on ab01 (col2);
-- @bvt:issue
drop table ab01;
Expand Down
3 changes: 3 additions & 0 deletions test/distributed/cases/pitr/pitr.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,3 +267,6 @@ drop pitr if exists p20;
create pitr for account sys range 1 'y';
SQL parser error: You have an error in your SQL syntax; check the manual that corresponds to your MatrixOne server version for the right syntax to use. syntax error at line 1 column 15 near " for account sys range 1 'y';";
drop account acc01;
drop pitr pitr01;
show pitr;
PITR_NAME CREATED_TIME MODIFIED_TIME PITR_LEVEL ACCOUNT_NAME DATABASE_NAME TABLE_NAME PITR_LENGTH PITR_UNIT
4 changes: 3 additions & 1 deletion test/distributed/cases/pitr/pitr.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,4 +289,6 @@ drop pitr if exists p20;
create pitr for account sys range 1 'y';
-- @session

drop account acc01;
drop account acc01;
drop pitr pitr01;
show pitr;
43 changes: 43 additions & 0 deletions test/distributed/cases/pitr/pitr1.result
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
drop account if exists acc01;
create account acc01 admin_name = 'test_account' identified by '111';
drop pitr if exists p_01;
create pitr p_01 range 1 'd';
show pitr;
PITR_NAME CREATED_TIME MODIFIED_TIME PITR_LEVEL ACCOUNT_NAME DATABASE_NAME TABLE_NAME PITR_LENGTH PITR_UNIT
p_01 2025-01-16 15:57:56 2025-01-16 15:57:56 account sys * * 1 d
select * from mo_catalog.mo_pitr Where pitr_name = 'p_01';
pitr_id pitr_name create_account create_time modified_time level account_id account_name database_name table_name obj_id pitr_length pitr_unit pitr_status pitr_status_changed_time
01946e1e-72f2-7294-afca-fe8b9c3286be p_01 0 2025-01-16 07:57:56 2025-01-16 07:57:56 account 0 sys 0 1 d 1 2025-01-16 07:52:03
alter pitr p_01 range 100 'd';
show pitr;
PITR_NAME CREATED_TIME MODIFIED_TIME PITR_LEVEL ACCOUNT_NAME DATABASE_NAME TABLE_NAME PITR_LENGTH PITR_UNIT
p_01 2025-01-16 15:57:56 2025-01-16 15:57:56 account sys * * 100 d
select * from mo_catalog.mo_pitr Where pitr_name = 'p_01';
pitr_id pitr_name create_account create_time modified_time level account_id account_name database_name table_name obj_id pitr_length pitr_unit pitr_status pitr_status_changed_time
01946e1e-72f2-7294-afca-fe8b9c3286be p_01 0 2025-01-16 07:57:56 2025-01-16 07:57:56 account 0 sys 0 100 d 1 2025-01-16 07:52:03
drop pitr p_01;
show pitr;
PITR_NAME CREATED_TIME MODIFIED_TIME PITR_LEVEL ACCOUNT_NAME DATABASE_NAME TABLE_NAME PITR_LENGTH PITR_UNIT
select * from mo_catalog.mo_pitr Where pitr_name = 'p_01';
pitr_id pitr_name create_account create_time modified_time level account_id account_name database_name table_name obj_id pitr_length pitr_unit pitr_status pitr_status_changed_time
drop pitr if exists `select`;
create pitr `select` range 10 'd';
show pitr;
PITR_NAME CREATED_TIME MODIFIED_TIME PITR_LEVEL ACCOUNT_NAME DATABASE_NAME TABLE_NAME PITR_LENGTH PITR_UNIT
select 2025-01-16 15:57:56 2025-01-16 15:57:56 account acc01 * * 10 d
select * from mo_catalog.mo_pitr Where pitr_name = 'select';
pitr_id pitr_name create_account create_time modified_time level account_id account_name database_name table_name obj_id pitr_length pitr_unit pitr_status pitr_status_changed_time
01946e1e-7370-7825-9e3e-bd50ee1ee09a select 1 2025-01-16 07:57:56 2025-01-16 07:57:56 account 1 acc01 1 10 d 1 2025-01-16 07:52:03
alter pitr `select` range 30 'd';
show pitr;
PITR_NAME CREATED_TIME MODIFIED_TIME PITR_LEVEL ACCOUNT_NAME DATABASE_NAME TABLE_NAME PITR_LENGTH PITR_UNIT
select 2025-01-16 15:57:56 2025-01-16 15:57:57 account acc01 * * 30 d
select * from mo_catalog.mo_pitr Where pitr_name = 'select';
pitr_id pitr_name create_account create_time modified_time level account_id account_name database_name table_name obj_id pitr_length pitr_unit pitr_status pitr_status_changed_time
01946e1e-7370-7825-9e3e-bd50ee1ee09a select 1 2025-01-16 07:57:56 2025-01-16 07:57:57 account 1 acc01 1 30 d 1 2025-01-16 07:52:03
drop pitr `select`;
select * from mo_catalog.mo_pitr Where pitr_name = 'select';
pitr_id pitr_name create_account create_time modified_time level account_id account_name database_name table_name obj_id pitr_length pitr_unit pitr_status pitr_status_changed_time
drop account acc01;
show pitr;
PITR_NAME CREATED_TIME MODIFIED_TIME PITR_LEVEL ACCOUNT_NAME DATABASE_NAME TABLE_NAME PITR_LENGTH PITR_UNIT
46 changes: 46 additions & 0 deletions test/distributed/cases/pitr/pitr1.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
drop account if exists acc01;
create account acc01 admin_name = 'test_account' identified by '111';

-- sys creates pitr for sys, show pitr
drop pitr if exists p_01;
create pitr p_01 range 1 'd';
-- @ignore:1,2
show pitr;
-- @ignore:0,2,3,4,6,7,10,14
select * from mo_catalog.mo_pitr Where pitr_name = 'p_01';
alter pitr p_01 range 100 'd';
-- @ignore:1,2
show pitr;
-- @ignore:0,2,3,4,6,7,10,14
select * from mo_catalog.mo_pitr Where pitr_name = 'p_01';
drop pitr p_01;
-- @ignore:1,2
show pitr;
-- @ignore:0,2,3,4,6,7,10,14
select * from mo_catalog.mo_pitr Where pitr_name = 'p_01';


-- nonsys creates pitr for current account
-- @session:id=1&user=acc01:test_account&password=111
drop pitr if exists `select`;
create pitr `select` range 10 'd';
-- @ignore:1,2
show pitr;
-- @session
-- @ignore:0,2,3,4,6,7,10,14
select * from mo_catalog.mo_pitr Where pitr_name = 'select';
-- @session:id=1&user=acc01:test_account&password=111
alter pitr `select` range 30 'd';
-- @ignore:1,2
show pitr;
-- @session
-- @ignore:0,2,3,4,6,7,10,14
select * from mo_catalog.mo_pitr Where pitr_name = 'select';
-- @session:id=1&user=acc01:test_account&password=111
drop pitr `select`;
-- @session
-- @ignore:0,2,3,4,6,7,10,14
select * from mo_catalog.mo_pitr Where pitr_name = 'select';

drop account acc01;
show pitr;
Loading

0 comments on commit 6a2f5cd

Please sign in to comment.