diff options
author | drh <drh@noemail.net> | 2011-11-16 16:23:15 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2011-11-16 16:23:15 +0000 |
commit | 8f10acdb5bb3ebf64cdf7a57d1d25b167fe4c87e (patch) | |
tree | 15c465ab10df9911524b550ce22cb81141267694 /src | |
parent | 6f13323118bde3c7180466da6bb5963121901360 (diff) | |
download | sqlite-8f10acdb5bb3ebf64cdf7a57d1d25b167fe4c87e.tar.gz sqlite-8f10acdb5bb3ebf64cdf7a57d1d25b167fe4c87e.zip |
Remove code made obsolete by the changes to index processing that allow
range search on the rowid.
FossilOrigin-Name: a5418c7fc216a30abf7b2fa8c579aee586393a91
Diffstat (limited to 'src')
-rw-r--r-- | src/sqliteInt.h | 1 | ||||
-rw-r--r-- | src/vdbeaux.c | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 2171c1574..b4b212889 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1453,7 +1453,6 @@ struct UnpackedRecord { */ #define UNPACKED_NEED_FREE 0x0001 /* Memory is from sqlite3Malloc() */ #define UNPACKED_NEED_DESTROY 0x0002 /* apMem[]s should all be destroyed */ -#define UNPACKED_IGNORE_ROWID 0x0004 /* Ignore trailing rowid on key1 */ #define UNPACKED_INCRKEY 0x0008 /* Make this key an epsilon larger */ #define UNPACKED_PREFIX_MATCH 0x0010 /* A prefix match is considered OK */ #define UNPACKED_PREFIX_SEARCH 0x0020 /* A prefix match is considered OK */ diff --git a/src/vdbeaux.c b/src/vdbeaux.c index 983ac2cde..7c69d28cf 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -2943,15 +2943,6 @@ void sqlite3VdbeRecordUnpack( ** Or if the UNPACKED_MATCH_PREFIX flag is set and the prefixes are ** equal, then the keys are considered to be equal and ** the parts beyond the common prefix are ignored. -** -** If the UNPACKED_IGNORE_ROWID flag is set, then the last byte of -** the header of pKey1 is ignored. It is assumed that pKey1 is -** an index key, and thus ends with a rowid value. The last byte -** of the header will therefore be the serial type of the rowid: -** one of 1, 2, 3, 4, 5, 6, 8, or 9 - the integer serial types. -** The serial type of the final rowid will always be a single byte. -** By ignoring this last byte of the header, we force the comparison -** to ignore the rowid at the end of key1. */ int sqlite3VdbeRecordCompare( int nKey1, const void *pKey1, /* Left key */ @@ -2984,9 +2975,6 @@ int sqlite3VdbeRecordCompare( idx1 = getVarint32(aKey1, szHdr1); d1 = szHdr1; - if( pPKey2->flags & UNPACKED_IGNORE_ROWID ){ - szHdr1--; - } nField = pKeyInfo->nField; while( idx1<szHdr1 && i<pPKey2->nField ){ u32 serial_type1; |