Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Commit vdbeaux.c, which should of gone in with the previous commit. (CVS 1369) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
5378a6404058f5e9d3e91269ab27afef |
User & Date: | danielk1977 2004-05-13 05:20:26.000 |
Context
2004-05-13
| ||
11:34 | Various minor fixes and updates to make more test cases pass. (CVS 1370) (check-in: dbe8385ecf user: danielk1977 tags: trunk) | |
05:20 | Commit vdbeaux.c, which should of gone in with the previous commit. (CVS 1369) (check-in: 5378a64040 user: danielk1977 tags: trunk) | |
05:16 | Manifest types in indices. At the moment indices use manifest typing, but some other parts of the SQL engine do not, which can lead to some strange results. (CVS 1368) (check-in: 9f2b6d9d3a user: danielk1977 tags: trunk) | |
Changes
Changes to src/vdbeaux.c.
︙ | ︙ | |||
1126 1127 1128 1129 1130 1131 1132 | ** the end. Hence these functions allow the caller to handle the ** serial-type and data blob seperately. ** ** The following table describes the various storage classes for data: ** ** serial type bytes of data type ** -------------- --------------- --------------- | | > | | | 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 | ** the end. Hence these functions allow the caller to handle the ** serial-type and data blob seperately. ** ** The following table describes the various storage classes for data: ** ** serial type bytes of data type ** -------------- --------------- --------------- ** 0 - Not a type. ** 1 1 signed integer ** 2 2 signed integer ** 3 4 signed integer ** 4 8 signed integer ** 5 8 IEEE float ** 6 0 NULL ** 7..11 reserved for expansion ** N>=12 and even (N-12)/2 BLOB ** N>=13 and odd (N-13)/2 text ** */ /* ** Return the serial-type for the value stored in pMem. */ u64 sqlite3VdbeSerialType(const Mem *pMem){ int flags = pMem->flags; if( flags&MEM_Null ){ return 6; } if( flags&MEM_Int ){ /* Figure out whether to use 1, 2, 4 or 8 bytes. */ i64 i = pMem->i; if( i>=-127 && i<=127 ) return 1; if( i>=-32767 && i<=32767 ) return 2; if( i>=-2147483647 && i<=2147483647 ) return 3; |
︙ | ︙ | |||
1171 1172 1173 1174 1175 1176 1177 1178 | return 0; } /* ** Return the length of the data corresponding to the supplied serial-type. */ int sqlite3VdbeSerialTypeLen(u64 serial_type){ switch(serial_type){ | > | | > > | | 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 | return 0; } /* ** Return the length of the data corresponding to the supplied serial-type. */ int sqlite3VdbeSerialTypeLen(u64 serial_type){ assert( serial_type!=0 ); switch(serial_type){ case 6: return 0; /* NULL */ case 1: return 1; /* 1 byte integer */ case 2: return 2; /* 2 byte integer */ case 3: return 4; /* 4 byte integer */ case 4: return 8; /* 8 byte integer */ case 5: return 8; /* 8 byte float */ } assert( serial_type>=12 ); return ((serial_type-12)>>1); /* text or blob */ } /* ** Write the serialized data blob for the value stored in pMem into ** buf. It is assumed that the caller has allocated sufficient space. ** Return the number of bytes written. */ int sqlite3VdbeSerialPut(unsigned char *buf, const Mem *pMem){ u64 serial_type = sqlite3VdbeSerialType(pMem); int len; assert( serial_type!=0 ); /* NULL */ if( serial_type==6 ){ return 0; } /* Integer */ if( serial_type<5 ){ i64 i = pMem->i; len = sqlite3VdbeSerialTypeLen(serial_type); |
︙ | ︙ | |||
1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 | /* ** Deserialize the data blob pointed to by buf as serial type serial_type ** and store the result in pMem. Return the number of bytes read. */ int sqlite3VdbeSerialGet(const unsigned char *buf, u64 serial_type, Mem *pMem){ int len; /* memset(pMem, 0, sizeof(pMem)); */ pMem->flags = 0; pMem->z = 0; /* NULL */ | > > | | 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 | /* ** Deserialize the data blob pointed to by buf as serial type serial_type ** and store the result in pMem. Return the number of bytes read. */ int sqlite3VdbeSerialGet(const unsigned char *buf, u64 serial_type, Mem *pMem){ int len; assert( serial_type!=0 ); /* memset(pMem, 0, sizeof(pMem)); */ pMem->flags = 0; pMem->z = 0; /* NULL */ if( serial_type==6 ){ pMem->flags = MEM_Null; return 0; } /* Integer */ if( serial_type<5 ){ i64 i = 0; |
︙ | ︙ | |||
1368 1369 1370 1371 1372 1373 1374 | /* ** The following is the comparison function for (non-integer) ** keys in the btrees. This function returns negative, zero, or ** positive if the first key is less than, equal to, or greater than ** the second. ** ** This function assumes that each key consists of one or more type/blob | | | | > > | | | > > | > > > > > > > > > > > > > > > > > > > | 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 | /* ** The following is the comparison function for (non-integer) ** keys in the btrees. This function returns negative, zero, or ** positive if the first key is less than, equal to, or greater than ** the second. ** ** This function assumes that each key consists of one or more type/blob ** pairs, encoded using the sqlite3VdbeSerialXXX() functions above. ** ** Following the type/blob pairs, each key may have a single 0x00 byte ** followed by a varint. A key may only have this traling 0x00/varint ** pair if it has at least as many type/blob pairs as the key it is being ** compared to. */ int sqlite3VdbeKeyCompare( void *userData, /* not used yet */ int nKey1, const void *pKey1, int nKey2, const void *pKey2 ){ int offset1 = 0; int offset2 = 0; const unsigned char *aKey1 = (const unsigned char *)pKey1; const unsigned char *aKey2 = (const unsigned char *)pKey2; while( offset1<nKey1 && offset2<nKey2 ){ Mem mem1; Mem mem2; u64 serial_type1; u64 serial_type2; int rc; /* Read the serial types for the next element in each key. */ offset1 += sqlite3GetVarint(&aKey1[offset1], &serial_type1); offset2 += sqlite3GetVarint(&aKey2[offset2], &serial_type2); /* If either of the varints just read in are 0 (not a type), then ** this is the end of the keys. The remaining data in each key is ** the varint rowid. Compare these as signed integers and return ** the result. */ if( !serial_type1 || !serial_type2 ){ assert( !serial_type1 && !serial_type2 ); sqlite3GetVarint(&aKey1[offset1], &serial_type1); sqlite3GetVarint(&aKey2[offset2], &serial_type2); return ( (i64)serial_type1 - (i64)serial_type2 ); } /* Assert that there is enough space left in each key for the blob of ** data to go with the serial type just read. This assert may fail if ** the file is corrupted. Then read the value from each key into mem1 ** and mem2 respectively. */ offset1 += sqlite3VdbeSerialGet(&aKey1[offset1], serial_type1, &mem1); offset2 += sqlite3VdbeSerialGet(&aKey2[offset2], serial_type2, &mem2); rc = compareMemCells(&mem1, &mem2); if( mem1.flags&MEM_Dyn ){ sqliteFree(mem1.z); } |
︙ | ︙ | |||
1413 1414 1415 1416 1417 1418 1419 | return 1; } if( offset2<nKey2 ){ return -1; } return 0; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 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 | return 1; } if( offset2<nKey2 ){ return -1; } return 0; } /* ** pCur points at an index entry. Read the rowid (varint occuring at ** the end of the entry and store it in *rowid. Return SQLITE_OK if ** everything works, or an error code otherwise. */ int sqlite3VdbeIdxRowid(BtCursor *pCur, i64 *rowid){ i64 sz; int rc; char buf[9]; int len; u64 r; rc = sqlite3BtreeKeySize(pCur, &sz); if( rc!=SQLITE_OK ){ return rc; } len = ((sz>9)?9:sz); assert( len>=2 ); rc = sqlite3BtreeKey(pCur, sz-len, len, buf); if( rc!=SQLITE_OK ){ return rc; } len = len - 2; while( buf[len] && --len ); sqlite3GetVarint(buf, &r); *rowid = r; return SQLITE_OK; } int sqlite3VdbeIdxKeyCompare( BtCursor *pCur, int nKey, const unsigned char *pKey, int ignorerowid, int *res ){ unsigned char *pCellKey; u64 nCellKey; int freeCellKey = 0; int rc; int len; sqlite3BtreeKeySize(pCur, &nCellKey); if( nCellKey<=0 ){ *res = 0; return SQLITE_OK; } pCellKey = (unsigned char *)sqlite3BtreeKeyFetch(pCur, nCellKey); if( !pCellKey ){ pCellKey = (unsigned char *)sqliteMalloc(nCellKey); if( !pCellKey ){ return SQLITE_NOMEM; } freeCellKey = 1; rc = sqlite3BtreeKey(pCur, 0, nCellKey, pCellKey); if( rc!=SQLITE_OK ){ sqliteFree(pCellKey); return rc; } } len = nCellKey-2; while( pCellKey[len] && --len ); if( ignorerowid ){ nKey--; while( pKey[nKey] && --nKey ); } *res = sqlite3VdbeKeyCompare(0, len, pCellKey, nKey, pKey); if( freeCellKey ){ sqliteFree(pCellKey); } return SQLITE_OK; } |