This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Prepare for more DefaultFileSource changes #12072
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
jfirebaugh
reviewed
Jun 6, 2018
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Create)) { | ||
| using namespace mbgl; | ||
| class OfflineDatabaseTest : public ::testing::Test { |
There was a problem hiding this comment.
I dislike the "fixture" style of testing -- it makes it non-obvious what tests do, because they have hidden behavior without even an obvious function call you can trace through. Can we stick to the existing style?
src/mbgl/util/logging.cpp
Outdated
| @@ -43,8 +43,7 @@ void Log::record(EventSeverity severity, Event event, int64_t code) { | |||
| } | |||
|
|
|||
| void Log::record(EventSeverity severity, Event event, int64_t code, const std::string &msg) { | |||
| if (currentObserver && severity != EventSeverity::Debug && | |||
There was a problem hiding this comment.
Was there a reason this was skipping Debug severity before?
There was a problem hiding this comment.
Not really; we aren't using Debug much. I changed the logging of one expected message from Debug to Info since it was a better fit anyway.
platform/default/sqlite3.cpp
Outdated
| @@ -190,25 +187,46 @@ Database &Database::operator=(Database &&other) { | |||
|
|
|||
| Database::~Database() = default; | |||
|
|
|||
|
|
|||
| DatabaseImpl::~DatabaseImpl() { | |||
| // Mark all transactions as invalid by removing the pointer to the database | |||
There was a problem hiding this comment.
When does this situation arise? Do we not want it to be considered a logic error, and require the database to outlive any transactions?
kkaefer
force-pushed
the
refactor-sqlite
branch
2 times, most recently
from
137a039
to
792dea4
Compare
|
Please re-review; I split up all of the commits to make them easier to review. I removed the common base class for tests, and they now explicitly perform all preparatory actions in each test body. |
jfirebaugh
approved these changes
Jun 12, 2018
| switch (userVersion()) { | ||
| case 0: | ||
| case 1: | ||
| // cache-only database; remove old table |
There was a problem hiding this comment.
// Newly created database, or old cache-only database; remove old table if it exists.
Before this change, we've tried to open the database in read/write, but not create mode. In situations where the database didn't exist yet, this logged an error to the console, and we proceeded to opening it again in read/write/create mode, which actually created the file. The reason we did this is so that we could detect really old caching databases from January 2016 in case a developer upgraded from an older SDK (iOS v3.1 and earlier, Android v3.2 and earlier) that didn't have #3715 yet. However, these error messages, while innocent, look scary in the console and some users suspect that it's a bug. This change opens the file directly in read/write/create mode, omitting the first failed attempt. To handle old cache databases, we're now deleting the `http_cache` table, which was the only table in those old databases, and create the new schema, rather than deleting the entire file and recreating the Database object. In most scenarios, this will lead to one fewer opening attempt, while the database migration will continue to work for the few users who upgrade all the way from a January 2016 SDK. Additionally, this fixes a mismatch between the Qt and non-Qt implementation: Qt doesn't support opening a file in read/write mode without the create flag. This means that we've seen a different control flow on Qt compared to the non-Qt implementation when opening a database.
|
🎉 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.