Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add support for (variable length) integer keys in LSM1. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | lsm-vtab |
Files: | files | file ages | folders |
SHA1: |
32f3daec0a8084b258b2513c8025bc4d |
User & Date: | drh 2016-02-23 01:37:24.930 |
Context
2016-02-23
| ||
01:41 | Merge trunk enhancements. (check-in: fac4f4ecee user: drh tags: lsm-vtab) | |
01:37 | Add support for (variable length) integer keys in LSM1. (check-in: 32f3daec0a user: drh tags: lsm-vtab) | |
2016-02-22
| ||
13:01 | Merge up to trunk. (check-in: f9e5fb88a5 user: drh tags: lsm-vtab) | |
Changes
Changes to ext/lsm1/lsm_vtab.c.
︙ | ︙ | |||
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 | /* ** Type prefixes on LSM keys */ #define LSM1_TYPE_NEGATIVE 0 #define LSM1_TYPE_POSITIVE 1 #define LSM1_TYPE_TEXT 2 #define LSM1_TYPE_BLOB 3 /* ** Generate a key encoding for pValue such that all keys compare in ** lexicographical order. Return an SQLite error code or SQLITE_OK. ** ** The key encoding is *pnKey bytes in length written into *ppKey. ** Space to hold the key is taken from pSpace if sufficient, or else ** from sqlite3_malloc(). The caller is responsible for freeing malloced ** space. */ static int lsm1EncodeKey( sqlite3_value *pValue, /* Value to be encoded */ unsigned char **ppKey, /* Write the encoding here */ int *pnKey, /* Write the size of the encoding here */ unsigned char *pSpace, /* Use this space if it is large enough */ int nSpace /* Size of pSpace[] */ ){ int eType = sqlite3_value_type(pValue); *ppKey = 0; *pnKey = 0; switch( eType ){ default: { return SQLITE_ERROR; /* We cannot handle NULL keys */ } case SQLITE_BLOB: case SQLITE_TEXT: { int nVal = sqlite3_value_bytes(pValue); | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 | /* ** Type prefixes on LSM keys */ #define LSM1_TYPE_NEGATIVE 0 #define LSM1_TYPE_POSITIVE 1 #define LSM1_TYPE_TEXT 2 #define LSM1_TYPE_BLOB 3 /* ** Write a 32-bit unsigned integer as 4 big-endian bytes. */ static void varintWrite32(unsigned char *z, unsigned int y){ z[0] = (unsigned char)(y>>24); z[1] = (unsigned char)(y>>16); z[2] = (unsigned char)(y>>8); z[3] = (unsigned char)(y); } /* ** Write a varint into z[]. The buffer z[] must be at least 9 characters ** long to accommodate the largest possible varint. Return the number of ** bytes of z[] used. */ static int lsm1PutVarint64(unsigned char *z, sqlite3_uint64 x){ unsigned int w, y; if( x<=240 ){ z[0] = (unsigned char)x; return 1; } if( x<=2287 ){ y = (unsigned int)(x - 240); z[0] = (unsigned char)(y/256 + 241); z[1] = (unsigned char)(y%256); return 2; } if( x<=67823 ){ y = (unsigned int)(x - 2288); z[0] = 249; z[1] = (unsigned char)(y/256); z[2] = (unsigned char)(y%256); return 3; } y = (unsigned int)x; w = (unsigned int)(x>>32); if( w==0 ){ if( y<=16777215 ){ z[0] = 250; z[1] = (unsigned char)(y>>16); z[2] = (unsigned char)(y>>8); z[3] = (unsigned char)(y); return 4; } z[0] = 251; varintWrite32(z+1, y); return 5; } if( w<=255 ){ z[0] = 252; z[1] = (unsigned char)w; varintWrite32(z+2, y); return 6; } if( w<=65535 ){ z[0] = 253; z[1] = (unsigned char)(w>>8); z[2] = (unsigned char)w; varintWrite32(z+3, y); return 7; } if( w<=16777215 ){ z[0] = 254; z[1] = (unsigned char)(w>>16); z[2] = (unsigned char)(w>>8); z[3] = (unsigned char)w; varintWrite32(z+4, y); return 8; } z[0] = 255; varintWrite32(z+1, w); varintWrite32(z+5, y); return 9; } /* ** Decode the varint in the first n bytes z[]. Write the integer value ** into *pResult and return the number of bytes in the varint. ** ** If the decode fails because there are not enough bytes in z[] then ** return 0; */ static int lsm1GetVarint64( const unsigned char *z, int n, sqlite3_uint64 *pResult ){ unsigned int x; if( n<1 ) return 0; if( z[0]<=240 ){ *pResult = z[0]; return 1; } if( z[0]<=248 ){ if( n<2 ) return 0; *pResult = (z[0]-241)*256 + z[1] + 240; return 2; } if( n<z[0]-246 ) return 0; if( z[0]==249 ){ *pResult = 2288 + 256*z[1] + z[2]; return 3; } if( z[0]==250 ){ *pResult = (z[1]<<16) + (z[2]<<8) + z[3]; return 4; } x = (z[1]<<24) + (z[2]<<16) + (z[3]<<8) + z[4]; if( z[0]==251 ){ *pResult = x; return 5; } if( z[0]==252 ){ *pResult = (((sqlite3_uint64)x)<<8) + z[5]; return 6; } if( z[0]==253 ){ *pResult = (((sqlite3_uint64)x)<<16) + (z[5]<<8) + z[6]; return 7; } if( z[0]==254 ){ *pResult = (((sqlite3_uint64)x)<<24) + (z[5]<<16) + (z[6]<<8) + z[7]; return 8; } *pResult = (((sqlite3_uint64)x)<<32) + (0xffffffff & ((z[5]<<24) + (z[6]<<16) + (z[7]<<8) + z[8])); return 9; } /* ** Generate a key encoding for pValue such that all keys compare in ** lexicographical order. Return an SQLite error code or SQLITE_OK. ** ** The key encoding is *pnKey bytes in length written into *ppKey. ** Space to hold the key is taken from pSpace if sufficient, or else ** from sqlite3_malloc(). The caller is responsible for freeing malloced ** space. */ static int lsm1EncodeKey( sqlite3_value *pValue, /* Value to be encoded */ unsigned char **ppKey, /* Write the encoding here */ int *pnKey, /* Write the size of the encoding here */ unsigned char *pSpace, /* Use this space if it is large enough */ int nSpace /* Size of pSpace[] */ ){ int eType = sqlite3_value_type(pValue); *ppKey = 0; *pnKey = 0; assert( nSpace>=32 ); switch( eType ){ default: { return SQLITE_ERROR; /* We cannot handle NULL keys */ } case SQLITE_BLOB: case SQLITE_TEXT: { int nVal = sqlite3_value_bytes(pValue); |
︙ | ︙ | |||
240 241 242 243 244 245 246 247 248 249 250 251 252 253 | } pSpace[0] = eType; memcpy(&pSpace[1], pVal, nVal); *ppKey = pSpace; *pnKey = nVal+1; break; } } return SQLITE_OK; } /* ** Return values of columns for the row at which the lsm1_cursor ** is currently pointing. | > > > > > > > > > > > > > > > | 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 | } pSpace[0] = eType; memcpy(&pSpace[1], pVal, nVal); *ppKey = pSpace; *pnKey = nVal+1; break; } case SQLITE_INTEGER: { sqlite3_int64 iVal = sqlite3_value_int64(pValue); sqlite3_uint64 uVal; if( iVal<0 ){ if( iVal==0xffffffffffffffffLL ) return SQLITE_ERROR; uVal = -iVal; eType = LSM1_TYPE_NEGATIVE; }else{ uVal = iVal; eType = LSM1_TYPE_POSITIVE; } pSpace[0] = eType; *ppKey = pSpace; *pnKey = 1 + lsm1PutVarint64(&pSpace[1], uVal); } } return SQLITE_OK; } /* ** Return values of columns for the row at which the lsm1_cursor ** is currently pointing. |
︙ | ︙ | |||
275 276 277 278 279 280 281 | ){ if( pVal[0]==LSM1_TYPE_BLOB ){ sqlite3_result_blob(ctx, (const void*)&pVal[1],nVal-1, SQLITE_TRANSIENT); }else if( pVal[0]==LSM1_TYPE_TEXT ){ sqlite3_result_text(ctx, (const char*)&pVal[1],nVal-1, SQLITE_TRANSIENT); | > > > > > > > > > | > | 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 | ){ if( pVal[0]==LSM1_TYPE_BLOB ){ sqlite3_result_blob(ctx, (const void*)&pVal[1],nVal-1, SQLITE_TRANSIENT); }else if( pVal[0]==LSM1_TYPE_TEXT ){ sqlite3_result_text(ctx, (const char*)&pVal[1],nVal-1, SQLITE_TRANSIENT); }else if( nVal>=2 && nVal<=9 && (pVal[0]==LSM1_TYPE_POSITIVE || pVal[0]==LSM1_TYPE_NEGATIVE) ){ sqlite3_uint64 uVal = 0; lsm1GetVarint64(pVal+1, nVal-1, &uVal); if( pVal[0]==LSM1_TYPE_NEGATIVE ){ sqlite3_result_int64(ctx, -(sqlite3_int64)uVal); }else{ sqlite3_result_int64(ctx, (sqlite3_int64)uVal); } } } break; } case LSM1_COLUMN_BLOBVALUE: { const void *pVal; int nVal; if( lsm_csr_value(pCur->pLsmCur, (const void**)&pVal, &nVal)==LSM_OK ){ |
︙ | ︙ |