Merge pull request #5 from apecloud/support/rename-offpg-to-vanilla-p…

…ostgresql

chore: rename official-postgresql to vanilla-postgresql

engines/models/engine_types.go

@@ -25,7 +25,7 @@ const (
 	MySQL              EngineType = "mysql"
 	WeSQL              EngineType = "wesql"
 	PostgreSQL         EngineType = "postgresql"
-	OfficialPostgreSQL EngineType = "official-postgresql"
+	VanillaPostgreSQL  EngineType = "vanilla-postgresql"
 	ApecloudPostgreSQL EngineType = "apecloud-postgresql"
 	Redis              EngineType = "redis"
 	ETCD               EngineType = "etcd"
@@ -45,7 +45,7 @@ func GetEngineTypeList() []EngineType {
 		MySQL,
 		WeSQL,
 		PostgreSQL,
-		OfficialPostgreSQL,
+		VanillaPostgreSQL,
 		ApecloudPostgreSQL,
 		Redis,
 		ETCD,

engines/postgres/manager.go

@@ -71,42 +71,6 @@ func NewManager(properties map[string]string) (engines.DBManager, error) {
 	return mgr, nil
 }
 
-func (mgr *Manager) IsRunning() bool {
-	if mgr.Proc != nil {
-		if isRunning, err := mgr.Proc.IsRunning(); isRunning && err == nil {
-			return true
-		}
-		mgr.Proc = nil
-	}
-
-	return mgr.newProcessFromPidFile() == nil
-}
-
-func (mgr *Manager) newProcessFromPidFile() error {
-	pidFile, err := readPidFile(mgr.DataDir)
-	if err != nil {
-		mgr.Logger.Error(err, "read pid file failed, err")
-		return err
-	}
-
-	proc, err := process.NewProcess(pidFile.pid)
-	if err != nil {
-		mgr.Logger.Error(err, "new process failed, err")
-		return err
-	}
-
-	mgr.Proc = proc
-	return nil
-}
-
-func (mgr *Manager) Recover(context.Context, *dcs.Cluster) error {
-	return nil
-}
-
-func (mgr *Manager) GetHealthiestMember(*dcs.Cluster, string) *dcs.Member {
-	return nil
-}
-
 func (mgr *Manager) SetIsLeader(isLeader bool) {
 	if isLeader {
 		mgr.isLeader = 1
@@ -222,7 +186,3 @@ func (mgr *Manager) Unlock(ctx context.Context) error {
 	mgr.Logger.Info("UnLock db success")
 	return nil
 }
-
-func (mgr *Manager) ShutDownWithWait() {
-	mgr.Pool.Close()
-}

engines/postgres/manager_test.go

@@ -25,8 +25,6 @@ import (
 	"testing"
 
 	"github.com/pashagolub/pgxmock/v2"
-	"github.com/shirou/gopsutil/v3/process"
-	"github.com/spf13/afero"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 
@@ -63,49 +61,6 @@ func MockDatabase(t *testing.T) (*Manager, pgxmock.PgxPoolIface, error) {
 	return manager, mock, err
 }
 
-func TestIsRunning(t *testing.T) {
-	manager, mock, _ := MockDatabase(t)
-	defer mock.Close()
-
-	t.Run("proc is nil, can't read file", func(t *testing.T) {
-		isRunning := manager.IsRunning()
-		assert.False(t, isRunning)
-	})
-
-	t.Run("proc is not nil ,process is not exist", func(t *testing.T) {
-		manager.Proc = &process.Process{
-			Pid: 100000,
-		}
-
-		isRunning := manager.IsRunning()
-		assert.False(t, isRunning)
-	})
-}
-
-func TestNewProcessFromPidFile(t *testing.T) {
-	fs = afero.NewMemMapFs()
-	manager, mock, _ := MockDatabase(t)
-	defer mock.Close()
-
-	t.Run("file is not exist", func(t *testing.T) {
-		err := manager.newProcessFromPidFile()
-		assert.NotNil(t, err)
-		assert.ErrorContains(t, err, "file does not exist")
-	})
-
-	t.Run("process is not exist", func(t *testing.T) {
-		data := "100000\n/postgresql/data\n1692770488\n5432\n/var/run/postgresql\n*\n  2388960         4\nready"
-		err := afero.WriteFile(fs, manager.DataDir+"/postmaster.pid", []byte(data), 0644)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		err = manager.newProcessFromPidFile()
-		assert.NotNil(t, err)
-		assert.ErrorContains(t, err, "process does not exist")
-	})
-}
-
 func TestReadWrite(t *testing.T) {
 	ctx := context.TODO()
 	manager, mock, _ := MockDatabase(t)
@@ -173,32 +128,6 @@ func TestPgIsReady(t *testing.T) {
 	}
 }
 
-func TestSetAndUnsetIsLeader(t *testing.T) {
-	manager, mock, _ := MockDatabase(t)
-	defer mock.Close()
-
-	t.Run("set is leader", func(t *testing.T) {
-		manager.SetIsLeader(true)
-		isSet, isLeader := manager.GetIsLeader()
-		assert.True(t, isSet)
-		assert.True(t, isLeader)
-	})
-
-	t.Run("set is not leader", func(t *testing.T) {
-		manager.SetIsLeader(false)
-		isSet, isLeader := manager.GetIsLeader()
-		assert.True(t, isSet)
-		assert.False(t, isLeader)
-	})
-
-	t.Run("unset is leader", func(t *testing.T) {
-		manager.UnsetIsLeader()
-		isSet, isLeader := manager.GetIsLeader()
-		assert.False(t, isSet)
-		assert.False(t, isLeader)
-	})
-}
-
 func TestIsLeaderMember(t *testing.T) {
 	ctx := context.TODO()
 	manager, mock, _ := MockDatabase(t)