Skip to content

Commit

Permalink
fix: [Cherry-pick] deduce AutoID from field info (#656)
Browse files Browse the repository at this point in the history
cherry pick from master
pr: #655 
Resolves: #654

---------

Signed-off-by: Congqi Xia <[email protected]>
  • Loading branch information
congqixia committed Jan 17, 2024
1 parent 5ed4388 commit 01a80f0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 3 additions & 1 deletion entity/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,13 @@ func (s *Schema) ProtoMessage() *schema.CollectionSchema {

// ReadProto parses proto Collection Schema
func (s *Schema) ReadProto(p *schema.CollectionSchema) *Schema {
s.AutoID = p.GetAutoID()
s.Description = p.GetDescription()
s.CollectionName = p.GetName()
s.Fields = make([]*Field, 0, len(p.GetFields()))
for _, fp := range p.GetFields() {
if fp.GetAutoID() {
s.AutoID = true
}
s.Fields = append(s.Fields, NewField().ReadProto(fp))
}
s.EnableDynamicField = p.GetEnableDynamicField()
Expand Down
1 change: 0 additions & 1 deletion entity/schema_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ func (s *SchemaSuite) TestBasic() {
nsch = nsch.ReadProto(p)

s.Equal(sch.CollectionName, nsch.CollectionName)
s.Equal(sch.AutoID, nsch.AutoID)
s.Equal(sch.Description, nsch.Description)
s.Equal(sch.EnableDynamicField, nsch.EnableDynamicField)
s.Equal(len(sch.Fields), len(nsch.Fields))
Expand Down
2 changes: 1 addition & 1 deletion test/testcases/collection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ func TestCreateJsonCollection(t *testing.T) {

// schema
collName := common.GenRandomString(6)
schema := common.GenSchema(collName, false, fields)
schema := common.GenSchema(collName, true, fields)

// create collection
err := mc.CreateCollection(ctx, schema, common.DefaultShards)
Expand Down

0 comments on commit 01a80f0

Please sign in to comment.