mirror of
https://github.com/sqlite/sqlite.git
synced 2025-11-12 13:01:09 +03:00
Use N separate cursors when scanning an index with N columns to collect sqlite_stat4 data. This fixes a problem with collecting incorrect nEq values from multi-column indexes.
FossilOrigin-Name: 3a71afe67418ce00097cd9714c395fe9ff16f23b
This commit is contained in:
@@ -18,6 +18,9 @@
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "sqliteInt.h"
|
||||
#include "vdbeInt.h"
|
||||
|
||||
|
||||
/*
|
||||
** Allocate nByte bytes of space using sqlite3_malloc(). If the
|
||||
@@ -458,6 +461,99 @@ static void real2hex(
|
||||
sqlite3_result_text(context, zOut, -1, SQLITE_TRANSIENT);
|
||||
}
|
||||
|
||||
/*
|
||||
** tclcmd: test_decode(record)
|
||||
**
|
||||
** This function implements an SQL user-function that accepts a blob
|
||||
** containing a formatted database record as its only argument. It returns
|
||||
** a tcl list (type SQLITE_TEXT) containing each of the values stored
|
||||
** in the record.
|
||||
*/
|
||||
static void test_decode(
|
||||
sqlite3_context *context,
|
||||
int argc,
|
||||
sqlite3_value **argv
|
||||
){
|
||||
sqlite3 *db = sqlite3_context_db_handle(context);
|
||||
u8 *pRec;
|
||||
u8 *pEndHdr; /* Points to one byte past record header */
|
||||
u8 *pHdr; /* Current point in record header */
|
||||
u8 *pBody; /* Current point in record data */
|
||||
u64 nHdr; /* Bytes in record header */
|
||||
Tcl_Obj *pRet; /* Return value */
|
||||
|
||||
pRet = Tcl_NewObj();
|
||||
Tcl_IncrRefCount(pRet);
|
||||
|
||||
assert( argc==1 );
|
||||
pRec = (u8*)sqlite3_value_blob(argv[0]);
|
||||
|
||||
pHdr = pRec + sqlite3GetVarint(pRec, &nHdr);
|
||||
pBody = pEndHdr = &pRec[nHdr];
|
||||
while( pHdr<pEndHdr ){
|
||||
Tcl_Obj *pVal = 0;
|
||||
u64 iSerialType;
|
||||
Mem mem;
|
||||
|
||||
memset(&mem, 0, sizeof(mem));
|
||||
mem.db = db;
|
||||
mem.enc = SQLITE_UTF8;
|
||||
pHdr += sqlite3GetVarint(pHdr, &iSerialType);
|
||||
pBody += sqlite3VdbeSerialGet(pBody, (u32)iSerialType, &mem);
|
||||
|
||||
sqlite3VdbeMemStoreType(&mem);
|
||||
switch( sqlite3_value_type(&mem) ){
|
||||
case SQLITE_TEXT:
|
||||
pVal = Tcl_NewStringObj((const char*)sqlite3_value_text(&mem), -1);
|
||||
break;
|
||||
|
||||
case SQLITE_BLOB: {
|
||||
char hexdigit[] = {
|
||||
'0', '1', '2', '3', '4', '5', '6', '7',
|
||||
'8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
|
||||
};
|
||||
int n = sqlite3_value_bytes(&mem);
|
||||
u8 *z = (u8*)sqlite3_value_blob(&mem);
|
||||
int i;
|
||||
pVal = Tcl_NewStringObj("x'", -1);
|
||||
for(i=0; i<n; i++){
|
||||
char hex[3];
|
||||
hex[0] = hexdigit[((z[i] >> 4) & 0x0F)];
|
||||
hex[1] = hexdigit[(z[i] & 0x0F)];
|
||||
hex[2] = '\0';
|
||||
Tcl_AppendStringsToObj(pVal, hex, 0);
|
||||
}
|
||||
Tcl_AppendStringsToObj(pVal, "'", 0);
|
||||
break;
|
||||
}
|
||||
|
||||
case SQLITE_FLOAT:
|
||||
pVal = Tcl_NewDoubleObj(sqlite3_value_double(&mem));
|
||||
break;
|
||||
|
||||
case SQLITE_INTEGER:
|
||||
pVal = Tcl_NewWideIntObj(sqlite3_value_int64(&mem));
|
||||
break;
|
||||
|
||||
case SQLITE_NULL:
|
||||
pVal = Tcl_NewStringObj("NULL", -1);
|
||||
break;
|
||||
|
||||
default:
|
||||
assert( 0 );
|
||||
}
|
||||
|
||||
Tcl_ListObjAppendElement(0, pRet, pVal);
|
||||
|
||||
if( mem.zMalloc ){
|
||||
sqlite3DbFree(db, mem.zMalloc);
|
||||
}
|
||||
}
|
||||
|
||||
sqlite3_result_text(context, Tcl_GetString(pRet), -1, SQLITE_TRANSIENT);
|
||||
Tcl_DecrRefCount(pRet);
|
||||
}
|
||||
|
||||
|
||||
static int registerTestFunctions(sqlite3 *db){
|
||||
static const struct {
|
||||
@@ -482,6 +578,7 @@ static int registerTestFunctions(sqlite3 *db){
|
||||
{ "test_isolation", 2, SQLITE_UTF8, test_isolation},
|
||||
{ "test_counter", 1, SQLITE_UTF8, counterFunc},
|
||||
{ "real2hex", 1, SQLITE_UTF8, real2hex},
|
||||
{ "test_decode", 1, SQLITE_UTF8, test_decode},
|
||||
};
|
||||
int i;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user