Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | In kvtest, add the ability to work with a hierarchy of files on disk, in addition to having all files in the same directory. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
f568f666c85ab9b80592927dc033cfd6 |
User & Date: | drh 2017-06-03 17:24:04.003 |
Context
2017-06-03
| ||
18:27 | Remove unused header file from kvtest. (check-in: dd7e043f7c user: drh tags: trunk) | |
17:24 | In kvtest, add the ability to work with a hierarchy of files on disk, in addition to having all files in the same directory. (check-in: f568f666c8 user: drh tags: trunk) | |
15:17 | Add the --nocheckpoint and --multitrans options to kvtest. (check-in: 5828633c23 user: drh tags: trunk) | |
Changes
Changes to test/kvtest.c.
︙ | ︙ | |||
67 68 69 70 71 72 73 | "\n" " Generate a new test database file named DBFILE containing N\n" " BLOBs each of size M bytes. The page size of the new database\n" " file will be X. Additional options:\n" "\n" " --variance V Randomly vary M by plus or minus V\n" "\n" | | | > > > > > | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | "\n" " Generate a new test database file named DBFILE containing N\n" " BLOBs each of size M bytes. The page size of the new database\n" " file will be X. Additional options:\n" "\n" " --variance V Randomly vary M by plus or minus V\n" "\n" " kvtest export DBFILE DIRECTORY [--tree]\n" "\n" " Export all the blobs in the kv table of DBFILE into separate\n" " files in DIRECTORY. DIRECTORY is created if it does not previously\n" " exist. If the --tree option is used, then the blobs are written\n" " into a hierarchy of directories, using names like 00/00/00,\n" " 00/00/01, 00/00/02, and so forth. Without the --tree option, all\n" " files are in the top-level directory with names like 000000, 000001,\n" " 000002, and so forth.\n" "\n" " kvtest stat DBFILE\n" "\n" " Display summary information about DBFILE\n" "\n" " kvtest run DBFILE [options]\n" "\n" |
︙ | ︙ | |||
113 114 115 116 117 118 119 120 121 122 123 124 125 126 | #include <string.h> #include "sqlite3.h" #ifndef _WIN32 # include <unistd.h> #else /* Provide Windows equivalent for the needed parts of unistd.h */ # include <io.h> # define R_OK 2 # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) # define access _access #endif | > | 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | #include <string.h> #include "sqlite3.h" #ifndef _WIN32 # include <unistd.h> #else /* Provide Windows equivalent for the needed parts of unistd.h */ # include <direct.h> # include <io.h> # define R_OK 2 # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) # define access _access #endif |
︙ | ︙ | |||
235 236 237 238 239 240 241 | return isNeg? -v : v; } /* ** Check the filesystem object zPath. Determine what it is: ** | | > > > > > > > > > > | > > > > > > | > > | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 | return isNeg? -v : v; } /* ** Check the filesystem object zPath. Determine what it is: ** ** PATH_DIR A single directory holding many files ** PATH_TREE A directory hierarchy with files at the leaves ** PATH_DB An SQLite database ** PATH_NEXIST Does not exist ** PATH_OTHER Something else ** ** PATH_DIR means all of the separate files are grouped together ** into a single directory with names like 000000, 000001, 000002, and ** so forth. PATH_TREE means there is a hierarchy of directories so ** that no single directory has too many entries. The files have names ** like 00/00/00, 00/00/01, 00/00/02 and so forth. The decision between ** PATH_DIR and PATH_TREE is determined by the presence of a subdirectory ** named "00" at the top-level. */ #define PATH_DIR 1 #define PATH_TREE 2 #define PATH_DB 3 #define PATH_NEXIST 0 #define PATH_OTHER 99 static int pathType(const char *zPath){ struct stat x; int rc; if( access(zPath,R_OK) ) return PATH_NEXIST; memset(&x, 0, sizeof(x)); rc = stat(zPath, &x); if( rc<0 ) return PATH_OTHER; if( S_ISDIR(x.st_mode) ){ char *zLayer1 = sqlite3_mprintf("%s/00", zPath); memset(&x, 0, sizeof(x)); rc = stat(zLayer1, &x); sqlite3_free(zLayer1); if( rc<0 ) return PATH_DIR; if( S_ISDIR(x.st_mode) ) return PATH_TREE; return PATH_DIR; } if( (x.st_size%512)==0 ) return PATH_DB; return PATH_OTHER; } /* ** Return the size of a file in bytes. Or return -1 if the ** named object is not a regular file or does not exist. |
︙ | ︙ | |||
412 413 414 415 416 417 418 | printf("Page-count: %8d\n", sqlite3_column_int(pStmt, 0)); } sqlite3_finalize(pStmt); sqlite3_close(db); return 0; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > > > > > > > > > > > | > > | > > > > < > > > > > > > > > > > > | > > > > > > > > > > > | | | > > > | > > | > | | > > > > > > > | > > > | > | 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 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 | printf("Page-count: %8d\n", sqlite3_column_int(pStmt, 0)); } sqlite3_finalize(pStmt); sqlite3_close(db); return 0; } /* ** remember(V,PTR) ** ** Return the integer value V. Also save the value of V in a ** C-language variable whose address is PTR. */ static void rememberFunc( sqlite3_context *pCtx, int argc, sqlite3_value **argv ){ sqlite3_int64 v; sqlite3_int64 ptr; assert( argc==2 ); v = sqlite3_value_int64(argv[0]); ptr = sqlite3_value_int64(argv[1]); *(sqlite3_int64*)SQLITE_INT_TO_PTR(ptr) = v; sqlite3_result_int64(pCtx, v); } /* ** Make sure a directory named zDir exists. */ static void kvtest_mkdir(const char *zDir){ #if defined(_WIN32) (void)mkdir(zDir); #else (void)mkdir(zDir, 0755); #endif } /* ** Export the kv table to individual files in the filesystem */ static int exportMain(int argc, char **argv){ char *zDb; char *zDir; sqlite3 *db; sqlite3_stmt *pStmt; int rc; int ePathType; int nFN; char *zFN; char *zTail; size_t nWrote; int i; assert( strcmp(argv[1],"export")==0 ); assert( argc>=3 ); if( argc<4 ) fatalError("Usage: kvtest export DATABASE DIRECTORY [OPTIONS]"); zDb = argv[2]; zDir = argv[3]; kvtest_mkdir(zDir); for(i=4; i<argc; i++){ const char *z = argv[i]; if( z[0]=='-' && z[1]=='-' ) z++; if( strcmp(z,"-tree")==0 ){ zFN = sqlite3_mprintf("%s/00", zDir); kvtest_mkdir(zFN); sqlite3_free(zFN); continue; } fatalError("unknown argument: \"%s\"\n", argv[i]); } ePathType = pathType(zDir); if( ePathType!=PATH_DIR && ePathType!=PATH_TREE ){ fatalError("object \"%s\" is not a directory", zDir); } rc = sqlite3_open(zDb, &db); if( rc ){ fatalError("cannot open database \"%s\": %s", zDb, sqlite3_errmsg(db)); } rc = sqlite3_prepare_v2(db, "SELECT k, v FROM kv ORDER BY k", -1, &pStmt, 0); if( rc ){ fatalError("prepare_v2 failed: %s\n", sqlite3_errmsg(db)); } nFN = (int)strlen(zDir); zFN = sqlite3_mprintf("%s/00/00/00.extra---------------------", zDir); if( zFN==0 ){ fatalError("malloc failed\n"); } zTail = zFN + nFN + 1; while( sqlite3_step(pStmt)==SQLITE_ROW ){ int iKey = sqlite3_column_int(pStmt, 0); int nData = sqlite3_column_bytes(pStmt, 1); const void *pData = sqlite3_column_blob(pStmt, 1); FILE *out; if( ePathType==PATH_DIR ){ sqlite3_snprintf(20, zTail, "%06d", iKey); }else{ sqlite3_snprintf(20, zTail, "%02d", iKey/10000); kvtest_mkdir(zFN); sqlite3_snprintf(20, zTail, "%02d/%02d", iKey/10000, (iKey/100)%100); kvtest_mkdir(zFN); sqlite3_snprintf(20, zTail, "%02d/%02d/%02d", iKey/10000, (iKey/100)%100, iKey%100); } out = fopen(zFN, "wb"); nWrote = fwrite(pData, 1, nData, out); fclose(out); printf("\r%s ", zTail); fflush(stdout); if( nWrote!=nData ){ fatalError("Wrote only %d of %d bytes to %s\n", (int)nWrote, nData, zFN); } } sqlite3_finalize(pStmt); sqlite3_close(db); sqlite3_free(zFN); printf("\n"); return 0; } /* ** Read the content of file zName into memory obtained from sqlite3_malloc64() ** and return a pointer to the buffer. The caller is responsible for freeing |
︙ | ︙ | |||
907 908 909 910 911 912 913 | sqlite3_finalize(pStmt); } pStmt = 0; if( !doMultiTrans ) sqlite3_exec(db, "BEGIN", 0, 0, 0); } if( iMax<=0 ) iMax = 1000; for(i=0; i<nCount; i++){ | | | > | > > > > | 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 | sqlite3_finalize(pStmt); } pStmt = 0; if( !doMultiTrans ) sqlite3_exec(db, "BEGIN", 0, 0, 0); } if( iMax<=0 ) iMax = 1000; for(i=0; i<nCount; i++){ if( eType==PATH_DIR || eType==PATH_TREE ){ /* CASE 1: Reading or writing blobs out of separate files */ char *zKey; if( eType==PATH_DIR ){ zKey = sqlite3_mprintf("%s/%06d", zDb, iKey); }else{ zKey = sqlite3_mprintf("%s/%02d/%02d/%02d", zDb, iKey/10000, (iKey/100)%100, iKey%100); } nData = 0; if( isUpdateTest ){ updateFile(zKey, &nData, doFsync); }else{ pData = readFile(zKey, &nData); sqlite3_free(pData); } |
︙ | ︙ |