-
-
Notifications
You must be signed in to change notification settings - Fork 4.9k
chore(db): migration for previous commits #10319
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.
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
Conversation
* main: chore(db): benchmark output, migration blocks/s output (syncthing#10320) chore(gui): use step of 3600 for versions cleanup interval (syncthing#10317) chore(gui): use steps of 1024 KiB for bandwidth rate limits (syncthing#10316)
internal/db/sqlite/sql/migrations/folder/04-alter-blocks-tables.sql
Outdated
Show resolved
Hide resolved
internal/db/sqlite/sql/migrations/folder/04-alter-blocks-tables.sql
Outdated
Show resolved
Hide resolved
Co-authored-by: bt90 <btom1990@googlemail.com>
Co-authored-by: bt90 <btom1990@googlemail.com>
|
|
||
| -- Copy blocks to new table with fewer indexes | ||
|
|
||
| CREATE TABLE IF NOT EXISTS blocks_v4 ( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't we fail if it exists - it should never? And to avoid failing if for some reason the table is there, do a DROP blocks_v4 IF EXISTS first - comes at the downside that if blocks doesn't exist either, we then have no more blocks. So probably just fail?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually looking at the migration go code more, I think there's a related problem there (though independent): If a migration passes but an error occurs in a later migration (or anywhere for the matter), then the schema version will stay at the old version, but the potentially irreversible/non-idempotent migration is persisted. Imo the schema version should be updated in the migration transaction. Or I am missing something - I'll send a PR, can tell me there if resp. how I am wrong :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It probably should be in the same transaction yes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
However with or without the version in the same transaction, the IF NOT EXISTS shouldn't be here, or should it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it exists, it would be an error condition and the migration should fail IMHO.
+1 from me for dropping the check
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the migration should fail
It should not, under any circumstances, really, because that will leave the user dead in the water with no way forward. I added an explicit drop instead. But, we do this in a transaction, so in principle it should not fail...
|
It might be obvious, but we're effectively doubling the size of the database during this migration. If we're not doing it already, we should do a cleanup after all migrations got applied. VACUUM;
PRAGMA wal_checkpoint(truncate);
PRAGMA optimize; |
* main: chore(db): update schema version in the same transaction as migration (syncthing#10321)
|
Also, in the immortal words of Maggie Gyllenhaal, golangci-lint can go suck a fuck in this particular instance. |
---------------------------------------------------------------------------------------
applewin.mk 3defc868e1b8308cd5b87122f968d370fb7e41de # Version: Commits on Aug 31, 2025
---------------------------------------------------------------------------------------
Merge pull request #296 from zoltanvb/gitlab-ci
CI file for RetroArch buildbot. Linux-x64 as first step.,
-----------------------------------------------------------------------------------
ares.mk 5a2be88f41c8bec95543732d796b0efeb8564054 # Version: Commits on Aug 31, 2025
-----------------------------------------------------------------------------------
gba: fix some warnings from C++20 deprecating bitwise operations between different enums,
------------------------------------------------------------------------------------------
duckstation.mk 44908fe7f444810ef94e2b99b80471ca8e8cd97d # Version: Commits on Aug 31, 2025
------------------------------------------------------------------------------------------
Qt: Respond to DPR change in memory card editor,
-------------------------------------------------------------------------------------
ikemen.mk c0be441dcddbbdb5f0c278a041a0620da76dd0b3 # Version: Commits on Aug 31, 2025
-------------------------------------------------------------------------------------
Merge pull request #2605 from Jesuszilla/new-feats
fix: Normalizer nil streamer crash, BGM swapping logic.,
--------------------------------------------------------------------------------------
openmsx.mk 86abec73ab1ffaaf4544e0447e6e6099a6946182 # Version: Commits on Aug 31, 2025
--------------------------------------------------------------------------------------
VDPCmdEngine: reset BD bit after reading S#2
Thanks a lot to 'hra1129' for reporting this:
VDP Command SRCH issue
openMSX/openMSX#1960,
-------------------------------------------------------------------------------------
ppsspp.mk 556ba2e585260b4a45c2f4c880eab496f3921302 # Version: Commits on Aug 31, 2025
-------------------------------------------------------------------------------------
Merge pull request #20770 from hrydgard/more-java-cleanup
More java cleanup, fix exit race condition in OpenGL,
--------------------------------------------------------------------------------------
shadps4.mk e6f0ee7ed202d6095f29162ea2ab9c27d4bd9e78 # Version: Commits on Aug 31, 2025
--------------------------------------------------------------------------------------
Move QT plugins to the qtplugins folder on Windows QT builds (#3491)
* test build.yml
* add qt.conf for windows-qt
* test 2 build.yml
* Update build.yml
* placeholder license and copyright in qt.conf
* proper copyright qt.conf
* Add files via upload
* Delete qt.conf from root
* changes to build.yml
* Update REUSE.toml,
---------------------------------------------------------------------------------------
thextech.mk 945187b64eb121b3a031dbfb6bddcf13581be6a6 # Version: Commits on Aug 31, 2025
---------------------------------------------------------------------------------------
controls.cpp: allow reconnecting when active profile deleted in game,
-------------------------------------------------
vice.mk r45745 # Version: Commits on Aug 31, 2025
-------------------------------------------------
Delay some initialization until first actual use. First step towards allocating all printer resources dynamically.
git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45745 379a1393-f5fb-40a0-bcee-ef074d9b53f7,
------------------------------------------------------------------------------------
box64.mk 1b2515cd496d140997d6cb2c35d180afac4ae3b8 # Version: Commits on Aug 31, 2025
------------------------------------------------------------------------------------
[ARM64_DYNAREC][TRACE] Fixed SWP B/H opcodes printer,
--------------------------------------------------------------------------------------
cgenius.mk bee00e47805909d08568c640073a2123ca7021b1 # Version: Commits on Aug 31, 2025
--------------------------------------------------------------------------------------
TTF hack fix,
---------------------------------------------------------------------------------------
corsixth.mk b9a925c4daa2d03390c32705096d8e81237a348f # Version: Commits on Aug 31, 2025
---------------------------------------------------------------------------------------
Merge pull request #2985 from TheCycoONE/multi_buffer_cleanup
Minor cleanup load_multi_buffer,
------------------------------------------------------------------------------------------
devilutionx.mk fd02564a85cc6c8d3f1ed7db9ef731c9c2ca92e7 # Version: Commits on Aug 31, 2025
------------------------------------------------------------------------------------------
magic_enum: Customize enums where they're declared
This necessitates dependencies on `magic_enum` in more
places but avoids obscure hard-to-debug errors, such
as the one seen in the DOS port PR.,
---------------------------------------------------------------------------------------
etlegacy.mk 39292c39b99bd83eef5ad56805c9dfce5f5f0a37 # Version: Commits on Aug 31, 2025
---------------------------------------------------------------------------------------
game: adjust quick scope shot closer to vanilla part 2 (#3167)
Change quick scope tolerance from 175ms to 200ms,
-----------------------------------------------------------
syncthing.mk v2.0.4-rc.1 # Version: Commits on Aug 31, 2025
-----------------------------------------------------------
## Major changes in 2.0
- Database backend switched from LevelDB to SQLite. There is a migration on
first launch which can be lengthy for larger setups. The new database is
easier to understand and maintain and, hopefully, less buggy.
- The logging format has changed to use structured log entries (a message
plus several key-value pairs). Additionally, we can now control the log
level per package, and a new log level WARNING has been inserted between
INFO and ERROR (which was previously known as WARNING...). The INFO level
has become more verbose, indicating the sync actions taken by Syncthing. A
new command line flag `--log-level` sets the default log level for all
packages, and the `STTRACE` environment variable and GUI has been updated
to set log levels per package. The `--verbose` and `--logflags` command
line options have been removed and will be ignored if given.
- Deleted items are no longer kept forever in the database, instead they are
forgotten after fifteen months. If your use case require deletes to take
effect after more than a fifteen month delay, set the
`--db-delete-retention-interval` command line option or corresponding
environment variable to zero, or a longer time interval of your choosing.
- Modernised command line options parsing. Old single-dash long options are
no longer supported, e.g. `-home` must be given as `--home`. Some options
have been renamed, others have become subcommands. All serve options are
now also accepted as environment variables. See `syncthing --help` and
`syncthing serve --help` for details.
- Rolling hash detection of shifted data is no longer supported as this
effectively never helped. Instead, scanning and syncing is faster and more
efficient without it.
- A \default folder\ is no longer created on first startup.
- Multiple connections are now used by default between v2 devices. The new
default value is to use three connections: one for index metadata and two
for data exchange.
- The following platforms unfortunately no longer get prebuilt binaries for
download at syncthing.net and on GitHub, due to complexities related to
cross compilation with SQLite:
- dragonfly/amd64
- illumos/amd64 and solaris/amd64
- linux/ppc64
- netbsd/*
- openbsd/386 and openbsd/arm
- windows/arm
- The handling of conflict resolution involving deleted files has changed. A
delete can now be the winning outcome of conflict resolution, resulting in
the deleted file being moved to a conflict copy.
This release is also available as:
* APT repository: https://apt.syncthing.net/
* Docker image: `docker.io/syncthing/syncthing:2.0.4-rc.1` or `ghcr.io/syncthing/syncthing:2.0.4-rc.1`
(`{docker,ghcr}.io/syncthing/syncthing:2` to follow just the major version)
## What's Changed
### Fixes
* fix(cmd): only start temporary API server during migration if it's enabled by @pixelspark in syncthing/syncthing#10284
* fix(model): consider MaxFolderConcurrency when calculating number of hashers by @tomasz1986 in syncthing/syncthing#10285
* fix(model): consider number of CPU cores when calculating hashers on interactive OS (#10284) by @tomasz1986 in syncthing/syncthing#10286
* fix(db): apply all migrations and schema in one transaction by @calmh in syncthing/syncthing#10323
### Other
* chore(db): adjust db bench name to improve benchstat grouping by @imsodin in syncthing/syncthing#10283
* chore(db): cleanup DB in tests and remove OpenTemp by @imsodin in syncthing/syncthing#10282
* build: use Go 1.24 tools pattern by @calmh in syncthing/syncthing#10281
* chore(db): avoid rowid for blocks and blocklists by @bt90 in syncthing/syncthing#10315
* refactor(db): slightly improve insert performance by @calmh in syncthing/syncthing#10318
* chore(gui): use steps of 1024 KiB for bandwidth rate limits by @tomasz1986 in syncthing/syncthing#10316
* chore(gui): use step of 3600 for versions cleanup interval by @tomasz1986 in syncthing/syncthing#10317
* chore(db): benchmark output, migration blocks/s output by @calmh in syncthing/syncthing#10320
* chore(db): update schema version in the same transaction as migration by @imsodin in syncthing/syncthing#10321
* chore(db): migration for previous commits by @calmh in syncthing/syncthing#10319
**Full Changelog**: syncthing/syncthing@v2.0.3...v2.0.4-rc.1,
---------------------------------------------------------------------------------------------------
mupen64plus-gliden64.mk 0ab1c5b819c96353a8571d8d5c324cc0cf0ff9f2 # Version: Commits on Aug 31, 2025
---------------------------------------------------------------------------------------------------
Use software vertices clipping (if enabled) when frame buffer emulation is off.
Fixes #2939,
----------------------------------------------------------------------------------------
retroarch.mk 601fd41ba57fd0174a22f972b188782d160fb163 # Version: Commits on Aug 31, 2025
----------------------------------------------------------------------------------------
Fix single-click playlist Enter select,
------------------------------------------------------------------------------------------
xash3d-fwgs.mk 5e53ccab55bdff2c6b13d08735dabbd2709a699c # Version: Commits on Aug 31, 2025
------------------------------------------------------------------------------------------
waf: update to latest waifu,
----------------------------------------------------------------------------------------------
libretro-ppsspp.mk 556ba2e585260b4a45c2f4c880eab496f3921302 # Version: Commits on Aug 31, 2025
----------------------------------------------------------------------------------------------
Merge pull request #20770 from hrydgard/more-java-cleanup
More java cleanup, fix exit race condition in OpenGL,
------------------------------------------------------------------------------------------------------
chromebook-linux-audio.mk 7f681e10e8b5352c4e468e901ee3770bfff37c40 # Version: Commits on Sept 02, 2025
------------------------------------------------------------------------------------------------------
functions: improve chrome platform detection
check for cros_ec in cases where stock firmware incorrectly reports system vendor,
-------------------------------------------------------------------------------------------
duckstation.mk 25b44f4283a347d05e221d841744bfd4c4d11c5f # Version: Commits on Sept 02, 2025
-------------------------------------------------------------------------------------------
Qt: Wire up new key glyphs,
--------------------------------------------------------------------------------------
ikemen.mk c00870fa97c057423c43459202476e25900ef993 # Version: Commits on Sept 01, 2025
--------------------------------------------------------------------------------------
Merge pull request #2612 from RakieI/newstuff
feat(motif): per player cursor.tween ;syntax fix,
------------------------------------------------------------------------------------------
lightspark.mk 2aee0d73e910ac51cbfe18dc92fe20cb19b93dc7 # Version: Commits on Sept 02, 2025
------------------------------------------------------------------------------------------
make getslot optimization work with local numbers
fixes crash in \FormulaRacer2012\ when entering \turbo\ mode during race,
---------------------------------------------------------------------------------------
openmsx.mk 19cde2fde4027c6df8fa6ca377e222638d81c2de # Version: Commits on Sept 02, 2025
---------------------------------------------------------------------------------------
VDPCmdEngine: tweak BD bit in S#2
Follow up on: 86abec73ab1ffaa
Thanks to 'hra1129' for more extended tests in:
openMSX/openMSX#1960,
-----------------------------------------------------
pcsx2.mk v2.5.150 # Version: Commits on Sept 02, 2025
-----------------------------------------------------
- [GameDB: Deadly Strike fixes](PCSX2/pcsx2#13226)
,
--------------------------------------------------------------------------------------
ppsspp.mk 0332e67ad40344696def0d3be4e00a88f2803f00 # Version: Commits on Sept 02, 2025
--------------------------------------------------------------------------------------
Merge pull request #20789 from hrydgard/more-modernization
Android: Fix some lint warnings,
-------------------------------------------------------------------------------------
rpcs3.mk c7de9053b4a5e0f02f4a5b9e13bb5643c70b8c53 # Version: Commits on Sept 01, 2025
-------------------------------------------------------------------------------------
Qt: fix saved gs_frame visibility,
----------------------------------------------------------------
ruffle.mk nightly-2025-09-02 # Version: Commits on Sept 02, 2025
----------------------------------------------------------------
## What's Changed
* chore: Fix a code comment by @n0samu in ruffle-rs/ruffle#21529
* avm2: Add call handlers to several error types by @SuchAFuriousDeath in ruffle-rs/ruffle#21524
**Full Changelog**: ruffle-rs/ruffle@nightly-2025-09-01...nightly-2025-09-02,
------------------------------------------------------
ryujinx.mk 1.3.129 # Version: Commits on Sept 02, 2025
------------------------------------------------------
Canary-1.3.129
---------------------------------------------------------------------------------------
shadps4.mk d9b4618085285b95d6d78deec7e0bd09a19e9dd2 # Version: Commits on Sept 02, 2025
---------------------------------------------------------------------------------------
Use icons, music and background images of updates if available (#3494)
* Update game_info.h
* fix clang game_info.h
* SceUpdateChecker game_info.h
* fix clang game_info.h
* fix clang(darn you space) game_info.h
* there was another space... game_info.h
* Update game_info.h
* fix clang game_info.h,
---------------------------------------------------------------------------------------
tsugaru.mk 4fe7012774fc3bcda9605c7a99878534a3cb0fdd # Version: Commits on Sept 02, 2025
---------------------------------------------------------------------------------------
Merge pull request #163 from bcc2528/master
Optimized sprite clear.,
------------------------------------------------------------------------------------
ymir.mk d4ee4651c654954bdd1f69f6a89d860c43b4360d # Version: Commits on Sept 02, 2025
------------------------------------------------------------------------------------
fix(VDP2): Fix VRAM access cycles loop ignoring banks A1, B0 and B1 if VRAM A wasn't partitioned
Fixes numerous graphics regressions,
----------------------------------------------------------
sdl3.mk release-3.2.22 # Version: Commits on Sept 01, 2025
----------------------------------------------------------
Updated to version 3.2.22 for release,
-------------------------------------------------------------------------------------
box64.mk 28d07f9bf03c76013db8d15477e8d1f46d1b930d # Version: Commits on Sept 02, 2025
-------------------------------------------------------------------------------------
[WRAPPERHELPER] Added legacy __attribute support (#2996),
-------------------------------------------------------------------------------------------
devilutionx.mk 0a21f6569c0e03b13de67cb7e2fe984c33253b53 # Version: Commits on Sept 02, 2025
-------------------------------------------------------------------------------------------
dos: Update SDL
Includes red cursor fix and protected mode interface performance
improvements.,
----------------------------------------------------------------------------------------
openjazz.mk a588027cc3706facb906a63d154b698f2529e0af # Version: Commits on Sept 02, 2025
----------------------------------------------------------------------------------------
Ci: Migrate to supported windows '22 runner,
-----------------------------------------------------------------------------------
stk.mk f654d88ff3dc3991d4a9596231f2be7c3c6df75f # Version: Commits on Sept 02, 2025
-----------------------------------------------------------------------------------
Fix wrong powerup sound when using after a rewind/forced sync (#5493)
Fix #5495,
-----------------------------------------------------------------------------------------
supertux2.mk 737777c810a9097aaea2c6270c34765f862beeed # Version: Commits on Sept 01, 2025
-----------------------------------------------------------------------------------------
fix tile error lol [ci skip],
-------------------------------------------------------
syncthing.mk v2.0.4 # Version: Commits on Sept 02, 2025
-------------------------------------------------------
## Major changes in 2.0
- Database backend switched from LevelDB to SQLite. There is a migration on
first launch which can be lengthy for larger setups. The new database is
easier to understand and maintain and, hopefully, less buggy.
- The logging format has changed to use structured log entries (a message
plus several key-value pairs). Additionally, we can now control the log
level per package, and a new log level WARNING has been inserted between
INFO and ERROR (which was previously known as WARNING...). The INFO level
has become more verbose, indicating the sync actions taken by Syncthing. A
new command line flag `--log-level` sets the default log level for all
packages, and the `STTRACE` environment variable and GUI has been updated
to set log levels per package. The `--verbose` and `--logflags` command
line options have been removed and will be ignored if given.
- Deleted items are no longer kept forever in the database, instead they are
forgotten after fifteen months. If your use case require deletes to take
effect after more than a fifteen month delay, set the
`--db-delete-retention-interval` command line option or corresponding
environment variable to zero, or a longer time interval of your choosing.
- Modernised command line options parsing. Old single-dash long options are
no longer supported, e.g. `-home` must be given as `--home`. Some options
have been renamed, others have become subcommands. All serve options are
now also accepted as environment variables. See `syncthing --help` and
`syncthing serve --help` for details.
- Rolling hash detection of shifted data is no longer supported as this
effectively never helped. Instead, scanning and syncing is faster and more
efficient without it.
- A \default folder\ is no longer created on first startup.
- Multiple connections are now used by default between v2 devices. The new
default value is to use three connections: one for index metadata and two
for data exchange.
- The following platforms unfortunately no longer get prebuilt binaries for
download at syncthing.net and on GitHub, due to complexities related to
cross compilation with SQLite:
- dragonfly/amd64
- illumos/amd64 and solaris/amd64
- linux/ppc64
- netbsd/*
- openbsd/386 and openbsd/arm
- windows/arm
- The handling of conflict resolution involving deleted files has changed. A
delete can now be the winning outcome of conflict resolution, resulting in
the deleted file being moved to a conflict copy.
This release is also available as:
* APT repository: https://apt.syncthing.net/
* Docker image: `docker.io/syncthing/syncthing:2.0.4` or `ghcr.io/syncthing/syncthing:2.0.4`
(`{docker,ghcr}.io/syncthing/syncthing:2` to follow just the major version)
## What's Changed
### Fixes
* fix(cmd): only start temporary API server during migration if it's enabled by @pixelspark in syncthing/syncthing#10284
* fix(model): consider MaxFolderConcurrency when calculating number of hashers by @tomasz1986 in syncthing/syncthing#10285
* fix(model): consider number of CPU cores when calculating hashers on interactive OS (#10284) by @tomasz1986 in syncthing/syncthing#10286
* fix(db): apply all migrations and schema in one transaction by @calmh in syncthing/syncthing#10323
* fix(model): correctly handle block-aligned empty sparse files by @calmh in syncthing/syncthing#10332
* fix(syncthing): apply folder migrations with temporary API/GUI server by @calmh in syncthing/syncthing#10330
### Other
* chore(db): adjust db bench name to improve benchstat grouping by @imsodin in syncthing/syncthing#10283
* chore(db): cleanup DB in tests and remove OpenTemp by @imsodin in syncthing/syncthing#10282
* build: use Go 1.24 tools pattern by @calmh in syncthing/syncthing#10281
* chore(db): avoid rowid for blocks and blocklists by @bt90 in syncthing/syncthing#10315
* refactor(db): slightly improve insert performance by @calmh in syncthing/syncthing#10318
* chore(gui): use steps of 1024 KiB for bandwidth rate limits by @tomasz1986 in syncthing/syncthing#10316
* chore(gui): use step of 3600 for versions cleanup interval by @tomasz1986 in syncthing/syncthing#10317
* chore(db): benchmark output, migration blocks/s output by @calmh in syncthing/syncthing#10320
* chore(db): update schema version in the same transaction as migration by @imsodin in syncthing/syncthing#10321
* chore(db): migration for previous commits by @calmh in syncthing/syncthing#10319
**Full Changelog**: syncthing/syncthing@v2.0.3...v2.0.4,
-------------------------------------------------------
rgbds.mk v1.0.0-rc1 # Version: Commits on Sept 01, 2025
-------------------------------------------------------
Release v1.0.0-rc1,
-----------------------------------------------------------------------------------------
winetricks.mk 75118236ac5cb6f51918460a14f7bc40162a115e # Version: Commits on Aug 25, 2025
-----------------------------------------------------------------------------------------
fixed unicode quote.
SC1111 (warning): This is a unicode quote. Delete and retype it (or ignore/singlequote for literal).,
-----------------------------------------------------------------------------------------
retroarch.mk c32aa80ceac48405c5b3751f3e1fd4d4fae252a3 # Version: Commits on Sept 02, 2025
-----------------------------------------------------------------------------------------
Shader toggle cleanup,
-----------------------------------------------------------------------------------------
doomretro.mk d800779ed26430f155a635f9d583741355855b60 # Version: Commits on Sept 02, 2025
-----------------------------------------------------------------------------------------
Update to SDL v2.32.10,
--------------------------------------------------------------------------------------
gzdoom.mk b8807b7d996f3cef0e63736c7895b8c7cf1cbd40 # Version: Commits on Sept 01, 2025
--------------------------------------------------------------------------------------
Correct modeset timing on some systems
Co-authored-by: Marcus Minhorst <marcus.minhorst@gmail.com>,
-------------------------------------------------------------------------------------------
xash3d-fwgs.mk e38dc294114f29aced25966b7983c7bb4989f463 # Version: Commits on Sept 02, 2025
-------------------------------------------------------------------------------------------
3rdparty: mainui: update,
---------------------------------------------------------------------------------------------------
libretro-clownmdemu.mk 8dd1c9bb16a63c74a63c97deade671bb9d8b3d2c # Version: Commits on Sept 01, 2025
---------------------------------------------------------------------------------------------------
Fix CMake script failing on almost every libretro platform.,
-----------------------------------------------------------------------------------------------
libretro-ppsspp.mk 0332e67ad40344696def0d3be4e00a88f2803f00 # Version: Commits on Sept 02, 2025
-----------------------------------------------------------------------------------------------
Merge pull request #20789 from hrydgard/more-modernization
Android: Fix some lint warnings,
Recreate the blocks and block lists tables.