Revert "Add recovery window (#21451)" (#21497)

Revert "Add recovery window"

Approved by: @XuPeng-SH, @qingxinhome, @ouyuanning, @heni02, @LeftHandCold, @iamlinjunhong, @sukki37

Author: YANGGMM

pkg/bootstrap/upgrade.go

@@ -39,7 +39,6 @@ func (s *service) initUpgrade() {
 	// TODO: When v2.0.1 release, open the commented code as follows, Enable v2.0.2 upgrade package
 	s.handles = append(s.handles, v2_0_2.Handler)
 	s.handles = append(s.handles, v2_0_3.Handler)
-
 }
 
 func (s *service) getFinalVersionHandle() VersionHandle {

pkg/bootstrap/versions/v2_0_3/cluster_upgrade_list.go

@@ -34,11 +34,11 @@ var upg_mo_pitr_add_status = versions.UpgradeEntry{
 	UpgType:   versions.ADD_COLUMN,
 	UpgSql:    "alter table mo_catalog.mo_pitr add column pitr_status TINYINT UNSIGNED DEFAULT 1 after pitr_unit",
 	CheckFunc: func(txn executor.TxnExecutor, accountId uint32) (bool, error) {
-		colInfo, err := versions.CheckTableColumn(txn, accountId, catalog.MO_CATALOG, catalog.MO_PITR, "pitr_status")
+		_, err := versions.CheckTableColumn(txn, accountId, catalog.MO_CATALOG, catalog.MO_PITR, "pitr_status")
 		if err != nil {
 			return false, err
 		}
-		return colInfo.IsExits, nil
+		return true, nil
 	},
 }
 
@@ -48,11 +48,11 @@ var upg_mo_pitr_add_status_changed_time = versions.UpgradeEntry{
 	UpgType:   versions.ADD_COLUMN,
 	UpgSql:    "alter table mo_catalog.mo_pitr add column pitr_status_changed_time TIMESTAMP DEFAULT UTC_TIMESTAMP after pitr_status",
 	CheckFunc: func(txn executor.TxnExecutor, accountId uint32) (bool, error) {
-		colInfo, err := versions.CheckTableColumn(txn, accountId, catalog.MO_CATALOG, catalog.MO_PITR, "pitr_status_changed_time")
+		_, err := versions.CheckTableColumn(txn, accountId, catalog.MO_CATALOG, catalog.MO_PITR, "pitr_status_changed_time")
 		if err != nil {
 			return false, err
 		}
-		return colInfo.IsExits, nil
+		return true, nil
 	},
 }
 

pkg/bootstrap/versions/v2_0_3/tenant_upgrade_list.go renamed to pkg/bootstrap/versions/v2_0_3/tenant_upgarde_list.go

@@ -16,17 +16,14 @@ package v2_0_3
 
 import (
 	"context"
-	"strings"
 	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/matrixorigin/matrixone/pkg/bootstrap/versions"
 	"github.com/matrixorigin/matrixone/pkg/common/moerr"
-	"github.com/matrixorigin/matrixone/pkg/common/mpool"
 	"github.com/matrixorigin/matrixone/pkg/common/runtime"
-	"github.com/matrixorigin/matrixone/pkg/container/types"
 	mock_frontend "github.com/matrixorigin/matrixone/pkg/frontend/test"
 	"github.com/matrixorigin/matrixone/pkg/pb/txn"
 	"github.com/matrixorigin/matrixone/pkg/util/executor"
@@ -149,52 +146,3 @@ func Test_HandleTenantUpgrade2(t *testing.T) {
 	)
 	assert.Nil(t, err)
 }
-
-func Test_UpgEntry(t *testing.T) {
-	checkSql := `att_comment AS COLUMN_COMMENT FROM mo_catalog.mo_columns`
-
-	sid := ""
-	// test upg_mo_user_add_password_last_changed
-	runtime.RunTest(
-		sid,
-		func(rt runtime.Runtime) {
-			txnOperator := mock_frontend.NewMockTxnOperator(gomock.NewController(t))
-			txnOperator.EXPECT().TxnOptions().Return(txn.TxnOptions{CN: sid}).AnyTimes()
-			executor := executor.NewMemTxnExecutor(func(sql string) (executor.Result, error) {
-				if strings.Contains(strings.ToLower(sql), strings.ToLower(checkSql)) {
-					typs := []types.Type{
-						types.New(types.T_varchar, 64, 0),   // DATA_TYPE
-						types.New(types.T_varchar, 64, 0),   // IS_NULLABLE
-						types.New(types.T_int64, 0, 0),      // CHARACTER_MAXIMUM_LENGTH
-						types.New(types.T_int64, 0, 0),      // NUMERIC_PRECISION
-						types.New(types.T_int64, 0, 0),      // NUMERIC_SCALE
-						types.New(types.T_int64, 0, 0),      // NUMERIC_SCALE
-						types.New(types.T_int32, 0, 0),      // ORDINAL_POSITION
-						types.New(types.T_varchar, 1024, 0), // COLUMN_DEFAULT
-						types.New(types.T_varchar, 1024, 0), // EXTRA
-						types.New(types.T_varchar, 1024, 0), // COLUMN_COMMENT
-					}
-
-					memRes := executor.NewMemResult(
-						typs,
-						mpool.MustNewZero())
-					memRes.NewBatch()
-					executor.AppendStringRows(memRes, 0, []string{"DATA_TYPE_str"})
-					executor.AppendStringRows(memRes, 1, []string{"YES"}) // or "NO"
-					executor.AppendFixedRows(memRes, 2, []int64{0})
-					executor.AppendFixedRows(memRes, 3, []int64{0})
-					executor.AppendFixedRows(memRes, 4, []int64{0})
-					executor.AppendFixedRows(memRes, 5, []int64{0})
-					executor.AppendFixedRows(memRes, 6, []int32{0})
-					executor.AppendStringRows(memRes, 7, []string{"COLUMN_DEFAULT"})
-					executor.AppendStringRows(memRes, 8, []string{"EXTRA"}) // '' or 'auto_increment'
-					executor.AppendStringRows(memRes, 9, []string{"COLUMN_COMMENT"})
-					return memRes.GetResult(), nil
-				}
-				return executor.Result{}, nil
-			}, txnOperator)
-			upg_mo_pitr_add_status.Upgrade(executor, uint32(0))
-			upg_mo_pitr_add_status_changed_time.Upgrade(executor, uint32(0))
-		},
-	)
-}

pkg/bootstrap/versions/v2_0_3/upgrade_test.go renamed to pkg/bootstrap/versions/v2_0_3/upgarde_test.go

@@ -157,8 +157,6 @@ const (
 	MO_PITR_ACCOUNT_ID    = "account_id"
 	MO_PITR_DB_NAME       = "database_name"
 	MO_PITR_TABLE_NAME    = "table_name"
-	MO_PITR_STATUS        = "pitr_status"
-	MO_PITR_CHANGED_TIME  = "pitr_status_changed_time"
 
 	MO_RETENTION = "mo_retention"
 

pkg/catalog/types.go

@@ -3941,12 +3941,6 @@ func doDropAccount(ctx context.Context, ses *Session, da *dropAccount) (err erro
 				return rtnErr
 			}
 		}
-
-		// update pitr
-		rtnErr = updatePitrObjectId(ctx, bh, da.Name, uint64(accountId))
-		if rtnErr != nil {
-			return rtnErr
-		}
 		return rtnErr
 	}
 
@@ -5561,7 +5555,7 @@ func determinePrivilegeSetOfStatement(stmt tree.Statement) *privilege {
 		*tree.ShowTableValues, *tree.ShowNodeList, *tree.ShowRolesStmt,
 		*tree.ShowLocks, *tree.ShowFunctionOrProcedureStatus, *tree.ShowPublications, *tree.ShowSubscriptions,
 		*tree.ShowBackendServers, *tree.ShowStages, *tree.ShowConnectors, *tree.DropConnector,
-		*tree.PauseDaemonTask, *tree.CancelDaemonTask, *tree.ResumeDaemonTask, *tree.ShowRecoveryWindow:
+		*tree.PauseDaemonTask, *tree.CancelDaemonTask, *tree.ResumeDaemonTask:
 		objType = objectTypeNone
 		kind = privilegeKindNone
 		canExecInRestricted = true
@@ -7510,6 +7504,11 @@ func InitGeneralTenant(ctx context.Context, ses *Session, ca *createAccount) (er
 			return rtnErr
 		}
 
+		rtnErr = updatePitrObjectId(ctx, bh, newTenant.GetTenant(), uint64(newTenant.GetTenantID()))
+		if rtnErr != nil {
+			return rtnErr
+		}
+
 		return rtnErr
 	}
 

pkg/frontend/authenticate.go

@@ -1554,15 +1554,6 @@ func handleShowAccounts(ses FeSession, execCtx *ExecCtx, sa *tree.ShowAccounts)
 	return err
 }
 
