Skip to content

index: improve unittest and duplicate check #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenchy merged 1 commit into from
Aug 26, 2025
Merged

index: improve unittest and duplicate check #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion internal/index/descriptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ type LevelIndex struct {
MD protoreflect.MessageDescriptor
ColFields []*LevelField
SortedColFields []*LevelField
NameConflict *Index
}

func (l *LevelIndex) Name() string {
Expand Down Expand Up @@ -190,7 +191,8 @@ func ParseIndexDescriptor(md protoreflect.MessageDescriptor) *IndexDescriptor {
// check duplicate index name
indexNameMap := map[string]*Index{}
for levelMessage := descriptor.LevelMessage; levelMessage != nil; levelMessage = levelMessage.NextLevel {
for _, index := range levelMessage.Indexes {
allIndexes := append(levelMessage.Indexes, levelMessage.OrderedIndexes...)
for _, index := range allIndexes {
name := index.Name()
if existingIndex, ok := indexNameMap[name]; ok {
panic(fmt.Sprintf("duplicate index name on %v in %v: %v and %v", md.Name(), md.ParentFile().Path(), index, existingIndex))
Expand Down
87 changes: 79 additions & 8 deletions internal/index/descriptor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ func Test_ParseIndexDescriptor(t *testing.T) {
},
{
Index: &Index{
Cols: []string{"Param"},
Cols: []string{"Param"},
SortedCols: []string{"ID"},
Name: "ItemInfo",
Name: "ItemInfo",
},
MD: md[*protoconf.ItemConf_Item](),
ColFields: []*LevelField{
Expand Down Expand Up @@ -108,9 +108,9 @@ func Test_ParseIndexDescriptor(t *testing.T) {
},
{
Index: &Index{
Cols: []string{"ID", "Name"},
Cols: []string{"ID", "Name"},
SortedCols: []string{"Type", "UseEffectType"},
Name: "AwardItem",
Name: "AwardItem",
},
MD: md[*protoconf.ItemConf_Item](),
ColFields: []*LevelField{
Expand Down Expand Up @@ -326,9 +326,9 @@ func Test_ParseIndexDescriptor(t *testing.T) {
},
{
Index: &Index{
Cols: []string{"ChapterName"},
Cols: []string{"ChapterName"},
SortedCols: []string{"AwardID"},
Name: "NamedChapter",
Name: "NamedChapter",
},
MD: md[*protoconf.ActivityConf_Activity_Chapter](),
ColFields: []*LevelField{
Expand Down Expand Up @@ -390,9 +390,9 @@ func Test_ParseIndexDescriptor(t *testing.T) {
Indexes: []*LevelIndex{
{
Index: &Index{
Cols: []string{"ActivityID"},
Cols: []string{"ActivityID"},
SortedCols: []string{"Goal", "ID"},
Name: "",
Name: "",
},
MD: md[*protoconf.TaskConf_Task](),
ColFields: []*LevelField{
Expand All @@ -419,6 +419,77 @@ func Test_ParseIndexDescriptor(t *testing.T) {
},
},
},
OrderedIndexes: []*LevelIndex{
{
Index: &Index{
Cols: []string{"Goal"},
SortedCols: []string{"ID"},
Name: "OrderedTask",
},
MD: md[*protoconf.TaskConf_Task](),
ColFields: []*LevelField{
{
FD: fd[*protoconf.TaskConf_Task]("goal"),
LeveledFDList: []protoreflect.FieldDescriptor{
fd[*protoconf.TaskConf_Task]("goal"),
},
},
},
SortedColFields: []*LevelField{
{
FD: fd[*protoconf.TaskConf_Task]("id"),
LeveledFDList: []protoreflect.FieldDescriptor{
fd[*protoconf.TaskConf_Task]("id"),
},
},
},
},
{
Index: &Index{
Cols: []string{"Expiry"},
Name: "TaskExpiry",
},
MD: md[*protoconf.TaskConf_Task](),
ColFields: []*LevelField{
{
FD: fd[*protoconf.TaskConf_Task]("expiry"),
LeveledFDList: []protoreflect.FieldDescriptor{
fd[*protoconf.TaskConf_Task]("expiry"),
},
},
},
},
{
Index: &Index{
Cols: []string{"Expiry"},
SortedCols: []string{"Goal", "ID"},
Name: "SortedTaskExpiry",
},
MD: md[*protoconf.TaskConf_Task](),
ColFields: []*LevelField{
{
FD: fd[*protoconf.TaskConf_Task]("expiry"),
LeveledFDList: []protoreflect.FieldDescriptor{
fd[*protoconf.TaskConf_Task]("expiry"),
},
},
},
SortedColFields: []*LevelField{
{
FD: fd[*protoconf.TaskConf_Task]("goal"),
LeveledFDList: []protoreflect.FieldDescriptor{
fd[*protoconf.TaskConf_Task]("goal"),
},
},
{
FD: fd[*protoconf.TaskConf_Task]("id"),
LeveledFDList: []protoreflect.FieldDescriptor{
fd[*protoconf.TaskConf_Task]("id"),
},
},
},
},
},
},
},
},
Expand Down