Skip to content
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

Jump to bottom

Autoschema fix to correctly return max schemaVersion #4757

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Autoschema fix to correctly return max schemaVersion #4757

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
29 changes: 15 additions & 14 deletions usecases/objects/auto_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (m *autoSchemaManager) autoSchema(ctx context.Context, principal *models.Pr
m.mutex.Lock()
defer m.mutex.Unlock()

var schemaVersion uint64
var maxSchemaVersion uint64
for _, object := range objects {
if object == nil {
return 0, fmt.Errorf(validation.ErrorMissingObject)
Expand All @@ -73,7 +73,7 @@ func (m *autoSchemaManager) autoSchema(ctx context.Context, principal *models.Pr

object.Class = schema.UppercaseClassName(object.Class)

schemaClass, classVersion, err := m.schemaManager.GetCachedClass(ctx, principal, object.Class)
schemaClass, schemaVersion, err := m.schemaManager.GetCachedClass(ctx, principal, object.Class)
if err != nil {
return 0, err
}
Expand All @@ -84,26 +84,27 @@ func (m *autoSchemaManager) autoSchema(ctx context.Context, principal *models.Pr
if err != nil {
return 0, err
}

if schemaClass == nil {
if classVersion, err = m.createClass(ctx, principal, object.Class, properties); err != nil {
return classVersion, err
}
classcache.RemoveClassFromContext(ctx, object.Class)
continue
}
newProperties := schema.DedupProperties(schemaClass.Properties, properties)
if len(newProperties) > 0 {
if classVersion, err = m.schemaManager.AddClassProperty(ctx, principal, schemaClass, true, newProperties...); err != nil {
if schemaVersion, err = m.createClass(ctx, principal, object.Class, properties); err != nil {
return 0, err
}
classcache.RemoveClassFromContext(ctx, object.Class)
} else {
if newProperties := schema.DedupProperties(schemaClass.Properties, properties); len(newProperties) > 0 {
if schemaVersion, err = m.schemaManager.AddClassProperty(ctx,
principal, schemaClass, true, newProperties...); err != nil {
return 0, err
}
classcache.RemoveClassFromContext(ctx, object.Class)
}
}

if classVersion > schemaVersion {
schemaVersion = classVersion
if schemaVersion > maxSchemaVersion {
maxSchemaVersion = schemaVersion
}
}
return 0, nil
return maxSchemaVersion, nil
}

func (m *autoSchemaManager) createClass(ctx context.Context, principal *models.Principal,
Expand Down
Loading