*: use schema diff to reduce memory allocation #1858
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When schema version has changed, we don't need to reload all schemas, only modified table need to be reloaded, this will reduce the pressure on Go garbage collector. Also removed used map in *inforSchema.
ngaut
reviewed
Oct 22, 2016
| } | ||
|
|
||
| func (s *testPrivilegeSuite) SetUpTest(c *C) { | ||
| fmt.Println("SETUPTEST") |
ngaut
requested changes
Oct 22, 2016
| @@ -71,7 +73,9 @@ func (s *testPrivilegeSuite) SetUpTest(c *C) { | |||
| mustExec(c, se, s.createDBSQL) | |||
| mustExec(c, se, s.createDB1SQL) // create database test1 | |||
| mustExec(c, se, s.useDBSQL) | |||
| mustExec(c, se, s.createTableSQL) | |||
| _, err := se.Execute(s.createTableSQL) | |||
| log.Error(err) | |||
| @@ -87,9 +91,11 @@ func (s *testPrivilegeSuite) SetUpTest(c *C) { | |||
| } | |||
|
|
|||
| func (s *testPrivilegeSuite) TearDownTest(c *C) { | |||
| fmt.Println("TEARDOWNTEST") | |||
coocood
force-pushed
the
coocood/schema-diff
branch
from
61ea4b0 to
2d98f70
Compare
ngaut
approved these changes
Oct 24, 2016
zimulala
reviewed
Oct 24, 2016
| return []byte(fmt.Sprintf("%s:%d", mSchemaDiffPrefix, schemaVersion)) | ||
| } | ||
|
|
||
| // GetSchemaDiff gets the modification information on a given schema version. |
There was a problem hiding this comment.
I think modification is fine.
| } | ||
|
|
||
| // GetSchemaDiff gets the modification information on a given schema version. | ||
| func (m *Meta) GetSchemaDiff(schemaVersion int64) (*model.SchemaDiff, error) { |
zimulala
reviewed
Oct 24, 2016
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| log.Infof("[ddl] loadInfoSchema %d", latestSchemaVersion) |
There was a problem hiding this comment.
Update the log and add some logs at line68.
ngaut
requested changes
Oct 24, 2016
| // If there isn't any used version, or used version is too old, we do full load. | ||
| return false, nil | ||
| } | ||
| if usedVersion > newVersion { |
There was a problem hiding this comment.
Is is possible that usedVersion larger than newVersion ?
| } | ||
|
|
||
| // tryLoadSchemaDiffs tries to only load latest schema changes. | ||
| func (do *Domain) tryLoadSchemaDiffs(m *meta.Meta, usedVersion, newVersion int64) (bool, error) { |
There was a problem hiding this comment.
Please add comments to explain bool return value.
| } | ||
| di, ok := b.is.schemas[diff.SchemaID] | ||
| if !ok { | ||
| return ErrDatabaseNotExists |
There was a problem hiding this comment.
There must be some serious bug if we go into the branch. Maybe we should log fatal message.
There was a problem hiding this comment.
If that happens, we can fall back to full load, we don't have to log.Fatal.
| b.applyDropSchema(diff.SchemaID) | ||
| return nil | ||
| } | ||
| di, ok := b.is.schemas[diff.SchemaID] |
| newDbInfo := new(model.DBInfo) | ||
| *newDbInfo = *di | ||
| newDbInfo.Tables = make([]*model.TableInfo, 0, len(di.Tables)) | ||
| if newTableID != 0 { |
There was a problem hiding this comment.
when the new TableID is equal to 0 ? add comments here.
There was a problem hiding this comment.
@ngaut define '0' as 'zeroValue‘?
| if len(data) == 0 { | ||
| return nil, nil | ||
| } | ||
| diff := new(model.SchemaDiff) |
There was a problem hiding this comment.
We need to return a pointer type.
hanfei1991
reviewed
Oct 24, 2016
|
|
||
| // tryLoadSchemaDiffs tries to only load latest schema changes. | ||
| func (do *Domain) tryLoadSchemaDiffs(m *meta.Meta, usedVersion, newVersion int64) (bool, error) { | ||
| if usedVersion == 0 || newVersion-usedVersion > 100 { |
| newDbInfo := new(model.DBInfo) | ||
| *newDbInfo = *di | ||
| newDbInfo.Tables = make([]*model.TableInfo, 0, len(di.Tables)) | ||
| if newTableID != 0 { |
There was a problem hiding this comment.
when the new TableID is equal to 0 ? add comments here.
|
@zimulala @ngaut @hanfei1991 PTAL |
ngaut
reviewed
Oct 24, 2016
| // Returns true if the schema is loaded successfully. | ||
| // Returns false if the schema can not be loaded by schema diff, then we need to do full load. | ||
| func (do *Domain) tryLoadSchemaDiffs(m *meta.Meta, usedVersion, newVersion int64) (bool, error) { | ||
| if usedVersion == 0 || newVersion-usedVersion > maxNumberOfDiffsToLoad { |
ngaut
approved these changes
Oct 24, 2016
ngaut
reviewed
Oct 24, 2016
| } | ||
| // The old DBInfo still holds a reference to old table info, we need to update it. | ||
| // As old DBInfo should be read only, we clone a new DBInfo. | ||
| newDbInfo := new(model.DBInfo) |
There was a problem hiding this comment.
Extract to a new function, cloneDBInfo().
|
LGTM |
zimulala
reviewed
Oct 24, 2016
| } | ||
| } | ||
|
|
||
| func (b *Builder) applyCreateTable(m *meta.Meta, di *model.DBInfo, tableID int64, alloc autoid.Allocator) error { |
|
LGTM |
Conflicts: ddl/column.go ddl/foreign_key.go ddl/index.go ddl/schema.go ddl/table.go
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When schema version has changed, we don't need to reload all schemas, only
modified table need to be reloaded, this will reduce the pressure on Go garbage collector.
Also removed used map in *inforSchema.