drop mst perf & remove panic cmds & adjust lock sequence (openGemini#574)

Signed-off-by: lihanxue <[email protected]>

Author: lihanxue

app/ts-meta/meta/store.go

@@ -761,8 +761,9 @@ func (s *Store) serveSnapshotV2() {
 	}
 }
 
-func (s *Store) deleteMeasurement(db string, rp *meta.RetentionPolicyInfo, mst string) error {
-	s.cacheMu.RLock()
+func (s *Store) getNodeShardsMap(db string, rp *meta.RetentionPolicyInfo, mst string) map[uint64][]uint64 {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
 	nodeShardsMap := make(map[uint64][]uint64)
 	for sgIdx := range rp.ShardGroups {
 		for shIdx := range rp.ShardGroups[sgIdx].Shards {
@@ -780,6 +781,12 @@ func (s *Store) deleteMeasurement(db string, rp *meta.RetentionPolicyInfo, mst s
 			}
 		}
 	}
+	return nodeShardsMap
+}
+
+func (s *Store) deleteMeasurement(db string, rp *meta.RetentionPolicyInfo, mst string) error {
+	s.cacheMu.RLock()
+	nodeShardsMap := s.getNodeShardsMap(db, rp, mst)
 
 	errChan := make(chan error)
 	n := 0
@@ -907,7 +914,7 @@ func (s *Store) checkDelete(deleteType int) {
 							n++
 							go func(db string, rp *meta.RetentionPolicyInfo, mst string) {
 								errChan <- s.deleteMeasurement(db, rp, mst)
-							}(db.Name, rp.Clone(), rp.Measurements[mstIdx].Name)
+							}(db.Name, rp, rp.Measurements[mstIdx].Name)
 						}
 					}
 				})

app/ts-meta/meta/store_fsm.go

@@ -417,7 +417,8 @@ func (fsm *storeFSM) executeCmd(cmd proto2.Command) interface{} {
 	if handler, ok := applyFunc[cmd.GetType()]; ok {
 		return handler(fsm, &cmd)
 	}
-	panic(fmt.Errorf("cannot apply command: %x", cmd.GetType()))
+	fsm.Logger.Error("cannot apply command: %x", zap.Int32("typ", int32(cmd.GetType())))
+	return nil
 }
 
 func (fsm *storeFSM) applyReShardingCommand(cmd *proto2.Command) interface{} {

app/ts-meta/meta/store_internal_test.go

@@ -18,6 +18,7 @@ package meta
 
 import (
 	"fmt"
+	"math"
 	"sync"
 	"testing"
 	"time"
@@ -812,3 +813,16 @@ func Test_applyInsertFiles(t *testing.T) {
 	resErr = applyInsertFilesCommand(fsm, cmd)
 	require.EqualError(t, resErr.(error), "UNIQUE constraint failed: files.mst_id, files.shard_id, files.sequence, files.level, files.extent, files.merge")
 }
+
+func Test_executeCmdErr(t *testing.T) {
+	s := &Store{Logger: logger.NewLogger(errno.ModuleUnknown).SetZapLogger(zap.NewNop())}
+	fsm := (*storeFSM)(s)
+	typ := proto2.Command_InsertFilesCommand
+	cmd := &proto2.Command{Type: &typ}
+	value := &proto2.InsertFilesCommand{}
+	err := proto.SetExtension(cmd, proto2.E_InsertFilesCommand_Command, value)
+	require.NoError(t, err)
+	var errType proto2.Command_Type = math.MaxInt32
+	cmd.Type = &errType
+	fsm.executeCmd(*cmd)
+}