Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix another point in zonefile.c so that all files are opened in either "rb" or "wb" mode. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | zonefile |
| Files: | files | file ages | folders |
| SHA3-256: |
fb1c2277912c55cfae30c18b5434bc19 |
| User & Date: | dan 2018-02-15 15:24:12 |
Context
|
2018-02-15
| ||
| 20:37 | Add support for zlib compression to the zonefile module. check-in: 72b8a7ef user: dan tags: zonefile | |
| 20:00 | On unix, the "PRAGMA fsync_interval=N" command causes an extra fdatasync() after writing N bytes of content, to force a write-queue flush in the underlying OS. This is an experimental hack that is not expected to land on trunk. Leaf check-in: b18cc5fe user: drh tags: write-queue-flush-hack | |
| 15:24 | Fix another point in zonefile.c so that all files are opened in either "rb" or "wb" mode. check-in: fb1c2277 user: dan tags: zonefile | |
| 15:17 | When calling fopen() in the zonefile extension, use modes "rb" and "wb" instead of "r" and "w". This makes no difference on unix, but is required when accessing binary files on other systems. check-in: 4bb854dd user: dan tags: zonefile | |
Changes
Changes to ext/zonefile/zonefile.c.
376 377 378 379 380 381 382 383 384 385 386 387 388 389 ... 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 ... 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 ... 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 ... 741 742 743 744 745 746 747 748 749 750 751 752 753 754 |
int nKey = 0; /* Number of keys in new zonefile */
int nFrame = 0; /* Number of frames in new zonefile */
int szFrame = 0; /* Size of current frame */
sqlite3_stmt *pStmt = 0; /* SQL used to read data from source table */
FILE *pFd = 0;
int rc;
sqlite3_value *pPrev = 0;
ZonefileBuffer sFrameIdx = {0, 0, 0};
ZonefileBuffer sKeyIdx = {0, 0, 0};
ZonefileBuffer sFrames = {0, 0, 0};
u8 aHdr[ZONEFILE_SZ_HEADER]; /* Space to assemble zonefile header */
assert( objc==2 || objc==3 );
................................................................................
** 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 ){
zonefileCtxError(pCtx, "error opening file \"%s\" (fopen())", zFile);
sqlite3_finalize(pStmt);
return;
}
while( SQLITE_ROW==sqlite3_step(pStmt) ){
sqlite3_int64 k = sqlite3_column_int64(pStmt, 0);
sqlite3_value *pFrame = sqlite3_column_value(pStmt, 1);
int nBlob = sqlite3_column_bytes(pStmt, 2);
................................................................................
** 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->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 = zonefileFileRead(pFd, aBuf, ZONEFILE_SZ_HEADER, 0);
if( rc==SQLITE_OK ){
................................................................................
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){
|
> | | > < < < < < < < < > | > > > |
376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 ... 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 ... 674 675 676 677 678 679 680 681 682 683 684 685 686 687 ... 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 ... 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 |
int nKey = 0; /* Number of keys in new zonefile */ int nFrame = 0; /* Number of frames in new zonefile */ int szFrame = 0; /* Size of current frame */ sqlite3_stmt *pStmt = 0; /* SQL used to read data from source table */ FILE *pFd = 0; int rc; sqlite3_value *pPrev = 0; char *zErr = 0; ZonefileBuffer sFrameIdx = {0, 0, 0}; ZonefileBuffer sKeyIdx = {0, 0, 0}; ZonefileBuffer sFrames = {0, 0, 0}; u8 aHdr[ZONEFILE_SZ_HEADER]; /* Space to assemble zonefile header */ assert( objc==2 || objc==3 ); ................................................................................ ** 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 = zonefileFileOpen(zFile, 1, &zErr); if( pFd==0 ){ sqlite3_result_error(pCtx, zErr, -1); sqlite3_finalize(pStmt); sqlite3_free(zErr); return; } while( SQLITE_ROW==sqlite3_step(pStmt) ){ sqlite3_int64 k = sqlite3_column_int64(pStmt, 0); sqlite3_value *pFrame = sqlite3_column_value(pStmt, 1); int nBlob = sqlite3_column_bytes(pStmt, 2); ................................................................................ ** zonefile_files virtual table module xEof method. */ static int zffEof(sqlite3_vtab_cursor *cur){ ZonefileFilesCsr *pCsr = (ZonefileFilesCsr*)cur; return pCsr->pSelect==0; } 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->encryptionType = aBuf[22]; pHdr->encryptionKeyIdx = aBuf[23]; pHdr->extendedHeaderVersion = aBuf[24]; pHdr->extendedHeaderSize = aBuf[25]; } static void zonefileJsonHeader(sqlite3_context *pCtx, const char *zFile){ char *zErr = 0; FILE *pFd = zonefileFileOpen(zFile, 0, &zErr); if( pFd ){ int rc; ZonefileHeader hdr; u8 aBuf[ZONEFILE_SZ_HEADER]; rc = zonefileFileRead(pFd, aBuf, ZONEFILE_SZ_HEADER, 0); if( rc==SQLITE_OK ){ ................................................................................ sqlite3_result_text(pCtx, zJson, -1, SQLITE_TRANSIENT); sqlite3_free(zJson); }else{ sqlite3_result_error_nomem(pCtx); } } fclose(pFd); }else{ sqlite3_result_error(pCtx, zErr, -1); sqlite3_free(zErr); } } /* ** zonefile_files virtual table module xColumn method. */ static int zffColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){ |