simplify

juicedata · Dec 12, 2024 · 2ef0e4e · 2ef0e4e
1 parent 033b7e2
commit 2ef0e4e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 30 deletions.
diff --git a/pkg/meta/base.go b/pkg/meta/base.go
@@ -3197,10 +3197,5 @@ func (m *baseMeta) LoadMetaV2(ctx Context, r io.Reader, opt *LoadOption) error {
 		}
 	}
 	wg.Wait()
-
-	// insert max acl id
-	if err := m.en.load(ctx, segTypeAcl, opt, nil); err != nil {
-		logger.Errorf("failed to insert acl id: %s", err)
-	}
 	return nil
 }
diff --git a/pkg/meta/redis_bak.go b/pkg/meta/redis_bak.go
@@ -825,39 +825,28 @@ func (m *redisMeta) loadSliceRefs(ctx Context, msg proto.Message) error {
 }
 
 var loadLock sync.Mutex
+var maxAclId uint32 = 0
 
 func (m *redisMeta) loadAcl(ctx Context, msg proto.Message) error {
-	if msg == nil {
-		loadLock.Lock()
-		defer loadLock.Unlock()
-		if val := ctx.Value("maxAclId"); val != nil {
-			return m.rdb.Set(ctx, m.counterKey(aclCounter), val.(uint32), 0).Err()
-		}
-		return nil
-	}
-
-	var maxId uint32 = 0
-	loadLock.Lock()
-	if val := ctx.Value("maxAclId"); val != nil {
-		maxId = val.(uint32)
-	}
-	loadLock.Unlock()
-
 	batch := msg.(*pb.Batch)
 	acls := make(map[string]interface{}, len(batch.Acls))
 	for _, pa := range batch.Acls {
-		if pa.Id > maxId {
-			maxId = pa.Id
+		loadLock.Lock()
+		if pa.Id > maxAclId {
+			maxAclId = pa.Id
 		}
+		loadLock.Unlock()
 		acls[strconv.FormatUint(uint64(pa.Id), 10)] = pa.Data
 	}
 	if len(acls) == 0 {
 		return nil
 	}
-	loadLock.Lock()
-	ctx.WithValue("maxAclId", maxId)
-	loadLock.Unlock()
-	return m.rdb.HSet(ctx, m.aclKey(), acls).Err()
+
+	err := m.rdb.HSet(ctx, m.aclKey(), acls).Err()
+	if err != nil {
+		return err
+	}
+	return m.rdb.Set(ctx, m.counterKey(aclCounter), maxAclId, 0).Err()
 }
 
 func (m *redisMeta) loadXattrs(ctx Context, msg proto.Message) error {

diff --git a/pkg/meta/sql_bak.go b/pkg/meta/sql_bak.go
@@ -576,9 +576,6 @@ func (m *dbMeta) loadSliceRefs(ctx Context, msg proto.Message) error {
 }
 
 func (m *dbMeta) loadAcl(ctx Context, msg proto.Message) error {
-	if msg == nil {
-		return nil
-	}
 	acls := msg.(*pb.Batch).Acls
 	rows := make([]interface{}, 0, len(acls))
 	for _, pa := range acls {