Page MenuHomeFreeBSD

Disable FTS3, FTS4, and RTREE in bundled and private sqlite3

Authored by cy on Jan 8 2019, 8:48 PM.



As discussed in the email thread entitled "Re: svn commit: r342175 - in vendor/sqlite3/dist: . tea tea/doc tea/generic tea/tclc", disable FTS3 and FTS4 as suggested by delphij@.

Test Plan

Tinderbox on universe13a and I will use on my systems here for a few days.

Diff Detail

rS FreeBSD src repository
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

cy created this revision.Jan 8 2019, 8:48 PM
delphij requested changes to this revision.Jan 8 2019, 9:42 PM

I'd like to request that the change be either extended to disable RTREE (my preference; we don't use rtree in base either), or reduced to build with FTS4 (to match upstream; arguably FTS5 should be also enabled if that's the approach taken) for consistency.

38 ↗(On Diff #52675)

I only asked for FTS3 being disabled because it's disabled upstream :)

Note that we are not using R*Tree extension either in the base system, so if the philosophy is to use a minimized version of SQLite, that should be disabled too. If the goal is to match upstream, then we should enable both FTS4 and FTS5.

Personally, I'm inclined to adopt the minimize approach (remove FTS3, FTS4 and RTREE), though, because this is a private library.

I'd like to see crypto/heimdal/lib/sqlite/ gone in a separate change as well. It's harmless (because it's not connected to build) but might cause confusion.

This revision now requires changes to proceed.Jan 8 2019, 9:42 PM
cy planned changes to this revision.Jan 9 2019, 1:12 AM

I'll submit a new revision when I get home.

38 ↗(On Diff #52675)

Agreed, the base sqlite3 should be as minimal as possible, which is why I removed FTS3, FTS4 and RTREE, it's a private library. I'll update this revision to remove RTREE as soon as I get home.

The bundled sqlite3 in heimdal has been removed.

cy retitled this revision from Disable FTS3 and FTS4 in bundled sqlite3 to Disable FTS3, FTS4, and RTREE in bundled and private sqlite3.Jan 9 2019, 6:24 AM
cy updated this revision to Diff 52679.

Also disable RTREE.

sqlite3 in base is private, thus FTS3, FTS4 & RTREE are not needed.

delphij accepted this revision.Jan 9 2019, 6:25 AM
This revision is now accepted and ready to land.Jan 9 2019, 6:25 AM

LGTM now, thanks!

This revision was automatically updated to reflect the committed changes.