Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Enhancements to sqlite_memstat: (1) Add an extra "schema" column to show the schema name for ZIPVFS stats. (2) Only show ZIPVFS stats to schema that use ZIPVFS (3) Put a NULL in unused columns of the output. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | memstat-vtab |
Files: | files | file ages | folders |
SHA3-256: |
9351135b4331107be2f2bda7b6adbd54 |
User & Date: | drh 2018-09-27 16:57:42.381 |
Context
2018-09-27
| ||
17:03 | Add the sqlite_memstat extension - an eponymous virtual table that shows memory usages statistics for SQLite. (check-in: 954ef61f6a user: drh tags: trunk) | |
16:57 | Enhancements to sqlite_memstat: (1) Add an extra "schema" column to show the schema name for ZIPVFS stats. (2) Only show ZIPVFS stats to schema that use ZIPVFS (3) Put a NULL in unused columns of the output. (Closed-Leaf check-in: 9351135b43 user: drh tags: memstat-vtab) | |
15:45 | Add initial ZIPVFS support for the "main" database to the sqlite_memstat virtual table. (check-in: 9cd27350b0 user: drh tags: memstat-vtab) | |
Changes
Changes to ext/misc/memstat.c.
︙ | ︙ | |||
16 17 18 19 20 21 22 | ** Usage example: ** ** .load ./memstat ** .mode quote ** .header on ** SELECT * FROM memstat; */ | | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | ** Usage example: ** ** .load ./memstat ** .mode quote ** .header on ** SELECT * FROM memstat; */ #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_MEMSTATVTAB) #if !defined(SQLITEINT_H) #include "sqlite3ext.h" #endif SQLITE_EXTENSION_INIT1 #include <assert.h> #include <string.h> |
︙ | ︙ | |||
43 44 45 46 47 48 49 | ** serve as the underlying representation of a cursor that scans ** over rows of the result */ typedef struct memstat_cursor memstat_cursor; struct memstat_cursor { sqlite3_vtab_cursor base; /* Base class - must be first */ sqlite3 *db; /* Database connection for this cursor */ | | > | > | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | ** serve as the underlying representation of a cursor that scans ** over rows of the result */ typedef struct memstat_cursor memstat_cursor; struct memstat_cursor { sqlite3_vtab_cursor base; /* Base class - must be first */ sqlite3 *db; /* Database connection for this cursor */ int iRowid; /* Current row in aMemstatColumn[] */ int iDb; /* Which schema we are looking at */ int nDb; /* Number of schemas */ char **azDb; /* Names of all schemas */ sqlite3_int64 aVal[2]; /* Result values */ }; /* ** The memstatConnect() method is invoked to create a new ** memstat_vtab that describes the memstat virtual table. ** ** Think of this routine as the constructor for memstat_vtab objects. |
︙ | ︙ | |||
73 74 75 76 77 78 79 | char **pzErr ){ memstat_vtab *pNew; int rc; /* Column numbers */ #define MSV_COLUMN_NAME 0 /* Name of quantity being measured */ | | > | | | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | char **pzErr ){ memstat_vtab *pNew; int rc; /* Column numbers */ #define MSV_COLUMN_NAME 0 /* Name of quantity being measured */ #define MSV_COLUMN_SCHEMA 1 /* schema name */ #define MSV_COLUMN_VALUE 2 /* Current value */ #define MSV_COLUMN_HIWTR 3 /* Highwater mark */ rc = sqlite3_declare_vtab(db,"CREATE TABLE x(name,schema,value,hiwtr)"); if( rc==SQLITE_OK ){ pNew = sqlite3_malloc( sizeof(*pNew) ); *ppVtab = (sqlite3_vtab*)pNew; if( pNew==0 ) return SQLITE_NOMEM; memset(pNew, 0, sizeof(*pNew)); pNew->db = db; } |
︙ | ︙ | |||
107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 | pCur = sqlite3_malloc( sizeof(*pCur) ); if( pCur==0 ) return SQLITE_NOMEM; memset(pCur, 0, sizeof(*pCur)); pCur->db = ((memstat_vtab*)p)->db; *ppCursor = &pCur->base; return SQLITE_OK; } /* ** Destructor for a memstat_cursor. */ static int memstatClose(sqlite3_vtab_cursor *cur){ sqlite3_free(cur); return SQLITE_OK; } /* ** Allowed values for aMemstatColumn[].eType */ #define MSV_GSTAT 0 /* sqlite3_status64() information */ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > | | | | | | | | < < < | | | > > > > | | | < | | | | | | | | > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < | | | | | < | < < | | < | | > > > | | 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 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 229 230 231 232 233 234 235 236 237 238 239 240 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 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 | pCur = sqlite3_malloc( sizeof(*pCur) ); if( pCur==0 ) return SQLITE_NOMEM; memset(pCur, 0, sizeof(*pCur)); pCur->db = ((memstat_vtab*)p)->db; *ppCursor = &pCur->base; return SQLITE_OK; } /* ** Clear all the schema names from a cursor */ static void memstatClearSchema(memstat_cursor *pCur){ int i; if( pCur->azDb==0 ) return; for(i=0; i<pCur->nDb; i++){ sqlite3_free(pCur->azDb[i]); } sqlite3_free(pCur->azDb); pCur->azDb = 0; pCur->nDb = 0; } /* ** Fill in the azDb[] array for the cursor. */ static int memstatFindSchemas(memstat_cursor *pCur){ sqlite3_stmt *pStmt = 0; int rc; if( pCur->nDb ) return SQLITE_OK; rc = sqlite3_prepare_v2(pCur->db, "PRAGMA database_list", -1, &pStmt, 0); if( rc ){ sqlite3_finalize(pStmt); return rc; } while( sqlite3_step(pStmt)==SQLITE_ROW ){ char **az, *z; az = sqlite3_realloc(pCur->azDb, sizeof(char*)*(pCur->nDb+1)); if( az==0 ){ memstatClearSchema(pCur); return SQLITE_NOMEM; } pCur->azDb = az; z = sqlite3_mprintf("%s", sqlite3_column_text(pStmt, 1)); if( z==0 ){ memstatClearSchema(pCur); return SQLITE_NOMEM; } pCur->azDb[pCur->nDb] = z; pCur->nDb++; } sqlite3_finalize(pStmt); return SQLITE_OK; } /* ** Destructor for a memstat_cursor. */ static int memstatClose(sqlite3_vtab_cursor *cur){ memstat_cursor *pCur = (memstat_cursor*)cur; memstatClearSchema(pCur); sqlite3_free(cur); return SQLITE_OK; } /* ** Allowed values for aMemstatColumn[].eType */ #define MSV_GSTAT 0 /* sqlite3_status64() information */ #define MSV_DB 1 /* sqlite3_db_status() information */ #define MSV_ZIPVFS 2 /* ZIPVFS file-control with 64-bit return */ /* ** An array of quantities that can be measured and reported by ** this virtual table */ static const struct MemstatColumns { const char *zName; /* Symbolic name */ unsigned char eType; /* Type of interface */ unsigned char mNull; /* Bitmask of which columns are NULL */ /* 2: dbname, 4: current, 8: hiwtr */ int eOp; /* Opcode */ } aMemstatColumn[] = { {"MEMORY_USED", MSV_GSTAT, 2, SQLITE_STATUS_MEMORY_USED }, {"MALLOC_SIZE", MSV_GSTAT, 6, SQLITE_STATUS_MALLOC_SIZE }, {"MALLOC_COUNT", MSV_GSTAT, 2, SQLITE_STATUS_MALLOC_COUNT }, {"PAGECACHE_USED", MSV_GSTAT, 2, SQLITE_STATUS_PAGECACHE_USED }, {"PAGECACHE_OVERFLOW", MSV_GSTAT, 2, SQLITE_STATUS_PAGECACHE_OVERFLOW }, {"PAGECACHE_SIZE", MSV_GSTAT, 6, SQLITE_STATUS_PAGECACHE_SIZE }, {"PARSER_STACK", MSV_GSTAT, 6, SQLITE_STATUS_PARSER_STACK }, {"DB_LOOKASIDE_USED", MSV_DB, 2, SQLITE_DBSTATUS_LOOKASIDE_USED }, {"DB_LOOKASIDE_HIT", MSV_DB, 6, SQLITE_DBSTATUS_LOOKASIDE_HIT }, {"DB_LOOKASIDE_MISS_SIZE", MSV_DB, 6, SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE}, {"DB_LOOKASIDE_MISS_FULL", MSV_DB, 6, SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL}, {"DB_CACHE_USED", MSV_DB, 10, SQLITE_DBSTATUS_CACHE_USED }, {"DB_CACHE_USED_SHARED", MSV_DB, 10, SQLITE_DBSTATUS_CACHE_USED_SHARED }, {"DB_SCHEMA_USED", MSV_DB, 10, SQLITE_DBSTATUS_SCHEMA_USED }, {"DB_STMT_USED", MSV_DB, 10, SQLITE_DBSTATUS_STMT_USED }, {"DB_CACHE_HIT", MSV_DB, 10, SQLITE_DBSTATUS_CACHE_HIT }, {"DB_CACHE_MISS", MSV_DB, 10, SQLITE_DBSTATUS_CACHE_MISS }, {"DB_CACHE_WRITE", MSV_DB, 10, SQLITE_DBSTATUS_CACHE_WRITE }, {"DB_CACHE_SPILL", MSV_DB, 10, SQLITE_DBSTATUS_CACHE_SPILL }, {"DB_DEFERRED_FKS", MSV_DB, 10, SQLITE_DBSTATUS_DEFERRED_FKS }, #ifdef SQLITE_ENABLE_ZIPVFS {"ZIPVFS_CACHE_USED", MSV_ZIPVFS, 8, 231454 }, {"ZIPVFS_CACHE_HIT", MSV_ZIPVFS, 8, 231455 }, {"ZIPVFS_CACHE_MISS", MSV_ZIPVFS, 8, 231456 }, {"ZIPVFS_CACHE_WRITE", MSV_ZIPVFS, 8, 231457 }, {"ZIPVFS_DIRECT_READ", MSV_ZIPVFS, 8, 231458 }, {"ZIPVFS_DIRECT_BYTES", MSV_ZIPVFS, 8, 231459 }, #endif /* SQLITE_ENABLE_ZIPVFS */ }; #define MSV_NROW (sizeof(aMemstatColumn)/sizeof(aMemstatColumn[0])) /* ** Advance a memstat_cursor to its next row of output. */ static int memstatNext(sqlite3_vtab_cursor *cur){ memstat_cursor *pCur = (memstat_cursor*)cur; int i; assert( pCur->iRowid<=MSV_NROW ); while(1){ i = (int)pCur->iRowid - 1; if( (aMemstatColumn[i].mNull & 2)!=0 || (++pCur->iDb)>=pCur->nDb ){ pCur->iRowid++; if( pCur->iRowid>MSV_NROW ) return SQLITE_OK; /* End of the table */ pCur->iDb = 0; i++; } pCur->aVal[0] = 0; pCur->aVal[1] = 0; switch( aMemstatColumn[i].eType ){ case MSV_GSTAT: { sqlite3_status64(aMemstatColumn[i].eOp, &pCur->aVal[0], &pCur->aVal[1],0); break; } case MSV_DB: { int xCur, xHiwtr; sqlite3_db_status(pCur->db, aMemstatColumn[i].eOp, &xCur, &xHiwtr, 0); pCur->aVal[0] = xCur; pCur->aVal[1] = xHiwtr; break; } case MSV_ZIPVFS: { int rc; rc = sqlite3_file_control(pCur->db, pCur->azDb[pCur->iDb], aMemstatColumn[i].eOp, (void*)&pCur->aVal[0]); if( rc!=SQLITE_OK ) continue; break; } } break; } return SQLITE_OK; } /* ** Return values of columns for the row at which the memstat_cursor ** is currently pointing. */ static int memstatColumn( sqlite3_vtab_cursor *cur, /* The cursor */ sqlite3_context *ctx, /* First argument to sqlite3_result_...() */ int iCol /* Which column to return */ ){ memstat_cursor *pCur = (memstat_cursor*)cur; int i; assert( pCur->iRowid>0 && pCur->iRowid<=MSV_NROW ); i = (int)pCur->iRowid - 1; if( (aMemstatColumn[i].mNull & (1<<iCol))!=0 ){ return SQLITE_OK; } switch( iCol ){ case MSV_COLUMN_NAME: { sqlite3_result_text(ctx, aMemstatColumn[i].zName, -1, SQLITE_STATIC); break; } case MSV_COLUMN_SCHEMA: { sqlite3_result_text(ctx, pCur->azDb[pCur->iDb], -1, 0); break; } case MSV_COLUMN_VALUE: { sqlite3_result_int64(ctx, pCur->aVal[0]); break; } case MSV_COLUMN_HIWTR: { sqlite3_result_int64(ctx, pCur->aVal[1]); break; } } return SQLITE_OK; } /* ** Return the rowid for the current row. In this implementation, the ** rowid is the same as the output value. */ static int memstatRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){ memstat_cursor *pCur = (memstat_cursor*)cur; *pRowid = pCur->iRowid*1000 + pCur->iDb; return SQLITE_OK; } /* ** Return TRUE if the cursor has been moved off of the last ** row of output. */ |
︙ | ︙ | |||
246 247 248 249 250 251 252 | */ static int memstatFilter( sqlite3_vtab_cursor *pVtabCursor, int idxNum, const char *idxStr, int argc, sqlite3_value **argv ){ memstat_cursor *pCur = (memstat_cursor *)pVtabCursor; | | > | | 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 | */ static int memstatFilter( sqlite3_vtab_cursor *pVtabCursor, int idxNum, const char *idxStr, int argc, sqlite3_value **argv ){ memstat_cursor *pCur = (memstat_cursor *)pVtabCursor; pCur->iRowid = 1; pCur->iDb = 0; return memstatFindSchemas(pCur); } /* ** SQLite will invoke this method one or more times while planning a query ** that uses the memstat virtual table. This routine needs to create ** a query plan for each invocation and compute an estimated cost for that ** plan. |
︙ | ︙ | |||
322 323 324 325 326 327 328 | SQLITE_EXTENSION_INIT2(pApi); #ifndef SQLITE_OMIT_VIRTUALTABLE rc = sqlite3MemstatVtabInit(db); #endif return rc; } #endif /* SQLITE_CORE */ | | | 407 408 409 410 411 412 413 414 | SQLITE_EXTENSION_INIT2(pApi); #ifndef SQLITE_OMIT_VIRTUALTABLE rc = sqlite3MemstatVtabInit(db); #endif return rc; } #endif /* SQLITE_CORE */ #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_MEMSTATVTAB) */ |