xapian-check uses the Quartz format when it should be using Flint

[Charlie Hull]

To reproduce: edit line 122 of quartz\btreecheck.cc:

out << "B-tree error QUARTZ " << n << endl;

Rebuild and run termgentest to create a database in tests\.flint\tg_spell1

Then run xapian-check on this database. The output is as follows:

record: baseB blocksize=8K items=0 lastblock=0 revision=1 levels=0 root=(faked) void B-tree checked okay tg_spell1/record table: Don't know how to check structure

termlist: baseB blocksize=8K items=0 lastblock=0 revision=1 levels=0 root=(faked) void B-tree checked okay tg_spell1/termlist table: Don't know how to check structure

postlist: baseB blocksize=8K items=0 lastblock=0 revision=1 levels=0 root=(faked) void B-tree checked okay tg_spell1/postlist table: Don't know how to check structure

position: Lazily created, and not yet used.

value: Lazily created, and not yet used.

spelling: baseB blocksize=8K items=25 lastblock=0 revision=1 levels=0 root=0 B-tree error QUARTZ 40 xapian-check: btree error

The final lines shows that Quartz is being used where we would expect Flint to be used.

[Olly Betts]

You might want to check how you're linking xapian-check in your makefiles...

[Richard Boulton]

Ah - I see the problem - it is indeed a problem with how xapian-check is linked in the windows build files.

In the windows build system, in win32_backends_quartz.mak, LIBBTREECHECK.lib is defined, using quartz\btreecheck.obj. This is then added to XAPIAN_LIBS in config.mak.

Instead, LIBBTREECHECK shouldn't be included in XAPIAN_LIBS at all, but should be included only when building quartzcheck. Additionally, a LIBFLINTCHECK (or something similar) should be defined in win32_backends_flint.mak, using flint\flint_check.cc, and be included when building xapian-check.

flint_check.cc isn't currently mentioned in the windows build files, so it's not really odd that changing it has no effect.

[Olly Betts]

Sigh, having two parallel make systems really sucks.

Can you fix this for the next release (sometime in December)?

Note that btreetest also uses the quartz btree checking code.

[Charlie Hull]

Patch to make sure we use the correct backend check code

[Olly Betts]

Applied.

btreetest is quartz-specific (see tests/Makefile.am).