Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Issue 6823057: Cleanup SQLite 3.6.18 import. (Closed)

Created:
9 years, 8 months ago by Scott Hess - ex-Googler
Modified:
8 years, 10 months ago
Reviewers:
brettw, M-A Ruel
CC:
chromium-reviews, brettw, Evan Martin
Visibility:
Public.

Description

Cleanup SQLite 3.6.18 import. Get things spic-n-span for converting to the amalgamation, then SQLite 3.7.x. sqlite3Preload -> sqlite3_preload because in the amalgamation, sqlite3_ is the key bit to make sure things aren't marked static. AFAICT, SQLite 3.6.18 was not imported correctly last time, throwing up spurious deltas. Re-import and re-apply patches. Remove a bunch of Gears-related stuff. Quite some time ago the Chromium and Gears SQLite imports were brought into line, but they were never fully shared. Nowadays these are completely useless: - remove fts1 patches. - add a Chromium test to make sure fts1 doesn't sneak in. - drop the Symbian stuff. - drop database poisoning. Pull out the WebDatabase patch into a patch file. Move ICU shell changes into a distinct patch file. Pull out testing patches into a separate test.patch. BUG=71731 TEST=automated testing and watching closely. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=81296

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1670 lines, -6781 lines) Patch
M app/app.gyp View 1 chunk +1 line, -0 lines 0 comments Download
M app/sql/connection.cc View 2 chunks +2 lines, -2 lines 0 comments Download
A app/sql/sqlite_features_unittest.cc View 1 chunk +100 lines, -0 lines 0 comments Download
M third_party/sqlite/README.chromium View 5 chunks +7 lines, -6 lines 0 comments Download
A third_party/sqlite/icu-shell.patch View 1 chunk +90 lines, -0 lines 0 comments Download
M third_party/sqlite/misc.patch View 3 chunks +0 lines, -1142 lines 0 comments Download
M third_party/sqlite/preload-cache.patch View 4 chunks +38 lines, -2 lines 0 comments Download
M third_party/sqlite/preprocessed/sqlite3.h View 1 chunk +1 line, -1 line 0 comments Download
M third_party/sqlite/safe-tolower.patch View 1 chunk +0 lines, -39 lines 0 comments Download
D third_party/sqlite/sqlite-poison.patch View 1 chunk +0 lines, -98 lines 0 comments Download
D third_party/sqlite/src/LICENSE View 1 chunk +0 lines, -6 lines 0 comments Download
A third_party/sqlite/src/Makefile.arm-wince-mingw32ce-gcc View 0 chunks +-1 lines, --1 lines 0 comments Download
A third_party/sqlite/src/Makefile.in View 0 chunks +-1 lines, --1 lines 0 comments Download
M third_party/sqlite/src/Makefile.linux-gcc View 1 chunk +0 lines, -1 line 0 comments Download
A third_party/sqlite/src/addopcodes.awk View 0 chunks +-1 lines, --1 lines 0 comments Download
D third_party/sqlite/src/art/2005osaward.gif View Binary file 0 comments Download
third_party/sqlite/src/art/SQLite.eps View 0 chunks +-1 lines, --1 lines 0 comments Download
D third_party/sqlite/src/art/SQLite.gif View Binary file 0 comments Download
D third_party/sqlite/src/art/SQLiteLogo3.tiff View Binary file 0 comments Download
D third_party/sqlite/src/art/SQLite_big.gif View Binary file 0 comments Download
D third_party/sqlite/src/art/nocopy.gif View Binary file 0 comments Download
D third_party/sqlite/src/art/powered_by_sqlite.gif View Binary file 0 comments Download
third_party/sqlite/src/contrib/sqlitecon.tcl View 1 chunk +0 lines, -679 lines 0 comments Download
D third_party/sqlite/src/doc/lemon.html View 1 chunk +0 lines, -892 lines 0 comments Download
D third_party/sqlite/src/doc/report1.txt View 1 chunk +0 lines, -121 lines 0 comments Download
M third_party/sqlite/src/ext/fts1/fts1.c View 2 chunks +5 lines, -1 line 0 comments Download
M third_party/sqlite/src/ext/fts1/fts1_tokenizer1.c View 1 chunk +1 line, -1 line 0 comments Download
M third_party/sqlite/src/ext/fts1/simple_tokenizer.c View 1 chunk +1 line, -1 line 0 comments Download
M third_party/sqlite/src/ext/icu/icu.c View 1 chunk +0 lines, -5 lines 0 comments Download
A third_party/sqlite/src/ext/rtree/rtree1.test View 0 chunks +-1 lines, --1 lines 0 comments Download
A third_party/sqlite/src/ext/rtree/rtree2.test View 0 chunks +-1 lines, --1 lines 0 comments Download
A third_party/sqlite/src/ext/rtree/rtree3.test View 0 chunks +-1 lines, --1 lines 0 comments Download
A third_party/sqlite/src/ext/rtree/rtree4.test View 0 chunks +-1 lines, --1 lines 0 comments Download
A third_party/sqlite/src/ext/rtree/rtree5.test View 0 chunks +-1 lines, --1 lines 0 comments Download
A third_party/sqlite/src/ext/rtree/rtree_perf.tcl View Binary file 0 comments Download
A third_party/sqlite/src/ext/rtree/rtree_util.tcl View Binary file 0 comments Download
third_party/sqlite/src/ext/rtree/viewrtree.tcl View 0 chunks +-1 lines, --1 lines 0 comments Download
M third_party/sqlite/src/main.mk View 4 chunks +0 lines, -29 lines 0 comments Download
A third_party/sqlite/src/mkopcodeh.awk View 0 chunks +-1 lines, --1 lines 0 comments Download
A third_party/sqlite/src/publish.sh View 0 chunks +-1 lines, --1 lines 0 comments Download
M third_party/sqlite/src/src/btree.c View 3 chunks +0 lines, -75 lines 0 comments Download
M third_party/sqlite/src/src/build.c View 1 chunk +1 line, -1 line 0 comments Download
M third_party/sqlite/src/src/main.c View 1 chunk +1 line, -1 line 0 comments Download
M third_party/sqlite/src/src/os.h View 1 chunk +0 lines, -4 lines 0 comments Download
D third_party/sqlite/src/src/os_symbian.cc View 1 chunk +0 lines, -579 lines 0 comments Download
M third_party/sqlite/src/src/os_unix.c View 3 chunks +9 lines, -3 lines 0 comments Download
M third_party/sqlite/src/src/shell.c View 1 chunk +0 lines, -4 lines 0 comments Download
M third_party/sqlite/src/src/sqlite.h.in View 1 chunk +1 line, -1 line 0 comments Download
M third_party/sqlite/src/src/util.c View 1 chunk +1094 lines, -1094 lines 0 comments Download
D third_party/sqlite/src/test/fts.test View 1 chunk +0 lines, -61 lines 0 comments Download
D third_party/sqlite/src/test/fts1.test View 1 chunk +0 lines, -61 lines 0 comments Download
A third_party/sqlite/src/test/malloc_common.tcl View Binary file 0 comments Download
M third_party/sqlite/src/test/quick.test View 1 chunk +0 lines, -1 line 0 comments Download
A third_party/sqlite/src/test/tester.tcl View Binary file 0 comments Download
A third_party/sqlite/src/test/thread_common.tcl View Binary file 0 comments Download
A third_party/sqlite/src/tool/mksqlite3c.tcl View Binary file 0 comments Download
A third_party/sqlite/src/tool/spaceanal.tcl View Binary file 0 comments Download
third_party/sqlite/src/www/capi3ref.tcl View 1 chunk +0 lines, -1882 lines 0 comments Download
A third_party/sqlite/test.patch View 1 chunk +167 lines, -0 lines 0 comments Download
A third_party/sqlite/webdb.patch View 1 chunk +163 lines, -0 lines 0 comments Download

