Add enc_version and salt to RepoInfo. #282
Open
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
ly1217
force-pushed
the
record_enc_version_and_salt
branch
6 times, most recently
from
09fdb0e to
9a2afb2
Compare
ly1217
force-pushed
the
record_enc_version_and_salt
branch
from
9a2afb2 to
fd6fe4d
Compare
killing
reviewed
Nov 2, 2019
| @@ -178,6 +178,8 @@ CREATE TABLE IF NOT EXISTS RepoInfo (id BIGINT NOT NULL PRIMARY KEY AUTO_INCREME | |||
| is_encrypted INTEGER, | |||
| last_modifier VARCHAR(255), | |||
| status INTEGER DEFAULT 0, | |||
| enc_version INTEGER, | |||
| salt CHAR(64), | |||
There was a problem hiding this comment.
这两个新加的列需要设置默认值，enc_version 默认为 0，salt 默认为 NULL。这样代码才能知道需要补充这些信息。
| @@ -1060,7 +1071,8 @@ create_tables_mysql (SeafRepoManager *mgr) | |||
| sql = "CREATE TABLE IF NOT EXISTS RepoInfo (id BIGINT NOT NULL PRIMARY KEY AUTO_INCREMENT, " | |||
| "repo_id CHAR(36), " | |||
| "name VARCHAR(255) NOT NULL, update_time BIGINT, version INTEGER, " | |||
| "is_encrypted INTEGER, last_modifier VARCHAR(255), status INTEGER DEFAULT 0, UNIQUE INDEX(repo_id)) ENGINE=INNODB"; | |||
| "is_encrypted INTEGER, last_modifier VARCHAR(255), status INTEGER DEFAULT 0, " | |||
| "enc_version INTEGER, salt CHAR(64), UNIQUE INDEX(repo_id)) ENGINE=INNODB"; | |||
| @@ -2323,7 +2344,8 @@ seaf_repo_manager_get_repos_by_owner (SeafRepoManager *mgr, | |||
| if (!repo->is_corrupted) | |||
There was a problem hiding this comment.
上面这段代码中的判断 (!repo->name || !repo->last_modifier) 不容易看懂是什么意思。其实这样写是由于我们历史上在 RepoInfo 这个表增加过两次字段，第一次加入了 repo_name 等字段，第二次加入了 last_modifier。所以由于数据库升级，所以要处理数据库中的默认值。
这里最好把这个写一个小的函数，里面检查一下 repo 对象的所有字段，只要发现一个是未赋值的，就需要加载 commit
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.
No description provided.