database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Be sure that speedtest1 reports any errors that it encounters while

Browse Source 
running the speed tests.

FossilOrigin-Name: 8c8b1a99bc888a5db637900aa3c8ef1b8c748c527580c825a25df1008afcf9e0
This commit is contained in:
drh
2025-04-10 19:03:42 +00:00
parent 7b1afecf53
commit e4856e86cd
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Fix\sa\scomment\sin\ssessionD.test. C Be\ssure\sthat\sspeedtest1\sreports\sany\serrors\sthat\sit\sencounters\swhile\nrunning\sthe\sspeed\stests.
D 2025-04-10T17:25:57.906 D 2025-04-10T19:03:42.977
F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@ -1687,7 +1687,7 @@ F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
F test/speedtest.md ee958457ae1b729d9715ae33c0320600000bf1d9ddea1a88dcf79f56729d6fad F test/speedtest.md ee958457ae1b729d9715ae33c0320600000bf1d9ddea1a88dcf79f56729d6fad
F test/speedtest.tcl 926d1e168f4a14e6fb68c5dc174de743536b547f365264bd5bac533b3621a4a0 x F test/speedtest.tcl 926d1e168f4a14e6fb68c5dc174de743536b547f365264bd5bac533b3621a4a0 x
F test/speedtest1.c 132cd5ba064f48910bb4b68337442b0ef419218c8de9e9855f66d98015286ddb F test/speedtest1.c 3064b76adc1b0f3715ce3d898e3e4a8f484c19c2b53115c46a50293bb04f4439
F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@ -2216,8 +2216,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P a3217cdb75fd305705856f6504f8816c2b6b0a10907725cb74d025a5c4e369b8 P 3516354ee57b683c134de206f5321f064f9cb627aa12ba6fde98e59a9093c50c
R e9c3c58b6aa871893824790c20bbd8a9 R c138a52241458c8ca08673d2b100d73f
U dan U drh
Z 63c562955bebecfff475275cc957670d Z 070311e397246e4eea2ac545196ad07f
# Remove this line to create a well-formed Fossil manifest. # Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@ -1 +1 @@
3516354ee57b683c134de206f5321f064f9cb627aa12ba6fde98e59a9093c50c 8c8b1a99bc888a5db637900aa3c8ef1b8c748c527580c825a25df1008afcf9e0

18
test/speedtest1.c
View File

@ -542,6 +542,7 @@ char *speedtest1_once(const char *zFormat, ...){
char *zSql; char *zSql;
sqlite3_stmt *pStmt; sqlite3_stmt *pStmt;
char *zResult = 0; char *zResult = 0;
int rc;
va_start(ap, zFormat); va_start(ap, zFormat);
zSql = sqlite3_vmprintf(zFormat, ap); zSql = sqlite3_vmprintf(zFormat, ap);
va_end(ap); va_end(ap);
@ -557,9 +558,14 @@ char *speedtest1_once(const char *zFormat, ...){
fprintf(g.pScript,"%s\n",z); fprintf(g.pScript,"%s\n",z);
sqlite3_free(z); sqlite3_free(z);
} }
if( sqlite3_step(pStmt)==SQLITE_ROW ){ if( (rc = sqlite3_step(pStmt))==SQLITE_ROW ){
const char *z = (const char*)sqlite3_column_text(pStmt, 0); const char *z = (const char*)sqlite3_column_text(pStmt, 0);
if( z ) zResult = sqlite3_mprintf("%s", z); if( z ) zResult = sqlite3_mprintf("%s", z);
}else if( rc==SQLITE_ERROR ){
rc = sqlite3_reset(pStmt);
fprintf(stderr, "%s\nError code %d: %s\n",
sqlite3_sql(pStmt), rc, sqlite3_errmsg(g.db));
exit(1);
} }
sqlite3_finalize(pStmt); sqlite3_finalize(pStmt);
} }
@ -590,7 +596,7 @@ void speedtest1_prepare(const char *zFormat, ...){
/* Run an SQL statement previously prepared */ /* Run an SQL statement previously prepared */
void speedtest1_run(void){ void speedtest1_run(void){
int i, n, len; int i, n, len, rc;
if( g.bSqlOnly ) return; if( g.bSqlOnly ) return;
assert( g.pStmt ); assert( g.pStmt );
g.nResult = 0; g.nResult = 0;
@ -599,7 +605,7 @@ void speedtest1_run(void){
fprintf(g.pScript,"%s\n",z); fprintf(g.pScript,"%s\n",z);
sqlite3_free(z); sqlite3_free(z);
} }
while( sqlite3_step(g.pStmt)==SQLITE_ROW ){ while( (rc = sqlite3_step(g.pStmt))==SQLITE_ROW ){
n = sqlite3_column_count(g.pStmt); n = sqlite3_column_count(g.pStmt);
for(i=0; i<n; i++){ for(i=0; i<n; i++){
const char *z = (const char*)sqlite3_column_text(g.pStmt, i); const char *z = (const char*)sqlite3_column_text(g.pStmt, i);
@ -645,6 +651,12 @@ void speedtest1_run(void){
} }
} }
} }
if( rc==SQLITE_ERROR ){
rc = sqlite3_reset(g.pStmt);
fprintf(stderr, "%s\nError code %d: %s\n",
sqlite3_sql(g.pStmt), rc, sqlite3_errmsg(g.db));
exit(1);
}
#if SQLITE_VERSION_NUMBER>=3006001 #if SQLITE_VERSION_NUMBER>=3006001
if( g.bReprepare ){ if( g.bReprepare ){
sqlite3_stmt *pNew; sqlite3_stmt *pNew;