Messages

Total messages: 8 (0 generated)
Scott Hess - ex-Googler
Probably doesn't matter much who reviews, but wanted to be somewhat broad in case something ...
9 years, 8 months ago (2011-04-11 22:37:04 UTC) #1
Scott Hess - ex-Googler
On 2011/04/11 22:37:04, shess wrote: > Probably doesn't matter much who reviews, but wanted to ...
9 years, 8 months ago (2011-04-11 22:45:18 UTC) #2
brettw
LGTM
9 years, 8 months ago (2011-04-12 06:09:45 UTC) #3
M-A Ruel
On 2011/04/12 06:09:45, brettw wrote: > LGTM This patch makes the commit queue crash. I'll ...
9 years, 8 months ago (2011-04-12 17:28:50 UTC) #4
Scott Hess - ex-Googler
On 2011/04/12 17:28:50, Marc-Antoine Ruel wrote: > On 2011/04/12 06:09:45, brettw wrote: > > LGTM ...
9 years, 8 months ago (2011-04-12 20:13:18 UTC) #5
Steve Block
> I can already see that I have to figure out what the story is ...
8 years, 11 months ago (2012-01-23 19:02:24 UTC) #6
Scott Hess - ex-Googler
On 2012/01/23 19:02:24, Steve Block wrote: > > I can already see that I have ...
8 years, 10 months ago (2012-02-10 00:23:02 UTC) #7
Steve Block
8 years, 10 months ago (2012-02-15 15:44:37 UTC) #8
Thanks for the reply Scott. Looking more closely, it seems that the LICENSE file
was never part of the sqlite code, it was added downstream in
http://codereview.chromium.org/1075015.

It's moved around a few times since, but it looks like its location now matches
README.chromium, so it's all good.

Powered by Google App Engine
This is Rietveld 408576698