Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add the sqlite3_quota_fflush() interface. Enhance sqlite3_quota_remove() so that it can remove entire directories. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | quota-stdio |
Files: | files | file ages | folders |
SHA1: |
abcb65af4cdd192beaccdbc2109ad45b |
User & Date: | drh 2011-12-03 00:13:06.592 |
Context
2011-12-12
| ||
19:47 | Make sure the quota logic is usable as C++. (check-in: f4534bd302 user: drh tags: quota-stdio) | |
2011-12-03
| ||
00:13 | Add the sqlite3_quota_fflush() interface. Enhance sqlite3_quota_remove() so that it can remove entire directories. (check-in: abcb65af4c user: drh tags: quota-stdio) | |
2011-12-02
| ||
15:31 | One minor documentation enhancement. (check-in: 8cfd3575c8 user: drh tags: quota-stdio) | |
Changes
Changes to src/test_quota.c.
︙ | ︙ | |||
548 549 550 551 552 553 554 | sqlite3_file *pSubOpen = quotaSubOpen(pConn); int rc; rc = pSubOpen->pMethods->xClose(pSubOpen); quotaEnter(); pFile->nRef--; if( pFile->nRef==0 ){ quotaGroup *pGroup = pFile->pGroup; | | > > > | 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 | sqlite3_file *pSubOpen = quotaSubOpen(pConn); int rc; rc = pSubOpen->pMethods->xClose(pSubOpen); quotaEnter(); pFile->nRef--; if( pFile->nRef==0 ){ quotaGroup *pGroup = pFile->pGroup; if( pFile->deleteOnClose ){ gQuota.pOrigVfs->xDelete(gQuota.pOrigVfs, pFile->zFilename, 0); quotaRemoveFile(pFile); } quotaGroupDeref(pGroup); } quotaLeave(); return rc; } /* Pass xRead requests directory thru to the original VFS without |
︙ | ︙ | |||
1037 1038 1039 1040 1041 1042 1043 | rc = fclose(p->f); pFile = p->pFile; if( pFile ){ quotaEnter(); pFile->nRef--; if( pFile->nRef==0 ){ quotaGroup *pGroup = pFile->pGroup; | | > > > > > > > > > > | 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 | rc = fclose(p->f); pFile = p->pFile; if( pFile ){ quotaEnter(); pFile->nRef--; if( pFile->nRef==0 ){ quotaGroup *pGroup = pFile->pGroup; if( pFile->deleteOnClose ){ gQuota.pOrigVfs->xDelete(gQuota.pOrigVfs, pFile->zFilename, 0); quotaRemoveFile(pFile); } quotaGroupDeref(pGroup); } quotaLeave(); } sqlite3_free(p); return rc; } /* ** Flush memory buffers for a quota_FILE to disk. */ int sqlite3_quota_fflush(quota_FILE *p){ return fflush(p->f); } /* ** Seek on a quota_FILE stream. */ int sqlite3_quota_fseek(quota_FILE *p, long offset, int whence){ return fseek(p->f, offset, whence); } |
︙ | ︙ | |||
1068 1069 1070 1071 1072 1073 1074 | ** Tell the current location of a quota_FILE stream. */ long sqlite3_quota_ftell(quota_FILE *p){ return ftell(p->f); } /* | | > > > > > > > > | > > > > > | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 | ** Tell the current location of a quota_FILE stream. */ long sqlite3_quota_ftell(quota_FILE *p){ return ftell(p->f); } /* ** Remove a managed file. Update quotas accordingly. */ int sqlite3_quota_remove(const char *zFilename){ char *zFull; /* Full pathname for zFilename */ int nFull; /* Number of bytes in zFilename */ int rc; /* Result code */ quotaGroup *pGroup; /* Group containing zFilename */ quotaFile *pFile; /* A file in the group */ quotaFile *pNextFile; /* next file in the group */ int diff; /* Difference between filenames */ char c; /* First character past end of pattern */ zFull = sqlite3_malloc(gQuota.sThisVfs.mxPathname + 1); if( zFull==0 ) return SQLITE_NOMEM; rc = gQuota.pOrigVfs->xFullPathname(gQuota.pOrigVfs, zFilename, gQuota.sThisVfs.mxPathname+1, zFull); if( rc ){ sqlite3_free(zFull); return rc; } /* Figure out the length of the full pathname. If the name ends with ** / (or \ on windows) then remove the trailing /. */ nFull = strlen(zFull); if( nFull>0 && (zFull[nFull-1]=='/' || zFull[nFull-1]=='\\') ){ nFull--; zFull[nFull] = 0; } quotaEnter(); pGroup = quotaGroupFind(zFull); if( pGroup ){ for(pFile=pGroup->pFiles; pFile && rc==SQLITE_OK; pFile=pNextFile){ pNextFile = pFile->pNext; diff = memcmp(zFull, pFile->zFilename, nFull); if( diff==0 && ((c = pFile->zFilename[nFull])==0 || c=='/' || c=='\\') ){ if( pFile->nRef ){ pFile->deleteOnClose = 1; }else{ rc = gQuota.pOrigVfs->xDelete(gQuota.pOrigVfs, pFile->zFilename, 0); quotaRemoveFile(pFile); quotaGroupDeref(pGroup); } } } } quotaLeave(); sqlite3_free(zFull); return rc; } /***************************** Test Code ***********************************/ #ifdef SQLITE_TEST #include <tcl.h> /* ** Argument passed to a TCL quota-over-limit callback. |
︙ | ︙ | |||
1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 | return TCL_ERROR; } p = sqlite3TestTextToPtr(Tcl_GetString(objv[1])); rc = sqlite3_quota_fclose(p); Tcl_SetObjResult(interp, Tcl_NewIntObj(rc)); return TCL_OK; } /* ** tclcmd: sqlite3_quota_fseek HANDLE OFFSET WHENCE */ static int test_quota_fseek( void * clientData, Tcl_Interp *interp, | > > > > > > > > > > > > > > > > > > > > > > | 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 | return TCL_ERROR; } p = sqlite3TestTextToPtr(Tcl_GetString(objv[1])); rc = sqlite3_quota_fclose(p); Tcl_SetObjResult(interp, Tcl_NewIntObj(rc)); return TCL_OK; } /* ** tclcmd: sqlite3_quota_fflush HANDLE */ static int test_quota_fflush( void * clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[] ){ quota_FILE *p; int rc; if( objc!=2 ){ Tcl_WrongNumArgs(interp, 1, objv, "HANDLE"); return TCL_ERROR; } p = sqlite3TestTextToPtr(Tcl_GetString(objv[1])); rc = sqlite3_quota_fflush(p); Tcl_SetObjResult(interp, Tcl_NewIntObj(rc)); return TCL_OK; } /* ** tclcmd: sqlite3_quota_fseek HANDLE OFFSET WHENCE */ static int test_quota_fseek( void * clientData, Tcl_Interp *interp, |
︙ | ︙ | |||
1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 | { "sqlite3_quota_set", test_quota_set }, { "sqlite3_quota_file", test_quota_file }, { "sqlite3_quota_dump", test_quota_dump }, { "sqlite3_quota_fopen", test_quota_fopen }, { "sqlite3_quota_fread", test_quota_fread }, { "sqlite3_quota_fwrite", test_quota_fwrite }, { "sqlite3_quota_fclose", test_quota_fclose }, { "sqlite3_quota_fseek", test_quota_fseek }, { "sqlite3_quota_rewind", test_quota_rewind }, { "sqlite3_quota_ftell", test_quota_ftell }, { "sqlite3_quota_remove", test_quota_remove }, { "sqlite3_quota_glob", test_quota_glob }, }; int i; | > | 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 | { "sqlite3_quota_set", test_quota_set }, { "sqlite3_quota_file", test_quota_file }, { "sqlite3_quota_dump", test_quota_dump }, { "sqlite3_quota_fopen", test_quota_fopen }, { "sqlite3_quota_fread", test_quota_fread }, { "sqlite3_quota_fwrite", test_quota_fwrite }, { "sqlite3_quota_fclose", test_quota_fclose }, { "sqlite3_quota_fflush", test_quota_fflush }, { "sqlite3_quota_fseek", test_quota_fseek }, { "sqlite3_quota_rewind", test_quota_rewind }, { "sqlite3_quota_ftell", test_quota_ftell }, { "sqlite3_quota_remove", test_quota_remove }, { "sqlite3_quota_glob", test_quota_glob }, }; int i; |
︙ | ︙ |
Changes to src/test_quota.h.
︙ | ︙ | |||
97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | ** Calling this routine on a zPattern that does not exist and with a ** zero iLimit is a no-op. ** ** A quota group must exist with a non-zero iLimit prior to opening ** database connections if those connections are to participate in the ** quota group. Creating a quota group does not affect database connections ** that are already open. */ int sqlite3_quota_set( const char *zPattern, /* The filename pattern */ sqlite3_int64 iLimit, /* New quota to set for this quota group */ void (*xCallback)( /* Callback invoked when going over quota */ const char *zFilename, /* Name of file whose size increases */ sqlite3_int64 *piLimit, /* IN/OUT: The current limit */ sqlite3_int64 iSize, /* Total size of all files in the group */ void *pArg /* Client data */ ), void *pArg, /* client data passed thru to callback */ void (*xDestroy)(void*) /* Optional destructor for pArg */ ); /* | > > > > | > | > > > > > > > > > > > > | | > > > > > > > > | | > > > > | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 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 192 193 194 195 196 | ** Calling this routine on a zPattern that does not exist and with a ** zero iLimit is a no-op. ** ** A quota group must exist with a non-zero iLimit prior to opening ** database connections if those connections are to participate in the ** quota group. Creating a quota group does not affect database connections ** that are already open. ** ** The patterns that define the various quota groups should be distinct. ** If the same filename matches more than one quota group pattern, then ** the behavior of this package is undefined. */ int sqlite3_quota_set( const char *zPattern, /* The filename pattern */ sqlite3_int64 iLimit, /* New quota to set for this quota group */ void (*xCallback)( /* Callback invoked when going over quota */ const char *zFilename, /* Name of file whose size increases */ sqlite3_int64 *piLimit, /* IN/OUT: The current limit */ sqlite3_int64 iSize, /* Total size of all files in the group */ void *pArg /* Client data */ ), void *pArg, /* client data passed thru to callback */ void (*xDestroy)(void*) /* Optional destructor for pArg */ ); /* ** Bring the named file under quota management, assuming its name matches ** the glob pattern of some quota group. Or if it is already under ** management, update its size. If zFilename does not match the glob ** pattern of any quota group, this routine is a no-op. */ int sqlite3_quota_file(const char *zFilename); /* ** The following object serves the same role as FILE in the standard C ** library. It represents an open connection to a file on disk for I/O. ** ** A single quota_FILE should not be used by two or more threads at the ** same time. Multiple threads can be using different quota_FILE objects ** simultaneously, but not the same quota_FILE object. */ typedef struct quota_FILE quota_FILE; /* ** Create a new quota_FILE object used to read and/or write to the ** file zFilename. The zMode parameter is as with standard library zMode. */ quota_FILE *sqlite3_quota_fopen(const char *zFilename, const char *zMode); /* ** Perform I/O against a quota_FILE object. When doing writes, the ** quota mechanism may result in a short write, in order to prevent ** the sum of sizes of all files from going over quota. */ size_t sqlite3_quota_fread(void*, size_t, size_t, quota_FILE*); size_t sqlite3_quota_fwrite(void*, size_t, size_t, quota_FILE*); /* ** Flush all written content held in memory buffers out to disk. ** This is the equivalent of fflush() in the standard library - not ** an fsync(). */ int sqlite3_quota_fflush(quota_FILE*); /* ** Close a quota_FILE object and free all associated resources. The ** file remains under quota management. */ int sqlite3_quota_fclose(quota_FILE*); /* ** Move the read/write pointer for a quota_FILE object. Or tell the ** current location of the read/write pointer. */ int sqlite3_quota_fseek(quota_FILE*, long, int); void sqlite3_quota_rewind(quota_FILE*); long sqlite3_quota_ftell(quota_FILE*); /* ** Delete a file from the disk, if that file is under quota management. ** Adjust quotas accordingly. ** ** If zFilename is the name of a directory that matches one of the ** quota glob patterns, then all files under quota management that ** are contained within that directory are deleted. ** ** A standard SQLite result code is returned (SQLITE_OK, SQLITE_NOMEM, etc.) ** When deleting a directory of files, if the deletion of any one ** file fails (for example due to an I/O error), then this routine ** returns immediately, with the error code, and does not try to ** delete any of the other files in the specified directory. ** ** All files are removed from quota management and deleted from disk. ** However, no attempt is made to remove empty directories. ** ** This routine is a no-op for files that are not under quota management. */ int sqlite3_quota_remove(const char *zFilename); #endif /* _QUOTA_H_ */ |
Changes to test/quota2.test.
︙ | ︙ | |||
13 14 15 16 17 18 19 | set testdir [file dirname $argv0] source $testdir/tester.tcl source $testdir/malloc_common.tcl db close sqlite3_quota_initialize "" 1 | | > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | set testdir [file dirname $argv0] source $testdir/tester.tcl source $testdir/malloc_common.tcl db close sqlite3_quota_initialize "" 1 foreach dir {quota2a/x1 quota2a/x2 quota2a quota2b quota2c} { file delete -force $dir } foreach dir {quota2a quota2a/x1 quota2a/x2 quota2b quota2c} { file mkdir $dir } # The standard_path procedure converts a pathname into a standard format # that is the same across platforms. # unset -nocomplain ::quota_pwd ::quota_mapping |
︙ | ︙ | |||
105 106 107 108 109 110 111 | do_test quota2-1.10 { sqlite3_quota_rewind $::h1 sqlite3_quota_ftell $::h1 } {0} do_test quota2-1.11 { standard_path [sqlite3_quota_dump] } {{*/quota2b/* 5000 0} {*/quota2a/* 4000 4000 {PWD/quota2a/xyz.txt 4000 1 0}}} | | | | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | do_test quota2-1.10 { sqlite3_quota_rewind $::h1 sqlite3_quota_ftell $::h1 } {0} do_test quota2-1.11 { standard_path [sqlite3_quota_dump] } {{*/quota2b/* 5000 0} {*/quota2a/* 4000 4000 {PWD/quota2a/xyz.txt 4000 1 0}}} do_test quota2-1.12 { sqlite3_quota_fclose $::h1 standard_path [sqlite3_quota_dump] } {{*/quota2b/* 5000 0} {*/quota2a/* 4000 4000 {PWD/quota2a/xyz.txt 4000 0 0}}} do_test quota2-1.13 { sqlite3_quota_remove quota2a/xyz.txt standard_path [sqlite3_quota_dump] } {{*/quota2b/* 5000 0} {*/quota2a/* 4000 0}} set quota {} do_test quota2-2.1 { |
︙ | ︙ | |||
158 159 160 161 162 163 164 | do_test quota2-2.10 { sqlite3_quota_rewind $::h1 sqlite3_quota_ftell $::h1 } {0} do_test quota2-2.11 { standard_path [sqlite3_quota_dump] } {{*/quota2b/* 5000 0} {*/quota2a/* 4000 0}} | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 221 222 223 224 225 226 227 228 | do_test quota2-2.10 { sqlite3_quota_rewind $::h1 sqlite3_quota_ftell $::h1 } {0} do_test quota2-2.11 { standard_path [sqlite3_quota_dump] } {{*/quota2b/* 5000 0} {*/quota2a/* 4000 0}} do_test quota2-2.12 { sqlite3_quota_fclose $::h1 standard_path [sqlite3_quota_dump] } {{*/quota2b/* 5000 0} {*/quota2a/* 4000 0}} do_test quota2-3.1 { sqlite3_quota_set */quota2b/* 0 quota_check set ::h1 [sqlite3_quota_fopen quota2a/x1/a.txt a] sqlite3_quota_fwrite $::h1 10 10 $bigtext } {10} do_test quota2-3.2 { standard_path [sqlite3_quota_dump] } {{*/quota2a/* 4000 100 {PWD/quota2a/x1/a.txt 100 1 0}}} do_test quota2-3.3 { sqlite3_quota_fflush $::h1 standard_path [sqlite3_quota_dump] } {{*/quota2a/* 4000 100 {PWD/quota2a/x1/a.txt 100 1 0}}} do_test quota2-3.4 { sqlite3_quota_fclose $::h1 standard_path [sqlite3_quota_dump] } {{*/quota2a/* 4000 100 {PWD/quota2a/x1/a.txt 100 0 0}}} do_test quota2-3.5 { set ::h2 [sqlite3_quota_fopen quota2a/x2/b.txt a] sqlite3_quota_fwrite $::h2 10 20 $bigtext standard_path [sqlite3_quota_dump] } {{*/quota2a/* 4000 300 {PWD/quota2a/x2/b.txt 200 1 0} {PWD/quota2a/x1/a.txt 100 0 0}}} do_test quota2-3.6 { set ::h3 [sqlite3_quota_fopen quota2a/x1/c.txt a] sqlite3_quota_fwrite $::h3 10 50 $bigtext standard_path [sqlite3_quota_dump] } {{*/quota2a/* 4000 800 {PWD/quota2a/x1/c.txt 500 1 0} {PWD/quota2a/x2/b.txt 200 1 0} {PWD/quota2a/x1/a.txt 100 0 0}}} do_test quota2-3.7 { file exists quota2a/x1/a.txt } {1} do_test quota2-3.8 { file exists quota2a/x2/b.txt } {1} do_test quota2-3.9 { file exists quota2a/x1/c.txt } {1} do_test quota2-3.10 { sqlite3_quota_remove quota2a/x1 standard_path [sqlite3_quota_dump] } {{*/quota2a/* 4000 700 {PWD/quota2a/x1/c.txt 500 1 1} {PWD/quota2a/x2/b.txt 200 1 0}}} do_test quota2-3.11 { sqlite3_quota_fclose $::h2 sqlite3_quota_fclose $::h3 standard_path [sqlite3_quota_dump] } {{*/quota2a/* 4000 200 {PWD/quota2a/x2/b.txt 200 0 0}}} do_test quota2-3.12 { file exists quota2a/x1/a.txt } {0} do_test quota2-3.13 { file exists quota2a/x2/b.txt } {1} do_test quota2-3.14 { file exists quota2a/x1/c.txt } {0} catch { sqlite3_quota_shutdown } catch { unset quota_request_ok } finish_test |