Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | The dbselftest utility now generates hashes in the selftest table with --init. It also accepts multiple database files on the command-line. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
e68829c9bbc69bf4a0dc057e0a6e977f |
User & Date: | drh 2017-02-07 20:51:38.461 |
Context
2017-02-07
| ||
20:57 | Fix harmless compiler warnings in kvtest.c (check-in: db6b39937d user: drh tags: trunk) | |
20:51 | The dbselftest utility now generates hashes in the selftest table with --init. It also accepts multiple database files on the command-line. (check-in: e68829c9bb user: drh tags: trunk) | |
19:36 | Omit fts5fault1.test from the inmemory_journal permutation. (check-in: cb1e83f958 user: dan tags: trunk) | |
Changes
Changes to test/dbselftest.c.
︙ | ︙ | |||
9 10 11 12 13 14 15 | ** May you share freely, never taking more than you give. ** ************************************************************************* ** ** This program implements an SQLite database self-verification utility. ** Usage: ** | | | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ** May you share freely, never taking more than you give. ** ************************************************************************* ** ** This program implements an SQLite database self-verification utility. ** Usage: ** ** dbselftest DATABASE ... ** ** This program reads the "selftest" table in DATABASE, in rowid order, ** and runs each of the tests described there, reporting results at the ** end. ** ** The intent of this program is to have a set of test database files that ** can be run using future versions of SQLite in order to verify that |
︙ | ︙ | |||
40 41 42 43 44 45 46 | #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include "sqlite3.h" static const char zHelp[] = | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include "sqlite3.h" static const char zHelp[] = "Usage: dbselftest [OPTIONS] DBFILE ...\n" "\n" " --init Create the selftest table\n" " -q Suppress most output. Errors only\n" " -v Show extra output\n" ; |
︙ | ︙ | |||
289 290 291 292 293 294 295 296 297 298 299 300 301 302 | hash_step(&cx, sqlite3_value_blob(argv[0]), nByte); }else{ hash_step(&cx, sqlite3_value_text(argv[0]), nByte); } hash_finish(&cx, zOut); sqlite3_result_text(context, zOut, 40, SQLITE_TRANSIENT); } /* ** Implementation of the sha1_query(SQL) function. ** ** This function compiles and runs the SQL statement(s) given in the ** argument. The results are hashed using SHA1 and that hash is returned. ** | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 | hash_step(&cx, sqlite3_value_blob(argv[0]), nByte); }else{ hash_step(&cx, sqlite3_value_text(argv[0]), nByte); } hash_finish(&cx, zOut); sqlite3_result_text(context, zOut, 40, SQLITE_TRANSIENT); } /* ** Run a prepared statement and compute the SHA1 hash on the ** result rows. */ static void sha1RunStatement(SHA1Context *pCtx, sqlite3_stmt *pStmt){ int nCol = sqlite3_column_count(pStmt); const char *z = sqlite3_sql(pStmt); int n = (int)strlen(z); hash_step_vformat(pCtx,"S%d:",n); hash_step(pCtx,(unsigned char*)z,n); /* Compute a hash over the result of the query */ while( SQLITE_ROW==sqlite3_step(pStmt) ){ int i; hash_step(pCtx,(const unsigned char*)"R",1); for(i=0; i<nCol; i++){ switch( sqlite3_column_type(pStmt,i) ){ case SQLITE_NULL: { hash_step(pCtx, (const unsigned char*)"N",1); break; } case SQLITE_INTEGER: { sqlite3_uint64 u; int j; unsigned char x[9]; sqlite3_int64 v = sqlite3_column_int64(pStmt,i); memcpy(&u, &v, 8); for(j=8; j>=1; j--){ x[j] = u & 0xff; u >>= 8; } x[0] = 'I'; hash_step(pCtx, x, 9); break; } case SQLITE_FLOAT: { sqlite3_uint64 u; int j; unsigned char x[9]; double r = sqlite3_column_double(pStmt,i); memcpy(&u, &r, 8); for(j=8; j>=1; j--){ x[j] = u & 0xff; u >>= 8; } x[0] = 'F'; hash_step(pCtx,x,9); break; } case SQLITE_TEXT: { int n2 = sqlite3_column_bytes(pStmt, i); const unsigned char *z2 = sqlite3_column_text(pStmt, i); hash_step_vformat(pCtx,"T%d:",n2); hash_step(pCtx, z2, n2); break; } case SQLITE_BLOB: { int n2 = sqlite3_column_bytes(pStmt, i); const unsigned char *z2 = sqlite3_column_blob(pStmt, i); hash_step_vformat(pCtx,"B%d:",n2); hash_step(pCtx, z2, n2); break; } } } } } /* ** Run one or more statements of SQL. Compute a SHA1 hash of the output. */ static int sha1Exec( sqlite3 *db, /* Run against this database connection */ const char *zSql, /* The SQL to be run */ char *zOut /* Store the SHA1 hash as hexadecimal in this buffer */ ){ sqlite3_stmt *pStmt = 0; /* A prepared statement */ int rc; /* Result of an API call */ SHA1Context cx; /* The SHA1 hash context */ hash_init(&cx); while( zSql[0] ){ rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, &zSql); if( rc ){ sqlite3_finalize(pStmt); return rc; } sha1RunStatement(&cx, pStmt); sqlite3_finalize(pStmt); } hash_finish(&cx, zOut); return SQLITE_OK; } /* ** Implementation of the sha1_query(SQL) function. ** ** This function compiles and runs the SQL statement(s) given in the ** argument. The results are hashed using SHA1 and that hash is returned. ** |
︙ | ︙ | |||
310 311 312 313 314 315 316 | sqlite3_context *context, int argc, sqlite3_value **argv ){ sqlite3 *db = sqlite3_context_db_handle(context); const char *zSql = (const char*)sqlite3_value_text(argv[0]); sqlite3_stmt *pStmt = 0; | < < < < | 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 | sqlite3_context *context, int argc, sqlite3_value **argv ){ sqlite3 *db = sqlite3_context_db_handle(context); const char *zSql = (const char*)sqlite3_value_text(argv[0]); sqlite3_stmt *pStmt = 0; int rc; SHA1Context cx; char zOut[44]; assert( argc==1 ); if( zSql==0 ) return; hash_init(&cx); while( zSql[0] ){ |
︙ | ︙ | |||
338 339 340 341 342 343 344 | if( !sqlite3_stmt_readonly(pStmt) ){ char *zMsg = sqlite3_mprintf("non-query: [%s]", sqlite3_sql(pStmt)); sqlite3_finalize(pStmt); sqlite3_result_error(context, zMsg, -1); sqlite3_free(zMsg); return; } | < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 | if( !sqlite3_stmt_readonly(pStmt) ){ char *zMsg = sqlite3_mprintf("non-query: [%s]", sqlite3_sql(pStmt)); sqlite3_finalize(pStmt); sqlite3_result_error(context, zMsg, -1); sqlite3_free(zMsg); return; } sha1RunStatement(&cx, pStmt); sqlite3_finalize(pStmt); } hash_finish(&cx, zOut); sqlite3_result_text(context, zOut, 40, SQLITE_TRANSIENT); } /* End of ext/misc/sha1.c ******************************************************************************/ |
︙ | ︙ | |||
435 436 437 438 439 440 441 | p->nAlloc += p->n+n + 100; p->z = sqlite3_realloc(p->z, p->nAlloc); if( z==0 ){ printf("Could not allocate %d bytes\n", p->nAlloc); exit(1); } } | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > | 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 | p->nAlloc += p->n+n + 100; p->z = sqlite3_realloc(p->z, p->nAlloc); if( z==0 ){ printf("Could not allocate %d bytes\n", p->nAlloc); exit(1); } } memcpy(p->z+p->n, z, n+1); p->n += n; } /* This is an sqlite3_exec() callback that will capture all ** output in a Str. ** ** Columns are separated by ",". Rows are separated by "|". */ static int execCallback(void *pStr, int argc, char **argv, char **colv){ int i; Str *p = (Str*)pStr; if( p->n ) strAppend(p, "|"); for(i=0; i<argc; i++){ const char *z = (const char*)argv[i]; if( z==0 ) z = "NULL"; if( i>0 ) strAppend(p, ","); strAppend(p, z); } return 0; } /* ** Run an SQL statement constructing using sqlite3_vmprintf(). ** Return the number of errors. */ static int runSql(sqlite3 *db, const char *zFormat, ...){ char *zSql; char *zErr = 0; int rc; int nErr = 0; va_list ap; va_start(ap, zFormat); zSql = sqlite3_vmprintf(zFormat, ap); va_end(ap); if( zSql==0 ){ printf("Out of memory\n"); exit(1); } rc = sqlite3_exec(db, zSql, 0, 0, &zErr); if( rc || zErr ){ printf("SQL error in [%s]: code=%d: %s\n", zSql, rc, zErr); nErr++; } sqlite3_free(zSql); return nErr; } /* ** Generate a prepared statement using a formatted string. */ static sqlite3_stmt *prepareSql(sqlite3 *db, const char *zFormat, ...){ char *zSql; int rc; sqlite3_stmt *pStmt = 0; va_list ap; va_start(ap, zFormat); zSql = sqlite3_vmprintf(zFormat, ap); va_end(ap); if( zSql==0 ){ printf("Out of memory\n"); exit(1); } rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0); if( rc ){ printf("SQL error in [%s]: code=%d: %s\n", zSql, rc, sqlite3_errmsg(db)); sqlite3_finalize(pStmt); pStmt = 0; } sqlite3_free(zSql); return pStmt; } /* ** Construct the standard selftest configuration for the database. */ static int buildSelftestTable(sqlite3 *db){ int rc; sqlite3_stmt *pStmt; int tno = 110; char *zSql; char zHash[50]; rc = runSql(db, "CREATE TABLE IF NOT EXISTS selftest(\n" " tno INTEGER PRIMARY KEY, -- test number\n" " op TEXT, -- what kind of test\n" " sql TEXT, -- SQL text for the test\n" " ans TEXT -- expected answer\n" ");" "INSERT INTO selftest" " VALUES(100,'memo','Hashes generated using --init',NULL);" ); if( rc ) return 1; tno = 110; zSql = "SELECT type,name,tbl_name,sql FROM sqlite_master"; sha1Exec(db, zSql, zHash); rc = runSql(db, "INSERT INTO selftest(tno,op,sql,ans)" " VALUES(%d,'sha1',%Q,%Q)", tno, zSql, zHash); tno += 10; pStmt = prepareSql(db, "SELECT lower(name) FROM sqlite_master" " WHERE type='table' AND sql NOT GLOB 'CREATE VIRTUAL*'" " AND name<>'selftest'" " ORDER BY 1"); if( pStmt==0 ) return 1; while( SQLITE_ROW==sqlite3_step(pStmt) ){ zSql = sqlite3_mprintf("SELECT * FROM \"%w\" NOT INDEXED", sqlite3_column_text(pStmt, 0)); if( zSql==0 ){ printf("Of of memory\n"); exit(1); } sha1Exec(db, zSql, zHash); rc = runSql(db, "INSERT INTO selftest(tno,op,sql,ans)" " VALUES(%d,'sha1',%Q,%Q)", tno, zSql, zHash); tno += 10; sqlite3_free(zSql); if( rc ) break; } sqlite3_finalize(pStmt); if( rc ) return 1; rc = runSql(db, "INSERT INTO selftest(tno,op,sql,ans)" " VALUES(%d,'run','PRAGMA integrity_check','ok');", tno); if( rc ) return 1; return rc; } /* ** Return true if the named table exists */ static int tableExists(sqlite3 *db, const char *zTab){ return sqlite3_table_column_metadata(db, "main", zTab, 0, 0, 0, 0, 0, 0) == SQLITE_OK; } /* ** Default selftest table content, for use when there is no selftest table */ static char *azDefaultTest[] = { 0, 0, 0, 0, "0", "memo", "Missing SELFTEST table - default checks only", "", "1", "run", "PRAGMA integrity_check", "ok" }; int main(int argc, char **argv){ int eVolume = VOLUME_LOW; /* How much output to display */ const char **azDb = 0; /* Name of the database file */ int nDb = 0; /* Number of database files to check */ int doInit = 0; /* True if --init is present */ sqlite3 *db = 0; /* Open database connection */ int rc; /* Return code from API calls */ char *zErrMsg = 0; /* An error message return */ char **azTest; /* Content of the selftest table */ int nRow = 0, nCol = 0; /* Rows and columns in azTest[] */ int i; /* Loop counter */ int nErr = 0; /* Number of errors */ int iDb; /* Loop counter for databases */ Str str; /* Result accumulator */ int nTest = 0; /* Number of tests run */ for(i=1; i<argc; i++){ const char *z = argv[i]; if( z[0]=='-' ){ if( z[1]=='-' ) z++; if( strcmp(z, "-help")==0 ){ printf("%s", zHelp); |
︙ | ︙ | |||
492 493 494 495 496 497 498 | if( eVolume<VOLUME_MAX) eVolume++; }else { printf("unknown option: \"%s\"\nUse --help for more information\n", argv[i]); return 1; } | < < < | < < > | | | | | < < < | < < < < < | < < < < < < < < < < < < < < < < < < < | < < < < < < < | | < < < | | | < | < < > | < < | < < < | < < > | | < < | < | < < < < < < < < < < > > | > > > > > > > > > > | > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 | if( eVolume<VOLUME_MAX) eVolume++; }else { printf("unknown option: \"%s\"\nUse --help for more information\n", argv[i]); return 1; } }else{ nDb++; azDb = sqlite3_realloc(azDb, nDb*sizeof(azDb[0])); if( azDb==0 ){ printf("out of memory\n"); exit(1); } azDb[nDb-1] = argv[i]; } } if( nDb==0 ){ printf("No databases specified. Use --help for more info\n"); return 1; } if( eVolume>=VOLUME_LOW ){ printf("SQLite %s\n", sqlite3_sourceid()); } memset(&str, 0, sizeof(str)); strAppend(&str, "\n"); for(iDb=0; iDb<nDb; iDb++, sqlite3_close(db)){ rc = sqlite3_open_v2(azDb[iDb], &db, doInit ? SQLITE_OPEN_READWRITE : SQLITE_OPEN_READONLY, 0); if( rc ){ printf("Cannot open \"%s\": %s\n", azDb[iDb], sqlite3_errmsg(db)); return 1; } rc = sqlite3_create_function(db, "sha1", 1, SQLITE_UTF8, 0, sha1Func, 0, 0); if( rc==SQLITE_OK ){ rc = sqlite3_create_function(db, "sha1_query", 1, SQLITE_UTF8, 0, sha1QueryFunc, 0, 0); } if( rc ){ printf("Initialization error: %s\n", sqlite3_errmsg(db)); sqlite3_close(db); return 1; } if( doInit && !tableExists(db, "selftest") ){ buildSelftestTable(db); } if( !tableExists(db, "selftest") ){ azTest = azDefaultTest; nCol = 4; nRow = 2; }else{ rc = sqlite3_get_table(db, "SELECT tno,op,sql,ans FROM selftest ORDER BY tno", &azTest, &nRow, &nCol, &zErrMsg); if( rc || zErrMsg ){ printf("Error querying selftest: %s\n", zErrMsg); sqlite3_free_table(azTest); continue; } } for(i=1; i<=nRow; i++){ int tno = atoi(azTest[i*nCol]); const char *zOp = azTest[i*nCol+1]; const char *zSql = azTest[i*nCol+2]; const char *zAns = azTest[i*nCol+3]; if( eVolume>=VOLUME_ECHO ){ char *zQuote = sqlite3_mprintf("%q", zSql); printf("%d: %s %s\n", tno, zOp, zSql); sqlite3_free(zQuote); } if( strcmp(zOp,"memo")==0 ){ if( eVolume>=VOLUME_LOW ){ printf("%s: %s\n", azDb[iDb], zSql); } }else if( strcmp(zOp,"sha1")==0 ){ char zOut[44]; rc = sha1Exec(db, zSql, zOut); nTest++; if( eVolume>=VOLUME_VERBOSE ){ printf("Result: %s\n", zOut); } if( rc ){ nErr++; if( eVolume>=VOLUME_ERROR_ONLY ){ printf("%d: error-code-%d: %s\n", tno, rc, sqlite3_errmsg(db)); } }else if( strcmp(zAns,zOut)!=0 ){ nErr++; if( eVolume>=VOLUME_ERROR_ONLY ){ printf("%d: Expected: [%s]\n", tno, zAns); printf("%d: Got: [%s]\n", tno, zOut); } } }else if( strcmp(zOp,"run")==0 ){ str.n = 0; str.z[0] = 0; zErrMsg = 0; rc = sqlite3_exec(db, zSql, execCallback, &str, &zErrMsg); nTest++; if( eVolume>=VOLUME_VERBOSE ){ printf("Result: %s\n", str.z); } if( rc || zErrMsg ){ nErr++; if( eVolume>=VOLUME_ERROR_ONLY ){ printf("%d: error-code-%d: %s\n", tno, rc, zErrMsg); } sqlite3_free(zErrMsg); }else if( strcmp(zAns,str.z)!=0 ){ nErr++; if( eVolume>=VOLUME_ERROR_ONLY ){ printf("%d: Expected: [%s]\n", tno, zAns); printf("%d: Got: [%s]\n", tno, str.z); } } }else { printf("Unknown operation \"%s\" on selftest line %d\n", zOp, tno); return 1; } } if( azTest!=azDefaultTest ) sqlite3_free_table(azTest); } if( eVolume>=VOLUME_LOW || (nErr>0 && eVolume>=VOLUME_ERROR_ONLY) ){ printf("%d errors out of %d tests on %d databases\n", nErr, nTest, nDb); } return nErr; } |