From 22a741c857d0f8c83c0df3a1ec40454bfbd3d948 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 12 Jul 2023 19:55:18 +0800 Subject: [PATCH] :recycle: Refactor av data structure --- kernel/av/av.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/kernel/av/av.go b/kernel/av/av.go index d7abf877b..7198d8966 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -169,16 +169,18 @@ type Viewable interface { GetID() string } -func NewAttributeView(id string) *AttributeView { +func NewAttributeView(id string) (ret *AttributeView) { view := NewView() - - return &AttributeView{ + key := NewKey("Block", KeyTypeBlock) + ret = &AttributeView{ Spec: 0, ID: id, - KeyValues: []*KeyValues{{Key: NewKey("Name", KeyTypeBlock)}}, + KeyValues: []*KeyValues{{Key: key}}, CurrentViewID: view.ID, Views: []*View{view}, } + view.Table.Columns = []*ViewTableColumn{{ID: key.ID}} + return } func ParseAttributeView(avID string) (ret *AttributeView, err error) { @@ -199,12 +201,6 @@ func ParseAttributeView(avID string) (ret *AttributeView, err error) { logging.LogErrorf("unmarshal attribute view [%s] failed: %s", avID, err) return } - - if 1 > len(ret.Views) { - view := NewView() - ret.CurrentViewID = view.ID - ret.Views = []*View{view} - } return }