Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add start of "zonefile" virtual table. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | zonefile |
Files: | files | file ages | folders |
SHA3-256: |
0b7bd1694bf50a5afed22ed3026cefe5 |
User & Date: | dan 2018-02-10 21:04:12.610 |
Context
2018-02-12
| ||
20:04 | Add support for reading simple (no compression, no encryption) zonefile files. (check-in: dba42f0e1e user: dan tags: zonefile) | |
2018-02-10
| ||
21:04 | Add start of "zonefile" virtual table. (check-in: 0b7bd1694b user: dan tags: zonefile) | |
17:41 | Add the start of the "zonefile" extension. (check-in: c125b4c380 user: dan tags: zonefile) | |
Changes
Changes to ext/zonefile/zonefile.c.
︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | #define ZONEFILE_SZ_HEADER 26 #define ZONEFILE_DEFAULT_MAXAUTOFRAMESIZE (64*1024) #define ZONEFILE_DEFAULT_ENCRYPTION 0 #define ZONEFILE_DEFAULT_COMPRESSION 0 #include <stdio.h> #include <string.h> #include <assert.h> typedef struct ZonefileWrite ZonefileWrite; struct ZonefileWrite { int compressionTypeIndexData; int compressionTypeContent; int encryptionType; int maxAutoFrameSize; }; typedef struct ZonefileBuffer ZonefileBuffer; struct ZonefileBuffer { u8 *a; int n; int nAlloc; }; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | #define ZONEFILE_SZ_HEADER 26 #define ZONEFILE_DEFAULT_MAXAUTOFRAMESIZE (64*1024) #define ZONEFILE_DEFAULT_ENCRYPTION 0 #define ZONEFILE_DEFAULT_COMPRESSION 0 #define ZONEFILE_SCHEMA \ "CREATE TABLE z1(" \ " k INTEGER PRIMARY KEY," \ " v BLOB," \ " fileid INTEGER," \ " frame INTEGER," \ " ofst INTEGER," \ " sz INTEGER" \ ")" #define ZONEFILE_FILES_SCHEMA \ "CREATE TABLE z2(" \ " filename TEXT," \ " priority INTEGER," \ " ekey BLOB," \ " header JSON HIDDEN" \ ")" #include <stdio.h> #include <string.h> #include <assert.h> typedef struct ZonefileWrite ZonefileWrite; struct ZonefileWrite { int compressionTypeIndexData; int compressionTypeContent; int encryptionType; int maxAutoFrameSize; }; typedef struct ZonefileHeader ZonefileHeader; struct ZonefileHeader { u32 magicNumber; u8 compressionTypeIndexData; u8 compressionTypeContent; u32 byteOffsetDictionary; u32 byteOffsetFrames; u32 numFrames; u32 numKeys; u8 encryptionType; u8 encryptionKeyIdx; u8 extendedHeaderVersion; u8 extendedHeaderSize; }; typedef struct ZonefileBuffer ZonefileBuffer; struct ZonefileBuffer { u8 *a; int n; int nAlloc; }; |
︙ | ︙ | |||
79 80 81 82 83 84 85 | static void zonefileTransferError(sqlite3_context *pCtx){ sqlite3 *db = sqlite3_context_db_handle(pCtx); const char *zErr = sqlite3_errmsg(db); sqlite3_result_error(pCtx, zErr, -1); } | > > > > > > > > > > > > > > > > > > > > > > > > > > | > | | | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 | static void zonefileTransferError(sqlite3_context *pCtx){ sqlite3 *db = sqlite3_context_db_handle(pCtx); const char *zErr = sqlite3_errmsg(db); sqlite3_result_error(pCtx, zErr, -1); } static int zonefilePrepare( sqlite3 *db, sqlite3_stmt **ppStmt, char **pzErr, const char *zFmt, ... ){ int rc; va_list ap; char *zSql; va_start(ap, zFmt); zSql = sqlite3_vmprintf(zFmt, ap); *ppStmt = 0; if( zSql ){ rc = sqlite3_prepare(db, zSql, -1, ppStmt, 0); if( rc!=SQLITE_OK ){ *pzErr = sqlite3_mprintf("%s", sqlite3_errmsg(db)); } sqlite3_free(zSql); }else{ rc = SQLITE_NOMEM; } return rc; } static sqlite3_stmt *zonefileCtxPrepare( sqlite3_context *pCtx, const char *zFmt, ... ){ sqlite3_stmt *pRet = 0; va_list ap; char *zSql; va_start(ap, zFmt); zSql = sqlite3_vmprintf(zFmt, ap); if( zSql ){ sqlite3 *db = sqlite3_context_db_handle(pCtx); int rc = sqlite3_prepare(db, zSql, -1, &pRet, 0); if( rc!=SQLITE_OK ){ zonefileTransferError(pCtx); } sqlite3_free(zSql); }else{ sqlite3_result_error_nomem(pCtx); } return pRet; } /* ** Return zero if the two SQL values passed as arguments are equal, or ** non-zero otherwise. Values with different types are considered unequal, ** even if they both contain the same numeric value (e.g. 2 and 2.0). */ static int zonefileCompareValue(sqlite3_value *p1, sqlite3_value *p2){ int eType; assert( p1 ); if( p2==0 ) return 1; eType = sqlite3_value_type(p1); if( sqlite3_value_type(p2)!=eType ) return 1; switch( eType ){ case SQLITE_INTEGER: return sqlite3_value_int64(p1)!=sqlite3_value_int64(p2); case SQLITE_FLOAT: return sqlite3_value_double(p1)!=sqlite3_value_double(p2); case SQLITE_TEXT: case SQLITE_BLOB: { int n1 = sqlite3_value_bytes(p1); int n2 = sqlite3_value_bytes(p2); if( n1!=n2 ) return 1; return memcmp(sqlite3_value_blob(p1), sqlite3_value_blob(p2), n1); } |
︙ | ︙ | |||
187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 | static void zonefilePut32(u8 *aBuf, u32 v){ aBuf[0] = (v >> 24) & 0xFF; aBuf[1] = (v >> 16) & 0xFF; aBuf[2] = (v >> 8) & 0xFF; aBuf[3] = v & 0xFF; } static void zonefileAppend32(ZonefileBuffer *pBuf, u32 v){ zonefilePut32(&pBuf->a[pBuf->n], v); pBuf->n += 4; } static void zonefileAppend64(ZonefileBuffer *pBuf, u64 v){ zonefileAppend32(pBuf, v>>32); zonefileAppend32(pBuf, v & 0xFFFFFFFF); } static void zonefileAppendBlob(ZonefileBuffer *pBuf, const u8 *p, int n){ memcpy(&pBuf->a[pBuf->n], p, n); pBuf->n += n; } static int zonefileWrite(FILE *pFd, const u8 *aBuf, int nBuf){ size_t res = fwrite(aBuf, 1, nBuf, pFd); return res!=nBuf ? SQLITE_ERROR : SQLITE_OK; } /* ** Function: zonefile_write(F,T[,J]) */ static void zonefileWriteFunc( sqlite3_context *pCtx, /* Context object */ int objc, /* Number of SQL arguments */ | > > > > > > > > > > > > > > > > | 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 290 291 292 293 294 295 296 297 | static void zonefilePut32(u8 *aBuf, u32 v){ aBuf[0] = (v >> 24) & 0xFF; aBuf[1] = (v >> 16) & 0xFF; aBuf[2] = (v >> 8) & 0xFF; aBuf[3] = v & 0xFF; } static u32 zonefileGet32(u8 *aBuf){ return (((u32)aBuf[0]) << 24) + (((u32)aBuf[1]) << 16) + (((u32)aBuf[2]) << 8) + (((u32)aBuf[3]) << 0); } static void zonefileAppend32(ZonefileBuffer *pBuf, u32 v){ zonefilePut32(&pBuf->a[pBuf->n], v); pBuf->n += 4; } static void zonefileAppend64(ZonefileBuffer *pBuf, u64 v){ zonefileAppend32(pBuf, v>>32); zonefileAppend32(pBuf, v & 0xFFFFFFFF); } static void zonefileAppendBlob(ZonefileBuffer *pBuf, const u8 *p, int n){ memcpy(&pBuf->a[pBuf->n], p, n); pBuf->n += n; } static int zonefileWrite(FILE *pFd, const u8 *aBuf, int nBuf){ size_t res = fwrite(aBuf, 1, nBuf, pFd); return res!=nBuf ? SQLITE_ERROR : SQLITE_OK; } static int zonefileRead(FILE *pFd, u8 *aBuf, int nBuf, i64 iOff){ int rc = fseek(pFd, iOff, SEEK_SET); if( rc==0 ){ rc = fread(aBuf, 1, nBuf, pFd); rc = (rc==nBuf) ? SQLITE_OK : SQLITE_ERROR; } return rc; } /* ** Function: zonefile_write(F,T[,J]) */ static void zonefileWriteFunc( sqlite3_context *pCtx, /* Context object */ int objc, /* Number of SQL arguments */ |
︙ | ︙ | |||
243 244 245 246 247 248 249 | if( objc==3 ){ zJson = (const char*)sqlite3_value_text(objv[2]); } if( zonefileGetParams(pCtx, zJson, &sWrite) ) return; /* Prepare the SQL statement used to read data from the source table. This ** also serves to verify the suitability of the source table schema. */ | | | 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 | if( objc==3 ){ zJson = (const char*)sqlite3_value_text(objv[2]); } if( zonefileGetParams(pCtx, zJson, &sWrite) ) return; /* Prepare the SQL statement used to read data from the source table. This ** also serves to verify the suitability of the source table schema. */ pStmt = zonefileCtxPrepare(pCtx, "SELECT k, frame, v FROM %Q ORDER BY frame, idx, k", zTbl ); if( pStmt==0 ) return; /* Open a file-handle used to write out the zonefile */ pFd = fopen(zFile, "w"); if( pFd==0 ){ |
︙ | ︙ | |||
292 293 294 295 296 297 298 299 300 301 302 303 304 305 | /* Add data for new entry to sFrames */ if( zonefileBufferGrow(pCtx, &sFrames, nBlob) ) goto zone_write_out; zonefileAppendBlob(&sFrames, pBlob, nBlob); szFrame += nBlob; nKey++; } /* Create the zonefile header in the in-memory buffer */ zonefilePut32(&aHdr[0], ZONEFILE_MAGIC_NUMBER); aHdr[4] = sWrite.compressionTypeIndexData; aHdr[5] = sWrite.compressionTypeContent; zonefilePut32(&aHdr[6], 0); /* Compression dictionary byte offset */ zonefilePut32(&aHdr[10], ZONEFILE_SZ_HEADER + sFrameIdx.n + sKeyIdx.n); | > > | 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 | /* Add data for new entry to sFrames */ if( zonefileBufferGrow(pCtx, &sFrames, nBlob) ) goto zone_write_out; zonefileAppendBlob(&sFrames, pBlob, nBlob); szFrame += nBlob; nKey++; } sqlite3_value_free(pPrev); pPrev = 0; /* Create the zonefile header in the in-memory buffer */ zonefilePut32(&aHdr[0], ZONEFILE_MAGIC_NUMBER); aHdr[4] = sWrite.compressionTypeIndexData; aHdr[5] = sWrite.compressionTypeContent; zonefilePut32(&aHdr[6], 0); /* Compression dictionary byte offset */ zonefilePut32(&aHdr[10], ZONEFILE_SZ_HEADER + sFrameIdx.n + sKeyIdx.n); |
︙ | ︙ | |||
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 | zone_write_out: if( pFd ) fclose(pFd); sqlite3_finalize(pStmt); zonefileBufferFree(&sFrameIdx); zonefileBufferFree(&sKeyIdx); zonefileBufferFree(&sFrames); } /* ** Register the "zonefile" extensions. */ static int zonefileRegister(sqlite3 *db){ struct Func { const char *z; int n; void (*x)(sqlite3_context*,int,sqlite3_value**); } aFunc[] = { { "zonefile_write", 2, zonefileWriteFunc }, { "zonefile_write", 3, zonefileWriteFunc }, }; int rc = SQLITE_OK; int i; for(i=0; rc==SQLITE_OK && i<sizeof(aFunc)/sizeof(aFunc[0]); i++){ struct Func *p = &aFunc[i]; rc = sqlite3_create_function(db, p->z, p->n, SQLITE_ANY, 0, p->x, 0, 0); } return rc; } #else /* SQLITE_OMIT_VIRTUALTABLE */ # define zonefileRegister(x) SQLITE_OK #endif | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 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 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 646 647 648 649 650 651 652 653 654 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 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 | zone_write_out: if( pFd ) fclose(pFd); sqlite3_finalize(pStmt); zonefileBufferFree(&sFrameIdx); zonefileBufferFree(&sKeyIdx); zonefileBufferFree(&sFrames); } typedef struct ZonefileFilesTab ZonefileFilesTab; struct ZonefileFilesTab { sqlite3_vtab base; /* Base class - must be first */ sqlite3 *db; char *zBase; /* Name of this table */ char *zDb; /* Database containing this table */ sqlite3_stmt *pInsert; /* Insert into the %_shadow_file table */ sqlite3_stmt *pDelete; /* Delete by rowid from %_shadow_file table */ }; typedef struct ZonefileFilesCsr ZonefileFilesCsr; struct ZonefileFilesCsr { sqlite3_vtab_cursor base; /* Base class - must be first */ sqlite3_stmt *pSelect; }; /* ** This function does the work of xCreate (if bCreate!=0) or xConnect ** (if bCreate==0) for the zonefile_files module. */ static int zffCreateConnect( int bCreate, sqlite3 *db, int argc, const char *const*argv, sqlite3_vtab **ppVtab, char **pzErr ){ ZonefileFilesTab *p; const char *zName = argv[2]; const char *zDb = argv[1]; int nName = strlen(zName); int nDb = strlen(zDb); int rc = SQLITE_OK; if( nName<6 || memcmp(&zName[nName-6], "_files", 6)!=0 ){ *pzErr = sqlite3_mprintf("do not create zonefile_files tables directly!"); *ppVtab = 0; return SQLITE_ERROR; } p = (ZonefileFilesTab*)sqlite3_malloc(sizeof(ZonefileFilesTab)+nName+1+nDb+1); if( !p ){ rc = SQLITE_NOMEM; }else{ memset(p, 0, sizeof(ZonefileFilesTab)); p->zBase = (char*)&p[1]; memcpy(p->zBase, zName, nName-6); p->zBase[nName-6] = '\0'; p->zDb = &p->zBase[nName+1]; memcpy(p->zDb, zDb, nDb+1); p->db = db; rc = sqlite3_declare_vtab(db, ZONEFILE_FILES_SCHEMA); } if( rc!=SQLITE_OK ){ sqlite3_free(p); p = 0; } *ppVtab = (sqlite3_vtab*)p; return rc; } /* ** zonefile_files virtual table module xCreate method. */ static int zffCreate( sqlite3 *db, void *pAux, int argc, const char *const*argv, sqlite3_vtab **ppVtab, char **pzErr ){ return zffCreateConnect(1, db, argc, argv, ppVtab, pzErr); } /* ** zonefile_files virtual table module xConnect method. */ static int zffConnect( sqlite3 *db, void *pAux, int argc, const char *const*argv, sqlite3_vtab **ppVtab, char **pzErr ){ return zffCreateConnect(0, db, argc, argv, ppVtab, pzErr); } /* ** zonefile_files virtual table module xDisconnect method. */ static int zffDisconnect(sqlite3_vtab *pVtab){ ZonefileFilesTab *pTab = (ZonefileFilesTab*)pVtab; sqlite3_finalize(pTab->pInsert); sqlite3_finalize(pTab->pDelete); sqlite3_free(pTab); return SQLITE_OK; } /* ** zonefile_files virtual table module xBestIndex method. */ static int zffBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){ return SQLITE_OK; } /* ** zonefile_files virtual table module xOpen method. */ static int zffOpen(sqlite3_vtab *pVtab, sqlite3_vtab_cursor **ppCursor){ ZonefileFilesCsr *pCsr; pCsr = (ZonefileFilesCsr*)sqlite3_malloc(sizeof(ZonefileFilesCsr)); if( pCsr==0 ){ return SQLITE_NOMEM; } memset(pCsr, 0, sizeof(ZonefileFilesCsr)); *ppCursor = (sqlite3_vtab_cursor*)pCsr; return SQLITE_OK; } static void zffCursorReset(ZonefileFilesCsr *pCsr){ sqlite3_finalize(pCsr->pSelect); pCsr->pSelect = 0; } /* ** zonefile_files virtual table module xClose method. */ static int zffClose(sqlite3_vtab_cursor *cur){ ZonefileFilesCsr *pCsr = (ZonefileFilesCsr*)cur; zffCursorReset(pCsr); sqlite3_free(pCsr); return SQLITE_OK; } /* ** zonefile_files virtual table module xNext method. */ static int zffNext(sqlite3_vtab_cursor *cur){ ZonefileFilesCsr *pCsr = (ZonefileFilesCsr*)cur; int rc; if( SQLITE_ROW==sqlite3_step(pCsr->pSelect) ){ rc = SQLITE_OK; }else{ rc = sqlite3_finalize(pCsr->pSelect); pCsr->pSelect = 0; } return rc; } /* ** zonefile_files virtual table module xFilter method. */ static int zffFilter( sqlite3_vtab_cursor *cur, int idxNum, const char *idxStr, int argc, sqlite3_value **argv ){ ZonefileFilesCsr *pCsr = (ZonefileFilesCsr*)cur; ZonefileFilesTab *pTab = (ZonefileFilesTab*)(pCsr->base.pVtab); int rc; zffCursorReset(pCsr); rc = zonefilePrepare(pTab->db, &pCsr->pSelect, &pTab->base.zErrMsg, "SELECT filename, fileid FROM %Q.'%q_shadow_file'", pTab->zDb, pTab->zBase ); if( rc==SQLITE_OK ){ rc = zffNext(cur); } return rc; } /* ** zonefile_files virtual table module xEof method. */ static int zffEof(sqlite3_vtab_cursor *cur){ ZonefileFilesCsr *pCsr = (ZonefileFilesCsr*)cur; return pCsr->pSelect==0; } static FILE *zonefileOpenFile(sqlite3_context *pCtx, const char *zFile){ FILE *pFd = fopen(zFile, "r"); if( pFd==0 ){ zonefileCtxError(pCtx, "failed to open file for reading: \"%s\"", zFile); } return pFd; } static void zonefileHeaderDeserialize(u8 *aBuf, ZonefileHeader *pHdr){ pHdr->magicNumber = zonefileGet32(&aBuf[0]); pHdr->compressionTypeIndexData = aBuf[4]; pHdr->compressionTypeContent = aBuf[5]; pHdr->byteOffsetDictionary = zonefileGet32(&aBuf[6]); pHdr->byteOffsetFrames = zonefileGet32(&aBuf[10]); pHdr->numFrames = zonefileGet32(&aBuf[14]); pHdr->numKeys = zonefileGet32(&aBuf[18]); pHdr->encryptionType = aBuf[22]; pHdr->encryptionKeyIdx = aBuf[23]; pHdr->extendedHeaderVersion = aBuf[24]; pHdr->extendedHeaderSize = aBuf[25]; } static void zonefileJsonHeader(sqlite3_context *pCtx, const char *zFile){ FILE *pFd = zonefileOpenFile(pCtx, zFile); if( pFd ){ int rc; ZonefileHeader hdr; u8 aBuf[ZONEFILE_SZ_HEADER]; rc = zonefileRead(pFd, aBuf, ZONEFILE_SZ_HEADER, 0); if( rc==SQLITE_OK ){ zonefileHeaderDeserialize(aBuf, &hdr); } if( rc!=SQLITE_OK ){ zonefileCtxError(pCtx, "failed to read header from file: \"%s\"", zFile); }else{ char *zJson = sqlite3_mprintf("{" "\"magicNumber\":%u," "\"compressionTypeIndexData\":%u," "\"compressionTypeContent\":%u," "\"byteOffsetDictionary\":%u," "\"byteOffsetFrames\":%u," "\"numFrames\":%u," "\"numKeys\":%u," "\"encryptionType\":%u," "\"encryptionKeyIdx\":%u," "\"extendedHeaderVersion\":%u," "\"extendedHeaderSize\":%u}", (u32)hdr.magicNumber, (u32)hdr.compressionTypeIndexData, (u32)hdr.compressionTypeContent, (u32)hdr.byteOffsetDictionary, (u32)hdr.byteOffsetFrames, (u32)hdr.numFrames, (u32)hdr.numKeys, (u32)hdr.encryptionType, (u32)hdr.encryptionKeyIdx, (u32)hdr.extendedHeaderVersion, (u32)hdr.extendedHeaderSize ); if( zJson ){ sqlite3_result_text(pCtx, zJson, -1, SQLITE_TRANSIENT); sqlite3_free(zJson); }else{ sqlite3_result_error_nomem(pCtx); } } fclose(pFd); } } /* ** zonefile_files virtual table module xColumn method. */ static int zffColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){ ZonefileFilesCsr *pCsr = (ZonefileFilesCsr*)cur; switch( i ){ case 0: /* filename */ sqlite3_result_value(ctx, sqlite3_column_value(pCsr->pSelect, 0)); break; case 1: /* priority */ break; case 2: /* ekey */ break; case 3: { /* header */ const char *zFile = (const char*)sqlite3_column_text(pCsr->pSelect, 0); zonefileJsonHeader(ctx, zFile); break; } } return SQLITE_OK; } /* ** zonefile_files virtual table module xRowid method. */ static int zffRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){ ZonefileFilesCsr *pCsr = (ZonefileFilesCsr*)cur; *pRowid = sqlite3_column_int64(pCsr->pSelect, 1); return SQLITE_OK; } /* ** zonefile_files virtual table module xUpdate method. ** ** A delete specifies a single argument - the rowid of the row to remove. ** ** Update and insert operations pass: ** ** 1. The "old" rowid, or NULL. ** 2. The "new" rowid. ** 3. Values for each of the 4 columns: (filename,priority,ekey,header) */ static int zffUpdate( sqlite3_vtab *pVtab, int nVal, sqlite3_value **apVal, sqlite_int64 *pRowid ){ int rc = SQLITE_OK; ZonefileFilesTab *pTab = (ZonefileFilesTab*)pVtab; if( sqlite3_value_type(apVal[0])==SQLITE_INTEGER ){ if( pTab->pDelete==0 ){ rc = zonefilePrepare(pTab->db, &pTab->pInsert, &pVtab->zErrMsg, "DELETE FROM %Q.'%q_shadow_file WHERE fileid=?", pTab->zDb, pTab->zBase ); } if( rc==SQLITE_OK ){ sqlite3_bind_value(pTab->pDelete, 1, apVal[0]); sqlite3_step(pTab->pDelete); rc = sqlite3_reset(pTab->pDelete); } } if( nVal>1 ){ if( pTab->pInsert==0 ){ rc = zonefilePrepare(pTab->db, &pTab->pInsert, &pVtab->zErrMsg, "INSERT INTO %Q.'%q_shadow_file'(filename) VALUES(?)", pTab->zDb, pTab->zBase ); } if( rc==SQLITE_OK ){ const char *zFile = (const char*)sqlite3_value_text(apVal[2]); sqlite3_bind_text(pTab->pInsert, 1, zFile, -1, SQLITE_TRANSIENT); sqlite3_step(pTab->pInsert); rc = sqlite3_reset(pTab->pInsert); } } return SQLITE_OK; } typedef struct ZonefileTab ZonefileTab; struct ZonefileTab { sqlite3_vtab base; /* Base class - must be first */ sqlite3 *db; char *zName; /* Name of this table */ char *zDb; /* Name of db containing this table */ }; /* ** This function does the work of xCreate (if bCreate!=0) or xConnect ** (if bCreate==0) for the zonefile module. ** ** argv[0] -> module name ("zonefile") ** argv[1] -> database name ** argv[2] -> table name */ static int zonefileCreateConnect( int bCreate, sqlite3 *db, int argc, const char *const*argv, sqlite3_vtab **ppVtab, char **pzErr ){ ZonefileTab *p; const char *zName = argv[2]; const char *zDb = argv[1]; int nName = strlen(zName); int nDb = strlen(zDb); int rc = SQLITE_OK; p = (ZonefileTab*)sqlite3_malloc(sizeof(ZonefileTab) + nName+1 + nDb+1); if( !p ){ rc = SQLITE_NOMEM; }else{ memset(p, 0, sizeof(ZonefileTab)); p->zName = (char*)&p[1]; memcpy(p->zName, zName, nName+1); p->zDb = &p->zName[nName+1]; memcpy(p->zDb, zDb, nDb+1); p->db = db; if( bCreate ){ char *zSql = sqlite3_mprintf( "CREATE TABLE %Q.'%q_shadow_idx'(" " k INTEGER PRIMARY KEY," " fileid INTEGER," " frame INTEGER," " ofst INTEGER," " sz INTEGER" ");" "CREATE TABLE %Q.'%q_shadow_file'(" " filename TEXT," " priority INTEGER," " fileid INTEGER PRIMARY KEY" ");" "CREATE VIRTUAL TABLE %Q.'%q_files' USING zonefile_files;", zDb, zName, zDb, zName, zDb, zName ); if( zSql==0 ){ rc = SQLITE_NOMEM; }else{ rc = sqlite3_exec(db, zSql, 0, 0, pzErr); sqlite3_free(zSql); } } if( rc==SQLITE_OK ){ rc = sqlite3_declare_vtab(db, ZONEFILE_SCHEMA); } } if( rc!=SQLITE_OK ){ sqlite3_free(p); p = 0; } *ppVtab = (sqlite3_vtab*)p; return rc; } /* ** zonefile virtual table module xCreate method. */ static int zonefileCreate( sqlite3 *db, void *pAux, int argc, const char *const*argv, sqlite3_vtab **ppVtab, char **pzErr ){ return zonefileCreateConnect(1, db, argc, argv, ppVtab, pzErr); } /* ** zonefile virtual table module xConnect method. */ static int zonefileConnect( sqlite3 *db, void *pAux, int argc, const char *const*argv, sqlite3_vtab **ppVtab, char **pzErr ){ return zonefileCreateConnect(0, db, argc, argv, ppVtab, pzErr); } /* ** zonefile virtual table module xDisconnect method. */ static int zonefileDisconnect(sqlite3_vtab *pVtab){ ZonefileTab *pTab = (ZonefileTab*)pVtab; sqlite3_free(pTab); return SQLITE_OK; } /* ** zonefile virtual table module xBestIndex method. */ static int zonefileBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){ return SQLITE_OK; } /* ** zonefile virtual table module xDestroy method. */ static int zonefileDestroy(sqlite3_vtab *pVtab){ ZonefileTab *pTab = (ZonefileTab*)pVtab; int rc = SQLITE_OK; char *zSql = sqlite3_mprintf( "DROP TABLE IF EXISTS %Q.'%q_shadow_idx';" "DROP TABLE IF EXISTS %Q.'%q_shadow_file';" "DROP TABLE IF EXISTS %Q.'%q_files';", pTab->zDb, pTab->zName, pTab->zDb, pTab->zName, pTab->zDb, pTab->zName ); if( zSql==0 ){ rc = SQLITE_NOMEM; }else{ rc = sqlite3_exec(pTab->db, zSql, 0, 0, 0); } if( rc==SQLITE_OK ){ zonefileDisconnect(pVtab); } return rc; } /* ** zonefile virtual table module xOpen method. */ static int zonefileOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){ return SQLITE_OK; } /* ** zonefile virtual table module xClose method. */ static int zonefileClose(sqlite3_vtab_cursor *cur){ return SQLITE_OK; } /* ** zonefile virtual table module xFilter method. */ static int zonefileFilter( sqlite3_vtab_cursor *pVtabCursor, int idxNum, const char *idxStr, int argc, sqlite3_value **argv ){ return SQLITE_OK; } /* ** zonefile virtual table module xNext method. */ static int zonefileNext(sqlite3_vtab_cursor *pVtabCursor){ return SQLITE_OK; } /* ** zonefile virtual table module xEof method. */ static int zonefileEof(sqlite3_vtab_cursor *cur){ return SQLITE_OK; } /* ** zonefile virtual table module xColumn method. */ static int zonefileColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){ return SQLITE_OK; } /* ** zonefile virtual table module xRowid method. */ static int zonefileRowid(sqlite3_vtab_cursor *pVtabCursor, sqlite_int64 *pRowid){ return SQLITE_OK; } /* ** Register the "zonefile" extensions. */ static int zonefileRegister(sqlite3 *db){ static sqlite3_module filesModule = { 0, /* iVersion */ zffCreate, /* xCreate - create a table */ zffConnect, /* xConnect - connect to an existing table */ zffBestIndex, /* xBestIndex - Determine search strategy */ zffDisconnect, /* xDisconnect - Disconnect from a table */ zffDisconnect, /* xDestroy - Drop a table */ zffOpen, /* xOpen - open a cursor */ zffClose, /* xClose - close a cursor */ zffFilter, /* xFilter - configure scan constraints */ zffNext, /* xNext - advance a cursor */ zffEof, /* xEof */ zffColumn, /* xColumn - read data */ zffRowid, /* xRowid - read data */ zffUpdate, /* xUpdate - write data */ 0, /* xBegin - begin transaction */ 0, /* xSync - sync transaction */ 0, /* xCommit - commit transaction */ 0, /* xRollback - rollback transaction */ 0, /* xFindFunction - function overloading */ 0, /* xRename - rename the table */ 0, /* xSavepoint */ 0, /* xRelease */ 0 /* xRollbackTo */ }; static sqlite3_module zonefileModule = { 0, /* iVersion */ zonefileCreate, /* xCreate - create a table */ zonefileConnect, /* xConnect - connect to an existing table */ zonefileBestIndex, /* xBestIndex - Determine search strategy */ zonefileDisconnect, /* xDisconnect - Disconnect from a table */ zonefileDestroy, /* xDestroy - Drop a table */ zonefileOpen, /* xOpen - open a cursor */ zonefileClose, /* xClose - close a cursor */ zonefileFilter, /* xFilter - configure scan constraints */ zonefileNext, /* xNext - advance a cursor */ zonefileEof, /* xEof */ zonefileColumn, /* xColumn - read data */ zonefileRowid, /* xRowid - read data */ 0, /* xUpdate - write data */ 0, /* xBegin - begin transaction */ 0, /* xSync - sync transaction */ 0, /* xCommit - commit transaction */ 0, /* xRollback - rollback transaction */ 0, /* xFindFunction - function overloading */ 0, /* xRename - rename the table */ 0, /* xSavepoint */ 0, /* xRelease */ 0 /* xRollbackTo */ }; struct Func { const char *z; int n; void (*x)(sqlite3_context*,int,sqlite3_value**); } aFunc[] = { { "zonefile_write", 2, zonefileWriteFunc }, { "zonefile_write", 3, zonefileWriteFunc }, }; int rc = SQLITE_OK; int i; for(i=0; rc==SQLITE_OK && i<sizeof(aFunc)/sizeof(aFunc[0]); i++){ struct Func *p = &aFunc[i]; rc = sqlite3_create_function(db, p->z, p->n, SQLITE_ANY, 0, p->x, 0, 0); } if( rc==SQLITE_OK ){ rc = sqlite3_create_module(db, "zonefile_files", &filesModule, 0); } if( rc==SQLITE_OK ){ rc = sqlite3_create_module(db, "zonefile", &zonefileModule, 0); } return rc; } #else /* SQLITE_OMIT_VIRTUALTABLE */ # define zonefileRegister(x) SQLITE_OK #endif |
︙ | ︙ |
Changes to ext/zonefile/zonefile1.test.
︙ | ︙ | |||
15 16 17 18 19 20 21 | if {![info exists testdir]} { set testdir [file join [file dirname [info script]] .. .. test] } source [file join $testdir tester.tcl] set testprefix zonefile1 load_static_extension db zonefile | < > > | > > > > > > > > > > > > > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | if {![info exists testdir]} { set testdir [file join [file dirname [info script]] .. .. test] } source [file join $testdir tester.tcl] set testprefix zonefile1 load_static_extension db zonefile do_execsql_test 1.0 { CREATE TABLE zz(k INTEGER PRIMARY KEY, frame INTEGER, idx INTEGER, v BLOB); INSERT INTO zz VALUES(1, -1, -1, randomblob(100)); INSERT INTO zz VALUES(2, -1, -1, randomblob(100)); INSERT INTO zz VALUES(3, -1, -1, randomblob(100)); } do_execsql_test 1.1 { SELECT zonefile_write('test.zonefile', 'zz'); } {{}} do_execsql_test 2.0 { CREATE VIRTUAL TABLE z1 USING zonefile; SELECT name FROM sqlite_master WHERE name LIKE 'z1%' ORDER BY 1; } {z1 z1_files z1_shadow_file z1_shadow_idx} do_execsql_test 2.1 { INSERT INTO z1_files(filename) VALUES('test.zonefile'); SELECT filename, json_extract(header, '$.magicNumber'), json_extract(header, '$.numFrames'), json_extract(header, '$.numKeys') FROM z1_files; } {test.zonefile 1179332920 1 3} finish_test |