Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | More coverage tests for fts3.c. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | experimental |
| Files: | files | file ages | folders |
| SHA1: |
7a2f2864002d4e9a487e2779ae055138 |
| User & Date: | dan 2010-10-26 07:14:26 |
Context
|
2010-10-26
| ||
| 11:56 | Add missing header comments for changes related to the experimental sqlite3_blob_reopen() API. (check-in: d1cc5c93 user: dan tags: experimental) | |
| 07:14 | More coverage tests for fts3.c. (check-in: 7a2f2864 user: dan tags: experimental) | |
|
2010-10-25
| ||
| 19:01 | Further improvements to coverage of fts3.c. Fixes for bugs revealed by the same. (check-in: 918b6092 user: dan tags: experimental) | |
Changes
Changes to ext/fts3/fts3.c.
654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 |
zSql = sqlite3_mprintf("PRAGMA %Q.page_size", p->zDb);
if( !zSql ){
rc = SQLITE_NOMEM;
}else{
rc = sqlite3_prepare(p->db, zSql, -1, &pStmt, 0);
if( rc==SQLITE_OK ){
if( SQLITE_ROW==sqlite3_step(pStmt) ){
p->nPgsz = sqlite3_column_int(pStmt, 0);
}
rc = sqlite3_finalize(pStmt);
}
}
assert( p->nPgsz>0 || rc!=SQLITE_OK );
sqlite3_free(zSql);
*pRc = rc;
}
|
| | < |
654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 |
zSql = sqlite3_mprintf("PRAGMA %Q.page_size", p->zDb);
if( !zSql ){
rc = SQLITE_NOMEM;
}else{
rc = sqlite3_prepare(p->db, zSql, -1, &pStmt, 0);
if( rc==SQLITE_OK ){
sqlite3_step(pStmt);
p->nPgsz = sqlite3_column_int(pStmt, 0);
rc = sqlite3_finalize(pStmt);
}
}
assert( p->nPgsz>0 || rc!=SQLITE_OK );
sqlite3_free(zSql);
*pRc = rc;
}
|
Changes to ext/fts3/fts3Int.h.
73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 |
** amalgamation. */ #ifndef SQLITE_AMALGAMATION /* ** Macros indicating that conditional expressions are always true or ** false. */ # define ALWAYS(x) (x) # define NEVER(X) (x) /* ** Internal types used by SQLite. */ typedef unsigned char u8; /* 1-byte (or larger) unsigned integer */ typedef short int i16; /* 2-byte (or larger) signed integer */ typedef unsigned int u32; /* 4-byte unsigned integer */ typedef sqlite3_uint64 u64; /* 8-byte unsigned integer */ |
> > > > > > |
73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 |
** amalgamation. */ #ifndef SQLITE_AMALGAMATION /* ** Macros indicating that conditional expressions are always true or ** false. */ #ifdef SQLITE_COVERAGE_TEST # define ALWAYS(x) (1) # define NEVER(X) (0) #else # define ALWAYS(x) (x) # define NEVER(X) (x) #endif /* ** Internal types used by SQLite. */ typedef unsigned char u8; /* 1-byte (or larger) unsigned integer */ typedef short int i16; /* 2-byte (or larger) signed integer */ typedef unsigned int u32; /* 4-byte unsigned integer */ typedef sqlite3_uint64 u64; /* 8-byte unsigned integer */ |
Changes to test/fts3cov.test.
410 411 412 413 414 415 416 417 418 419 420 |
INSERT INTO t16 VALUES('theoretical work to examine the relationship');
INSERT INTO t16 VALUES('solution of our problems on the invisible');
DELETE FROM t16_content WHERE rowid = 2;
}
do_catchsql_test 16.2 {
SELECT * FROM t16 WHERE t16 MATCH 'invisible'
} {1 {database disk image is malformed}}
finish_test
|
> > > > > > > > > > > > |
410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 |
INSERT INTO t16 VALUES('theoretical work to examine the relationship');
INSERT INTO t16 VALUES('solution of our problems on the invisible');
DELETE FROM t16_content WHERE rowid = 2;
}
do_catchsql_test 16.2 {
SELECT * FROM t16 WHERE t16 MATCH 'invisible'
} {1 {database disk image is malformed}}
# And another corruption test case.
#
do_execsql_test 17.1 {
CREATE VIRTUAL TABLE t17 USING fts4;
INSERT INTO t17(content) VALUES('one one one');
UPDATE t17_segdir SET root = X'00036F6E65FFFFFFFFFFFFFFFFFFFFFF02030300'
} {}
do_catchsql_test 17.2 {
SELECT * FROM t17 WHERE t17 MATCH 'one'
} {1 {database disk image is malformed}}
finish_test
|
Changes to test/fts3defer.test.
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
...
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
|
}
2 {
set dmt_modes 0
execsql { CREATE VIRTUAL TABLE t1 USING FTS4 }
foreach doc $data { execsql { INSERT INTO t1 VALUES($doc) } }
}
3 {
#set dmt_modes {0 1 2}
execsql { CREATE VIRTUAL TABLE t1 USING FTS4 }
foreach doc $data { execsql { INSERT INTO t1 VALUES($doc) } }
execsql $zero_long_doclists
}
4 {
set dmt_modes 0
execsql { CREATE VIRTUAL TABLE t1 USING FTS4 }
................................................................................
}
do_select_test 6.1 {
SELECT rowid FROM t1
WHERE t1 MATCH 'vgsld (hrlipdm OR (aayxpmve duszemmzl))'
} {10}
do_select_test 6.2.1 {
SELECT rowid FROM t1 WHERE t1 MATCH '"jk jcpiwj"'
} {39 40}
do_select_test 6.2.2 {
SELECT rowid FROM t1 WHERE t1 MATCH '"zm xnxhf"'
} {40 47}
do_select_test 6.2.3 {
SELECT rowid FROM t1 WHERE t1 MATCH '"jk jcpiwj" OR "zm xnxhf"'
} {39 40 47}
}
set testprefix fts3defer
do_execsql_test 3.1 {
CREATE VIRTUAL TABLE x1 USING fts4(a, b);
INSERT INTO x1 VALUES('a b c', 'd e f');
|
|
|
|
|
|
|
|
|
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
...
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
|
}
2 {
set dmt_modes 0
execsql { CREATE VIRTUAL TABLE t1 USING FTS4 }
foreach doc $data { execsql { INSERT INTO t1 VALUES($doc) } }
}
3 {
set dmt_modes {0 1 2}
execsql { CREATE VIRTUAL TABLE t1 USING FTS4 }
foreach doc $data { execsql { INSERT INTO t1 VALUES($doc) } }
execsql $zero_long_doclists
}
4 {
set dmt_modes 0
execsql { CREATE VIRTUAL TABLE t1 USING FTS4 }
................................................................................
}
do_select_test 6.1 {
SELECT rowid FROM t1
WHERE t1 MATCH 'vgsld (hrlipdm OR (aayxpmve duszemmzl))'
} {10}
do_select_test 6.2.1 {
SELECT rowid FROM t1 WHERE t1 MATCH '"jk xduvfhk"'
} {8}
do_select_test 6.2.2 {
SELECT rowid FROM t1 WHERE t1 MATCH '"zm azavwm"'
} {15 26 92 96}
do_select_test 6.2.3 {
SELECT rowid FROM t1 WHERE t1 MATCH '"jk xduvfhk" OR "zm azavwm"'
} {8 15 26 92 96}
}
set testprefix fts3defer
do_execsql_test 3.1 {
CREATE VIRTUAL TABLE x1 USING fts4(a, b);
INSERT INTO x1 VALUES('a b c', 'd e f');
|