-// handleShowRecoveryWindow lists the info of recovery window
-func handleShowRecoveryWindow(ses FeSession, execCtx *ExecCtx, srw *tree.ShowRecoveryWindow) error {
-	err := doShowRecoveryWindow(execCtx.reqCtx, ses.(*Session), srw)
-	if err != nil {
-		return err
-	}
-	return err
-}
-
 // handleShowCollation lists the info of collation
 func handleShowCollation(ses FeSession, execCtx *ExecCtx, sc *tree.ShowCollation) error {
 	err := doShowCollation(ses.(*Session), execCtx, execCtx.proc, sc)

pkg/frontend/mysql_cmd_executor.go

@@ -73,7 +73,7 @@ var (
 	getPubInfoWithPitrFormat = `select pub_name, database_name, database_id, table_list, account_list, created_time, update_time, owner, creator, comment from mo_catalog.mo_pubs {MO_TS = %d} where account_id = %d and database_name = '%s';`
 
 	// update mo_pitr object id
-	updateMoPitrAccountObjectIdFmt = `update mo_catalog.mo_pitr set pitr_status = 0, pitr_status_changed_time = default where account_name = '%s' and pitr_status = 1 and obj_id = %d;`
+	updateMoPitrAccountObjectIdFmt = `update mo_catalog.mo_pitr set obj_id = %d, modified_time = '%s' where account_name = '%s';`
 )
 
 type pitrRecord struct {
@@ -156,8 +156,8 @@ func getPubInfoWithPitr(ts int64, accountId uint32, dbName string) string {
 	return fmt.Sprintf(getPubInfoWithPitrFormat, ts, accountId, dbName)
 }
 
-func getSqlForUpdateMoPitrAccountObjectId(accountName string, objId uint64) string {
-	return fmt.Sprintf(updateMoPitrAccountObjectIdFmt, accountName, objId)
+func getSqlForUpdateMoPitrAccountObjectId(accountName string, objId uint64, modifiedTime string) string {
+	return fmt.Sprintf(updateMoPitrAccountObjectIdFmt, objId, modifiedTime, accountName)
 }
 
 func checkPitrDup(ctx context.Context, bh BackgroundExec, createAccount string, createAccountId uint64, stmt *tree.CreatePitr) (bool, error) {
@@ -198,14 +198,14 @@ func getSqlForCheckPitrDup(createAccount string, createAccountId uint64, stmt *t
 		return getSqlForCheckDupPitrFormat(createAccountId, math.MaxUint64)
 	case tree.PITRLEVELACCOUNT:
 		if len(stmt.AccountName) > 0 {
-			return fmt.Sprintf(sql, createAccountId) + fmt.Sprintf(" and account_name = '%s' and level = 'account' and pitr_status = 1;", stmt.AccountName)
+			return fmt.Sprintf(sql, createAccountId) + fmt.Sprintf(" and account_name = '%s' and level = 'account';", stmt.AccountName)
 		} else {
-			return fmt.Sprintf(sql, createAccountId) + fmt.Sprintf(" and account_name = '%s' and level = 'account' and pitr_status = 1;", createAccount)
+			return fmt.Sprintf(sql, createAccountId) + fmt.Sprintf(" and account_name = '%s' and level = 'account';", createAccount)
 		}
 	case tree.PITRLEVELDATABASE:
-		return fmt.Sprintf(sql, createAccountId) + fmt.Sprintf(" and database_name = '%s' and level = 'database' and pitr_status = 1;", stmt.DatabaseName)
+		return fmt.Sprintf(sql, createAccountId) + fmt.Sprintf(" and database_name = '%s' and level = 'database';", stmt.DatabaseName)
 	case tree.PITRLEVELTABLE:
-		return fmt.Sprintf(sql, createAccountId) + fmt.Sprintf(" and database_name = '%s' and table_name = '%s' and level = 'table' and pitr_status = 1;", stmt.DatabaseName, stmt.TableName)
+		return fmt.Sprintf(sql, createAccountId) + fmt.Sprintf(" and database_name = '%s' and table_name = '%s' and level = 'table';", stmt.DatabaseName, stmt.TableName)
 	}
 	return sql
 }
@@ -2371,7 +2371,7 @@ func updatePitrObjectId(ctx context.Context,
 	sql := getSqlForUpdateMoPitrAccountObjectId(
 		accountName,
 		objId,
-	)
+		types.CurrentTimestamp().String2(time.UTC, 0))
 	err = bh.Exec(ctx, sql)
 	if err != nil {
 		return

pkg/frontend/pitr.go

@@ -1302,15 +1302,15 @@ func TestGetSqlForCheckPitrDup(t *testing.T) {
 			stmt: &tree.CreatePitr{
 				Level: tree.PITRLEVELACCOUNT,
 			},
-			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 0 and account_name = 'sys' and level = 'account' and pitr_status = 1;",
+			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 0 and account_name = 'sys' and level = 'account';",
 		},
 		{
 			createAccount:   "testAccount",
 			createAccountId: 1,
 			stmt: &tree.CreatePitr{
 				Level: tree.PITRLEVELACCOUNT,
 			},
-			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 1 and account_name = 'testAccount' and level = 'account' and pitr_status = 1;",
+			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 1 and account_name = 'testAccount' and level = 'account';",
 		},
 		{
 			createAccount:   "sys",
@@ -1319,7 +1319,7 @@ func TestGetSqlForCheckPitrDup(t *testing.T) {
 				Level:       tree.PITRLEVELACCOUNT,
 				AccountName: "testAccountName",
 			},
-			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 0 and account_name = 'testAccountName' and level = 'account' and pitr_status = 1;",
+			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 0 and account_name = 'testAccountName' and level = 'account';",
 		},
 		{
 			createAccount:   "sys",
@@ -1328,7 +1328,7 @@ func TestGetSqlForCheckPitrDup(t *testing.T) {
 				Level:        tree.PITRLEVELDATABASE,
 				DatabaseName: "testDb",
 			},
-			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 0 and database_name = 'testDb' and level = 'database' and pitr_status = 1;",
+			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 0 and database_name = 'testDb' and level = 'database';",
 		},
 		{
 			createAccount:   "testAccount",
@@ -1337,7 +1337,7 @@ func TestGetSqlForCheckPitrDup(t *testing.T) {
 				Level:        tree.PITRLEVELDATABASE,
 				DatabaseName: "testDb",
 			},
-			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 1 and database_name = 'testDb' and level = 'database' and pitr_status = 1;",
+			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 1 and database_name = 'testDb' and level = 'database';",
 		},
 		{
 			createAccount:   "sys",
@@ -1347,7 +1347,7 @@ func TestGetSqlForCheckPitrDup(t *testing.T) {
 				DatabaseName: "testDb",
 				TableName:    "testTable",
 			},
-			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 0 and database_name = 'testDb' and table_name = 'testTable' and level = 'table' and pitr_status = 1;",
+			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 0 and database_name = 'testDb' and table_name = 'testTable' and level = 'table';",
 		},
 		{
 			createAccount:   "testAccount",
@@ -1357,7 +1357,7 @@ func TestGetSqlForCheckPitrDup(t *testing.T) {
 				DatabaseName: "testDb",
 				TableName:    "testTable",
 			},
-			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 1 and database_name = 'testDb' and table_name = 'testTable' and level = 'table' and pitr_status = 1;",
+			expected: "select pitr_id from mo_catalog.mo_pitr where create_account = 1 and database_name = 'testDb' and table_name = 'testTable' and level = 'table';",
 		},
 	}
 
@@ -2541,7 +2541,7 @@ func Test_doCreatePitr(t *testing.T) {
 		mrs := newMrsForPitrRecord([][]interface{}{})
 		bh.sql2result[sql] = mrs
 
-		sql = fmt.Sprintf("select pitr_id from mo_catalog.mo_pitr where create_account = %d", sysAccountID) + fmt.Sprintf(" and account_name = '%s' and level = 'account' and pitr_status = 1;", sysAccountName)
+		sql = fmt.Sprintf("select pitr_id from mo_catalog.mo_pitr where create_account = %d", sysAccountID) + fmt.Sprintf(" and account_name = '%s' and level = 'account';", sysAccountName)
 		mrs = newMrsForPitrRecord([][]interface{}{})
 		bh.sql2result[sql] = mrs
 

pkg/frontend/pitr_test.go

@@ -151,8 +151,6 @@ var (
 			obj_id bigint unsigned,
 			pitr_length tinyint unsigned,
 			pitr_unit varchar(10),
-			pitr_status tinyint unsigned default 1 comment '1: active, 0: inactive',
-			pitr_status_changed_time timestamp default UTC_TIMESTAMP,
 			primary key(pitr_name, create_account)
 			)`, catalog.MO_CATALOG, catalog.MO_PITR)
 

pkg/frontend/predefined.go

@@ -423,7 +423,7 @@ func simpleAstMarshal(stmt tree.Statement) ([]byte, error) {
 		*tree.ShowTableNumber, *tree.ShowColumnNumber,
 		*tree.ShowTableValues, *tree.ShowNodeList,
 		*tree.ShowLocks, *tree.ShowFunctionOrProcedureStatus, *tree.ShowConnectors,
-		*tree.ShowLogserviceReplicas, *tree.ShowLogserviceStores, *tree.ShowLogserviceSettings, *tree.ShowRecoveryWindow:
+		*tree.ShowLogserviceReplicas, *tree.ShowLogserviceStores, *tree.ShowLogserviceSettings:
 		s.Typ = int(astShowNone)
 	case *tree.ExplainFor, *tree.ExplainAnalyze, *tree.ExplainStmt:
 		s.Typ = int(astExplain)

pkg/frontend/query_result.go

@@ -456,12 +456,6 @@ func execInFrontend(ses *Session, execCtx *ExecCtx) (stats statistic.StatsArray,
 		if err != nil {
 			return
 		}
-	case *tree.ShowRecoveryWindow:
-		ses.EnterFPrint(FPShowRecoveryWindow)
-		defer ses.ExitFPrint(FPShowRecoveryWindow)
-		if err = handleShowRecoveryWindow(ses, execCtx, st); err != nil {
-			return
-		}
 	case *tree.SetConnectionID:
 		ses.EnterFPrint(FPSetConnectionID)
 		defer ses.ExitFPrint(FPSetConnectionID)