Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch sqlite4-num Excluding Merge-Ins
This is equivalent to a diff from 9199b1fa38 to 860695f9be
2013-05-31
| ||
19:37 | Merge sqlite4-num branch with trunk. check-in: 7b0d1cf7f4 user: dan tags: trunk | |
19:34 | Remove OP_Int64 and OP_Real. OP_Num is now used instead. Leaf check-in: 860695f9be user: dan tags: sqlite4-num | |
19:19 | Remove uses of type 'double' from the vdbe. check-in: e018823162 user: dan tags: sqlite4-num | |
2013-05-24
| ||
20:28 | Start using sqlite4_num to store numeric SQL values. This commit is more buggy than not. check-in: d94f6e934e user: dan tags: sqlite4-num | |
2013-05-23
| ||
09:39 | Changed TLIBS= to TLIBS?= to allow override from CLI. check-in: 9199b1fa38 user: stephan tags: trunk | |
2013-05-22
| ||
17:40 | Add simple OOM injection test to show that the sqlite4_mm based test infrastructure works. check-in: 3f1a52c793 user: dan tags: trunk | |
Changes to main.mk.
︙ | ︙ | |||
226 227 228 229 230 231 232 233 234 235 236 237 238 239 | $(TOP)/test/test_kv2.c \ $(TOP)/test/test_lsm.c \ $(TOP)/test/test_main.c \ $(TOP)/test/test_malloc.c \ $(TOP)/test/test_mem.c \ $(TOP)/test/test_misc1.c \ $(TOP)/test/test_mutex.c \ $(TOP)/test/test_thread.c \ $(TOP)/test/test_thread0.c \ $(TOP)/test/test_utf.c \ $(TOP)/test/test_wsd.c #TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c #TESTSRC += $(TOP)/ext/fts3/fts3_tokenizer.c | > | 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 | $(TOP)/test/test_kv2.c \ $(TOP)/test/test_lsm.c \ $(TOP)/test/test_main.c \ $(TOP)/test/test_malloc.c \ $(TOP)/test/test_mem.c \ $(TOP)/test/test_misc1.c \ $(TOP)/test/test_mutex.c \ $(TOP)/test/test_num.c \ $(TOP)/test/test_thread.c \ $(TOP)/test/test_thread0.c \ $(TOP)/test/test_utf.c \ $(TOP)/test/test_wsd.c #TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c #TESTSRC += $(TOP)/ext/fts3/fts3_tokenizer.c |
︙ | ︙ |
Changes to src/expr.c.
︙ | ︙ | |||
1899 1900 1901 1902 1903 1904 1905 | ** ** The z[] string will probably not be zero-terminated. But the ** z[n] character is guaranteed to be something that does not look ** like the continuation of the number. */ static void codeReal(Vdbe *v, const char *z, int negateFlag, int iMem){ if( ALWAYS(z!=0) ){ | | > | | | | | | > > | > | < | < | < < < < < < | 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 | ** ** The z[] string will probably not be zero-terminated. But the ** z[n] character is guaranteed to be something that does not look ** like the continuation of the number. */ static void codeReal(Vdbe *v, const char *z, int negateFlag, int iMem){ if( ALWAYS(z!=0) ){ int s = sizeof(sqlite4_num); sqlite4_num *p = (sqlite4_num *)sqlite4DbMallocZero(sqlite4VdbeDb(v), s); if( p ){ *p = sqlite4_num_from_text(z, -1, 0, 0); assert( p->sign==0 ); assert( negateFlag==0 || negateFlag==1 ); p->sign = negateFlag; sqlite4VdbeAddOp4(v, OP_Num, 0, iMem, 0, (const char *)p, P4_NUM); } } } #endif /* ** Generate an instruction that will put the integer describe by ** text z[0..n-1] into register iMem. ** ** Expr.u.zToken is always UTF8 and zero-terminated. */ static void codeInteger(Parse *pParse, Expr *pExpr, int negFlag, int iMem){ Vdbe *v = pParse->pVdbe; if( pExpr->flags & EP_IntValue ){ int i = pExpr->u.iValue; assert( i>=0 ); if( negFlag ) i = -i; sqlite4VdbeAddOp2(v, OP_Integer, i, iMem); }else{ sqlite4_num *p; int c; i64 value; const char *z = pExpr->u.zToken; assert( z!=0 ); p = (sqlite4_num *)sqlite4DbMallocRaw(pParse->db, sizeof(sqlite4_num)); if( p ){ *p = sqlite4_num_from_text(z, -1, (negFlag ? SQLITE4_NEGATIVE : 0), 0); sqlite4VdbeAddOp4(v, OP_Num, p->e==0, iMem, 0, (const char *)p, P4_NUM); } } } /* ** Clear a cache entry. */ |
︙ | ︙ |
Changes to src/math.c.
︙ | ︙ | |||
302 303 304 305 306 307 308 309 | ** is 0. If that assumption is violated, then this routine can ** yield an anomolous result. ** ** Conversion stops at the first \000 character. At most nIn bytes ** of zIn are examined. Or if nIn is negative, up to a billion bytes ** are scanned, which we assume is more than will be found in any valid ** numeric string. */ | > > > > | > > > > > > > > > > > > > > > | | < | > > | > < > | | | | | > > > > > > > > | | | | | | > | > > | | < > > > | < > > | > > > | | | | > | > > > > > > < | > > > > > | > > | > | | | < | < < < < < | < < < < < | | < < | > | | | | | > | > | > > > > | > > | | > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 358 359 360 361 362 363 364 365 366 367 368 369 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 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 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 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 | ** is 0. If that assumption is violated, then this routine can ** yield an anomolous result. ** ** Conversion stops at the first \000 character. At most nIn bytes ** of zIn are examined. Or if nIn is negative, up to a billion bytes ** are scanned, which we assume is more than will be found in any valid ** numeric string. ** ** If the value does not contain a decimal point or exponent, and is ** within the range of a signed 64-bit integer, it is guaranteed that ** the exponent of the returned value is zero. */ sqlite4_num sqlite4_num_from_text( const char *zIn, /* Pointer to text to parse */ int nIn, /* Size of zIn in bytes or (-ve) */ unsigned flags, /* Conversion flags */ int *pbReal /* OUT: True if text looks like a real */ ){ /* Return this value (NaN) if a parse error occurs. */ static const sqlite4_num error_value = {0, 0, SQLITE4_MX_EXP+1, 0}; static const i64 L10 = (LARGEST_INT64 / 10); int aMaxFinal[2] = {7, 8}; static int one = 1; /* Used to test machine endianness */ int bRnd = 1; /* If mantissa overflows, round it */ int bReal = 0; /* If text looks like a real */ int seenRadix = 0; /* True after decimal point has been parsed */ int seenDigit = 0; /* True after first non-zero digit parsed */ int incr = 1; /* 1 for utf-8, 2 for utf-16 */ sqlite4_num r; /* Value to return */ char c; int nDigit = 0; int i; assert( L10==922337203685477580 ); memset(&r, 0, sizeof(r)); if( nIn<0 ) nIn = 1000000000; c = flags & 0xf; if( c==0 || c==SQLITE4_UTF8 ){ incr = 1; }else{ if( c==SQLITE4_UTF16 ){ c = (3 - *(char*)&one); } assert( c==SQLITE4_UTF16LE || c==SQLITE4_UTF16BE ); incr = 2; if( c==SQLITE4_UTF16BE ){ zIn += 1; nIn -= 1; } } /* If the IGNORE_WHITESPACE flag is set, ignore any leading whitespace. */ i = 0; if( flags & SQLITE4_IGNORE_WHITESPACE ){ while( sqlite4Isspace(zIn[i]) && i<nIn ) i+=incr; } if( nIn<=i ) return error_value; /* Check for a leading '+' or '-' symbol. */ if( zIn[i]=='-' ){ r.sign = 1; i += incr; }else if( zIn[i]=='+' ){ i += incr; }else if( flags & SQLITE4_NEGATIVE ){ r.sign = 1; } if( nIn<=i ) return error_value; /* Check for the string "inf". This is a special case. */ if( (flags & SQLITE4_INTEGER_ONLY)==0 && (nIn-i)>=incr*3 && ((c=zIn[i])=='i' || c=='I') && ((c=zIn[i+incr])=='n' || c=='N') && ((c=zIn[i+incr*2])=='f' || c=='F') ){ r.e = SQLITE4_MX_EXP+1; r.m = 1; if( pbReal ) *pbReal = 1; goto finished; } for( ; i<nIn && (c = zIn[i])!=0; i+=incr){ if( c>='0' && c<='9' ){ int iDigit = (c - '0'); if( iDigit==0 && seenDigit==0 ){ /* Handle leading zeroes. If they occur to the right of the decimal ** point they can just be ignored. Otherwise, decrease the exponent ** by one. */ if( seenRadix ) r.e--; continue; } seenDigit = 1; if( r.e>0 || r.m>L10 || (r.m==L10 && iDigit>aMaxFinal[r.sign]) ){ /* Mantissa overflow. */ if( seenRadix==0 ) r.e++; if( iDigit!=0 ){ r.approx = 1; } if( bRnd ){ if( iDigit>5 && r.m<((u64)LARGEST_INT64 + r.sign)) r.m++; bRnd = 0; } bReal = 1; }else{ if( seenRadix ) r.e -= 1; r.m = (r.m*10) + iDigit; } }else{ if( flags & SQLITE4_INTEGER_ONLY ) goto finished; if( c=='.' ){ /* Permit only a single radix in each number */ if( seenRadix ) goto finished; seenRadix = 1; bReal = 1; }else if( c=='e' || c=='E' ){ int f = (flags & (SQLITE4_PREFIX_ONLY|SQLITE4_IGNORE_WHITESPACE)); sqlite4_num exp; exp = sqlite4_num_from_text(&zIn[i+incr], nIn-i-incr, f, 0); if( sqlite4_num_isnan(exp) ) goto finished; if( exp.e || exp.m>999 ) goto finished; bReal = 1; r.e += (int)(exp.m) * (exp.sign ? -1 : 1); i = nIn; break; }else{ goto finished; } } } finished: /* Check for a parse error. If one has occurred, set the return value ** to NaN. */ if( (flags & SQLITE4_PREFIX_ONLY)==0 && i<nIn && zIn[i] ){ if( flags & SQLITE4_IGNORE_WHITESPACE ){ while( i<nIn && sqlite4Isspace(zIn[i]) ) i += incr; } if( i<nIn && zIn[i] ){ r.e = SQLITE4_MX_EXP+1; r.m = 0; } } if( pbReal ) *pbReal = bReal; return r; } /* ** Convert an sqlite4_int64 to a number and return that number. */ sqlite4_num sqlite4_num_from_int64(sqlite4_int64 n){ sqlite4_num r; r.approx = 0; r.e = 0; r.sign = n < 0; if( n>=0 ){ r.m = n; }else if( n!=SMALLEST_INT64 ){ r.m = -n; }else{ r.m = 1+(u64)LARGEST_INT64; } return r; } /* ** Return an sqlite4_num containing a value as close as possible to the ** double value passed as the only argument. ** ** TODO: This is an inefficient placeholder implementation only. */ sqlite4_num sqlite4_num_from_double(double d){ const double large = (double)LARGEST_UINT64; const double large10 = (double)TENTH_MAX; sqlite4_num x = {0, 0, 0, 0}; /* TODO: How should this be set? */ x.approx = 1; if( d<0.0 ){ x.sign = 1; d = d*-1.0; } while( d>large || (d>1.0 && d==(i64)d) ){ d = d / 10.0; x.e++; } while( d<large10 && d!=(double)((i64)d) ){ d = d * 10.0; x.e--; } x.m = (u64)d; return x; } /* ** TODO: This is a placeholder implementation only. */ int sqlite4_num_to_int32(sqlite4_num num, int *piOut){ *piOut = sqlite4_num_to_int64(num, 0); return SQLITE4_OK; } int sqlite4_num_to_double(sqlite4_num num, double *pr){ double rRet; int i; rRet = num.m; if( num.sign ) rRet = rRet*-1; for(i=0; i<num.e; i++){ rRet = rRet * 10.0; } for(i=num.e; i<0; i++){ rRet = rRet / 10.0; } *pr = rRet; return SQLITE4_OK; } /* ** Convert the number passed as the first argument to a signed 64-bit ** integer and return the value. If the second argument is not NULL, ** then set the value that it points to 1 if data was lost as part ** of the conversion, or 0 otherwise. */ sqlite4_int64 sqlite4_num_to_int64(sqlite4_num num, int *pbLossy){ static const i64 L10 = (LARGEST_INT64 / 10); i64 iRet; int i; iRet = num.m; if( pbLossy ) *pbLossy = 0; for(i=0; i<num.e; i++){ if( pbLossy && iRet>L10 ) *pbLossy = 1; iRet = iRet * 10; } for(i=num.e; i<0; i++){ if( pbLossy && (iRet % 10) ) *pbLossy = 1; iRet = iRet / 10; } if( num.sign ) iRet = iRet*-1; return iRet; } /* ** Convert an integer into text in the buffer supplied. The ** text is zero-terminated and right-justified in the buffer. ** A pointer to the first character of text is returned. ** ** The buffer needs to be at least 21 bytes in length. |
︙ | ︙ | |||
444 445 446 447 448 449 450 | } /* ** Convert a number into text. Store the result in zOut[]. The ** zOut buffer must be at laest 30 characters in length. The output ** will be zero-terminated. */ | | < > > | | < | | | | | | | | > | > > > | | | | < | > | | | > > > > | | > | | | < | | < | | | | | > | < < < < | | | < | < < | | | < | | | 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 | } /* ** Convert a number into text. Store the result in zOut[]. The ** zOut buffer must be at laest 30 characters in length. The output ** will be zero-terminated. */ int sqlite4_num_to_text(sqlite4_num x, char *zOut, int bReal){ char zBuf[24]; char *zNum; int n; static const char zeros[] = "0000000000000000000000000"; char *z = zOut; if( x.sign && x.m>0 ){ /* Add initial "-" for negative non-zero values */ z[0] = '-'; z++; } if( x.e>SQLITE4_MX_EXP ){ /* Handle NaN and infinite values */ if( x.m==0 ){ memcpy(z, "NaN", 4); }else{ memcpy(z, "inf", 4); } return (z - zOut)+3; } if( x.m==0 ){ memcpy(z, "0", 2); return 1+(z-zOut); } zNum = renderInt(x.m, zBuf, sizeof(zBuf)); n = &zBuf[sizeof(zBuf)-1] - zNum; if( x.e>=0 && x.e+n<=25 ){ /* Integer values with up to 25 digits */ memcpy(z, zNum, n+1); z += n; if( x.e>0 ){ memcpy(z, zeros, x.e); z += x.e; z[0] = 0; } if( bReal ){ memcpy(z, ".0", 3); z += 2; } return (z - zOut); } if( x.e<0 && n+x.e > 0 ){ /* Fractional values where the decimal point occurs within the ** significant digits. ex: 12.345 */ int m = n+x.e; memcpy(z, zNum, m); z += m; zNum += m; n -= m; removeTrailingZeros(zNum, &n); if( n>0 ){ z[0] = '.'; z++; memcpy(z, zNum, n); z += n; z[0] = 0; }else{ if( bReal ){ memcpy(z, ".0", 3); z += 2; }else{ z[0] = 0; } } return (z - zOut); } if( x.e<0 && x.e >= -n-5 ){ /* Values less than 1 and with no more than 5 subsequent zeros prior ** to the first significant digit. Ex: 0.0000012345 */ int j = -(n + x.e); memcpy(z, "0.", 2); z += 2; if( j>0 ){ memcpy(z, zeros, j); z += j; } removeTrailingZeros(zNum, &n); memcpy(z, zNum, n); z += n; z[0] = 0; return (z - zOut); } /* Exponential notation from here to the end. ex: 1.234e-15 */ z[0] = zNum[0]; z++; if( n>1 ){ int nOrig = n; removeTrailingZeros(zNum, &n); x.e += nOrig - n; } if( n!=1 ){ /* Two or or more significant digits. ex: 1.23e17 */ *z++ = '.'; memcpy(z, zNum+1, n-1); z += n-1; x.e += n-1; } *z++ = 'e'; if( x.e<0 ){ *z++ = '-'; x.e = -x.e; }else{ *z++ = '+'; } z++; zNum = renderInt(x.e&0x7fff, zBuf, sizeof(zBuf)); while( (z[0] = zNum[0])!=0 ){ z++; zNum++; } return (z-zOut); } |
Changes to src/pragma.c.
︙ | ︙ | |||
43 44 45 46 47 48 49 | /* ** Generate code to return a single integer value. */ static void returnSingleInt(Parse *pParse, const char *zLabel, i64 value){ Vdbe *v = sqlite4GetVdbe(pParse); int mem = ++pParse->nMem; | > > | | | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | /* ** Generate code to return a single integer value. */ static void returnSingleInt(Parse *pParse, const char *zLabel, i64 value){ Vdbe *v = sqlite4GetVdbe(pParse); int mem = ++pParse->nMem; sqlite4_num *pNum; pNum = sqlite4DbMallocRaw(pParse->db, sizeof(value)); if( pNum ){ *pNum = sqlite4_num_from_int64(value); } sqlite4VdbeAddOp4(v, OP_Num, 1, mem, 0, (char *)pNum, P4_NUM); sqlite4VdbeSetNumCols(v, 1); sqlite4VdbeSetColName(v, 0, COLNAME_NAME, zLabel, SQLITE4_STATIC); sqlite4VdbeAddOp2(v, OP_ResultRow, mem, 1); } #ifndef SQLITE4_OMIT_FLAG_PRAGMAS /* |
︙ | ︙ |
Changes to src/sqlite.h.in.
︙ | ︙ | |||
4108 4109 4110 4111 4112 4113 4114 | sqlite4_num sqlite4_num_sub(sqlite4_num, sqlite4_num); sqlite4_num sqlite4_num_mul(sqlite4_num, sqlite4_num); sqlite4_num sqlite4_num_div(sqlite4_num, sqlite4_num); int sqlite4_num_isinf(sqlite4_num); int sqlite4_num_isnan(sqlite4_num); sqlite4_num sqlite4_num_round(sqlite4_num, int iDigit); int sqlite4_num_compare(sqlite4_num, sqlite4_num); | | | | | > > | 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 | sqlite4_num sqlite4_num_sub(sqlite4_num, sqlite4_num); sqlite4_num sqlite4_num_mul(sqlite4_num, sqlite4_num); sqlite4_num sqlite4_num_div(sqlite4_num, sqlite4_num); int sqlite4_num_isinf(sqlite4_num); int sqlite4_num_isnan(sqlite4_num); sqlite4_num sqlite4_num_round(sqlite4_num, int iDigit); int sqlite4_num_compare(sqlite4_num, sqlite4_num); sqlite4_num sqlite4_num_from_text(const char*, int n, unsigned flags, int*); sqlite4_num sqlite4_num_from_int64(sqlite4_int64); sqlite4_num sqlite4_num_from_double(double); int sqlite4_num_to_int32(sqlite4_num, int*); sqlite4_int64 sqlite4_num_to_int64(sqlite4_num, int *); int sqlite4_num_to_double(sqlite4_num, double *); int sqlite4_num_to_text(sqlite4_num, char*, int); /* ** CAPI4REF: Flags For Text-To-Numeric Conversion */ #define SQLITE4_PREFIX_ONLY 0x10 #define SQLITE4_IGNORE_WHITESPACE 0x20 #define SQLITE4_NEGATIVE 0x40 #define SQLITE4_INTEGER_ONLY 0x80 typedef struct sqlite4_tokenizer sqlite4_tokenizer; /* ** CAPI4REF: Register an FTS tokenizer implementation ** ** xTokenize: |
︙ | ︙ |
Changes to src/vdbe.c.
︙ | ︙ | |||
225 226 227 228 229 230 231 | /* ** Try to convert a value into a numeric representation if we can ** do so without loss of information. In other words, if the string ** looks like a number, convert it into a number. If it does not ** look like a number, leave it alone. */ static void applyNumericAffinity(Mem *pRec){ | | < < | > > | | | | < < < | | 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 | /* ** Try to convert a value into a numeric representation if we can ** do so without loss of information. In other words, if the string ** looks like a number, convert it into a number. If it does not ** look like a number, leave it alone. */ static void applyNumericAffinity(Mem *pRec){ if( (pRec->flags & (MEM_Real|MEM_Int))==0 && (pRec->flags & MEM_Str) ){ int flags = pRec->enc | SQLITE4_IGNORE_WHITESPACE; int bReal = 0; sqlite4_num num; num = sqlite4_num_from_text(pRec->z, pRec->n, flags, &bReal); if( sqlite4_num_isnan(num)==0 ){ pRec->u.num = num; MemSetTypeFlag(pRec, (bReal ? MEM_Real : MEM_Int)); } } } /* ** Processing is determine by the affinity parameter: ** |
︙ | ︙ | |||
390 391 392 393 394 395 396 | #ifdef SQLITE4_DEBUG /* ** Print the value of a register for tracing purposes: */ static void memTracePrint(FILE *out, Mem *p){ if( p->flags & MEM_Null ){ fprintf(out, " NULL"); | > > > > | < > | < < | > | < > > > > > > > > | > | | 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 | #ifdef SQLITE4_DEBUG /* ** Print the value of a register for tracing purposes: */ static void memTracePrint(FILE *out, Mem *p){ if( p->flags & MEM_Null ){ fprintf(out, " NULL"); }else if( p->flags & (MEM_Int|MEM_Real) ){ char aNum[31]; char *zFlags = "r"; sqlite4_num_to_text(p->u.num, aNum, (p->flags & MEM_Real)); if( (p->flags & (MEM_Int|MEM_Str))==(MEM_Int|MEM_Str) ){ zFlags = "si"; }else if( p->flags & MEM_Int ){ zFlags = "i"; } fprintf(out, " %s:%s", zFlags, aNum); }else if( p->flags & MEM_RowSet ){ fprintf(out, " (keyset)"); }else{ char zBuf[200]; sqlite4VdbeMemPrettyPrint(p, zBuf); fprintf(out, " "); fprintf(out, "%s", zBuf); } } static void registerTrace(FILE *out, int iReg, Mem *p){ fprintf(out, "REG[%d] = ", iReg); memTracePrint(out, p); fprintf(out, "\n"); } #endif #ifdef SQLITE4_DEBUG static int assertFlagsOk(Mem *p){ u16 flags = p->flags; assert( (flags&MEM_Int)==0 || (flags&MEM_Real)==0 ); return 1; } #endif #ifdef SQLITE4_DEBUG # define REGISTER_TRACE(R,M) \ if(assertFlagsOk(M) && p->trace)registerTrace(p->trace,R,M) #else # define REGISTER_TRACE(R,M) #endif #ifdef VDBE_PROFILE /* ** hwtime.h contains inline assembler code for implementing |
︙ | ︙ | |||
718 719 720 721 722 723 724 | */ case OP_Gosub: { /* jump */ assert( pOp->p1>0 && pOp->p1<=p->nMem ); pIn1 = &aMem[pOp->p1]; assert( (pIn1->flags & MEM_Dyn)==0 ); memAboutToChange(p, pIn1); pIn1->flags = MEM_Int; | | | | | | 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 | */ case OP_Gosub: { /* jump */ assert( pOp->p1>0 && pOp->p1<=p->nMem ); pIn1 = &aMem[pOp->p1]; assert( (pIn1->flags & MEM_Dyn)==0 ); memAboutToChange(p, pIn1); pIn1->flags = MEM_Int; pIn1->u.num = sqlite4_num_from_int64((i64)pc); REGISTER_TRACE(pOp->p1, pIn1); pc = pOp->p2 - 1; break; } /* Opcode: Return P1 * * * * ** ** Jump to the next instruction after the address in register P1. */ case OP_Return: { /* in1 */ pIn1 = &aMem[pOp->p1]; assert( pIn1->flags & MEM_Int ); sqlite4_num_to_int32(pIn1->u.num, &pc); break; } /* Opcode: Yield P1 * * * * ** ** Swap the program counter with the value in register P1. */ case OP_Yield: { /* in1 */ int pcDest; pIn1 = &aMem[pOp->p1]; assert( (pIn1->flags & MEM_Dyn)==0 ); pIn1->flags = MEM_Int; sqlite4_num_to_int32(pIn1->u.num, &pcDest); pIn1->u.num = sqlite4_num_from_int64(pc); REGISTER_TRACE(pOp->p1, pIn1); pc = pcDest; break; } /* Opcode: HaltIfNull P1 P2 P3 P4 * ** |
︙ | ︙ | |||
834 835 836 837 838 839 840 | } /* Opcode: Integer P1 P2 * * * ** ** The 32-bit integer value P1 is written into register P2. */ case OP_Integer: { /* out2-prerelease */ | | | | | < < < < < < | < < < < < | | | < < | 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 | } /* Opcode: Integer P1 P2 * * * ** ** The 32-bit integer value P1 is written into register P2. */ case OP_Integer: { /* out2-prerelease */ pOut->u.num = sqlite4_num_from_int64((i64)pOp->p1); break; } /* Opcode: Num P1 P2 * P4 * ** ** P4 is a pointer to an sqlite4_num value. Write that value into ** register P2. Set the register flags to MEM_Int if P1 is non-zero, ** or MEM_Real otherwise. */ case OP_Num: { /* out2-prerelease */ pOut->flags = (pOp->p1 ? MEM_Int : MEM_Real); pOut->u.num = *(pOp->p4.pNum); break; } /* Opcode: String8 * P2 * P4 * ** ** P4 points to a nul terminated UTF-8 string. This opcode is transformed ** into an OP_String before it is executed for the first time. */ case OP_String8: { /* same as TK_STRING, out2-prerelease */ |
︙ | ︙ | |||
1201 1202 1203 1204 1205 1206 1207 | case OP_Subtract: /* same as TK_MINUS, in1, in2, out3 */ case OP_Multiply: /* same as TK_STAR, in1, in2, out3 */ case OP_Divide: /* same as TK_SLASH, in1, in2, out3 */ case OP_Remainder: { /* same as TK_REM, in1, in2, out3 */ int flags; /* Combined MEM_* flags from both inputs */ i64 iA; /* Integer value of left operand */ i64 iB; /* Integer value of right operand */ | | | | > | > | | > > > | | | | > | > | > | < < < | < | | < | | < < < | | < | | | | < | > > | 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 | case OP_Subtract: /* same as TK_MINUS, in1, in2, out3 */ case OP_Multiply: /* same as TK_STAR, in1, in2, out3 */ case OP_Divide: /* same as TK_SLASH, in1, in2, out3 */ case OP_Remainder: { /* same as TK_REM, in1, in2, out3 */ int flags; /* Combined MEM_* flags from both inputs */ i64 iA; /* Integer value of left operand */ i64 iB; /* Integer value of right operand */ sqlite4_num num1; sqlite4_num num2; pIn1 = &aMem[pOp->p1]; applyNumericAffinity(pIn1); pIn2 = &aMem[pOp->p2]; applyNumericAffinity(pIn2); pOut = &aMem[pOp->p3]; flags = pIn1->flags | pIn2->flags; if( (flags & MEM_Null)!=0 ) goto arithmetic_result_is_null; if( (pIn1->flags&MEM_Int) && (pIn2->flags&MEM_Int) ){ iA = sqlite4_num_to_int64(pIn1->u.num, 0); iB = sqlite4_num_to_int64(pIn2->u.num, 0); switch( pOp->opcode ){ case OP_Add: if( sqlite4AddInt64(&iB,iA) ) goto fp_math; break; case OP_Subtract: if( sqlite4SubInt64(&iB,iA) ) goto fp_math; break; case OP_Multiply: if( sqlite4MulInt64(&iB,iA) ) goto fp_math; break; case OP_Divide: { if( iA==0 ) goto arithmetic_result_is_null; if( iA==-1 && iB==SMALLEST_INT64 ) goto fp_math; iB /= iA; break; } default: { if( iA==0 ) goto arithmetic_result_is_null; if( iA==-1 ) iA = 1; iB %= iA; break; } } pOut->u.num = sqlite4_num_from_int64(iB); MemSetTypeFlag(pOut, MEM_Int); break; }else{ fp_math: num1 = sqlite4VdbeNumValue(pIn1); num2 = sqlite4VdbeNumValue(pIn2); switch( pOp->opcode ){ case OP_Add: pOut->u.num = sqlite4_num_add(num1, num2); break; case OP_Subtract: pOut->u.num = sqlite4_num_sub(num2, num1); break; case OP_Multiply: pOut->u.num = sqlite4_num_mul(num1, num2); break; case OP_Divide: pOut->u.num = sqlite4_num_div(num2, num1); break; default: { iA = sqlite4_num_to_int64(num1, 0); iB = sqlite4_num_to_int64(num2, 0); if( iA==0 ) goto arithmetic_result_is_null; pOut->u.num = sqlite4_num_from_int64(iB % iA); break; } } if( sqlite4_num_isnan(pOut->u.num) ){ goto arithmetic_result_is_null; }else{ MemSetTypeFlag(pOut, MEM_Real); if( (flags & MEM_Real)==0 ){ sqlite4VdbeIntegerAffinity(pOut); } } } break; arithmetic_result_is_null: sqlite4VdbeMemSetNull(pOut); break; } |
︙ | ︙ | |||
1499 1500 1501 1502 1503 1504 1505 | uA >>= iB; /* Sign-extend on a right shift of a negative number */ if( iA<0 ) uA |= ((((u64)0xffffffff)<<32)|0xffffffff) << (64-iB); } memcpy(&iA, &uA, sizeof(iA)); } } | > | | | 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 | uA >>= iB; /* Sign-extend on a right shift of a negative number */ if( iA<0 ) uA |= ((((u64)0xffffffff)<<32)|0xffffffff) << (64-iB); } memcpy(&iA, &uA, sizeof(iA)); } } pOut->u.num = sqlite4_num_from_int64(iA); MemSetTypeFlag(pOut, MEM_Int); break; } /* Opcode: AddImm P1 P2 * * * ** ** Add the constant P2 to the value in register P1. ** The result is always an integer. ** ** To force any register to be an integer, just add 0. */ case OP_AddImm: { /* in1 */ pIn1 = &aMem[pOp->p1]; memAboutToChange(p, pIn1); sqlite4VdbeMemIntegerify(pIn1); pIn1->u.num = sqlite4_num_add(pIn1->u.num, sqlite4_num_from_int64(pOp->p2)); break; } /* Opcode: MustBeInt P1 P2 * * * ** ** Force the value in register P1 to be an integer. If the value ** in P1 is not an integer and cannot be converted into an integer |
︙ | ︙ | |||
1555 1556 1557 1558 1559 1560 1561 | ** has REAL affinity. Such column values may still be stored as ** integers, for space efficiency, but after extraction we want them ** to have only a real value. */ case OP_RealAffinity: { /* in1 */ pIn1 = &aMem[pOp->p1]; if( pIn1->flags & MEM_Int ){ | | | 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 | ** has REAL affinity. Such column values may still be stored as ** integers, for space efficiency, but after extraction we want them ** to have only a real value. */ case OP_RealAffinity: { /* in1 */ pIn1 = &aMem[pOp->p1]; if( pIn1->flags & MEM_Int ){ MemSetTypeFlag(pIn1, MEM_Real); } break; } #endif #ifndef SQLITE4_OMIT_CAST /* Opcode: ToText P1 * * * * |
︙ | ︙ | |||
1654 1655 1656 1657 1658 1659 1660 | ** equivalent of atoi() and store 0.0 if no such conversion is possible. ** ** A NULL value is not changed by this routine. It remains NULL. */ case OP_ToReal: { /* same as TK_TO_REAL, in1 */ pIn1 = &aMem[pOp->p1]; memAboutToChange(p, pIn1); | > | | < | 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 | ** equivalent of atoi() and store 0.0 if no such conversion is possible. ** ** A NULL value is not changed by this routine. It remains NULL. */ case OP_ToReal: { /* same as TK_TO_REAL, in1 */ pIn1 = &aMem[pOp->p1]; memAboutToChange(p, pIn1); sqlite4VdbeMemNumerify(pIn1); pIn1->flags |= MEM_Real; pIn1->flags &= ~MEM_Int; break; } #endif /* !defined(SQLITE4_OMIT_CAST) && !defined(SQLITE4_OMIT_FLOATING_POINT) */ /* Opcode: Lt P1 P2 P3 P4 P5 ** ** Compare the values in register P1 and P3. If reg(P3)<reg(P1) then |
︙ | ︙ | |||
1796 1797 1798 1799 1800 1801 1802 | default: res = res>=0; break; } if( pOp->p5 & SQLITE4_STOREP2 ){ pOut = &aMem[pOp->p2]; memAboutToChange(p, pOut); MemSetTypeFlag(pOut, MEM_Int); | | | 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 | default: res = res>=0; break; } if( pOp->p5 & SQLITE4_STOREP2 ){ pOut = &aMem[pOp->p2]; memAboutToChange(p, pOut); MemSetTypeFlag(pOut, MEM_Int); pOut->u.num = sqlite4_num_from_int64(res); REGISTER_TRACE(pOp->p2, pOut); }else if( res ){ pc = pOp->p2-1; } /* Undo any changes made by applyAffinity() to the input registers. */ pIn1->flags = (pIn1->flags&~MEM_TypeMask) | (flags1&MEM_TypeMask); |
︙ | ︙ | |||
1947 1948 1949 1950 1951 1952 1953 | static const unsigned char or_logic[] = { 0, 1, 2, 1, 1, 1, 2, 1, 2 }; v1 = or_logic[v1*3+v2]; } pOut = &aMem[pOp->p3]; if( v1==2 ){ MemSetTypeFlag(pOut, MEM_Null); }else{ | | | 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 | static const unsigned char or_logic[] = { 0, 1, 2, 1, 1, 1, 2, 1, 2 }; v1 = or_logic[v1*3+v2]; } pOut = &aMem[pOp->p3]; if( v1==2 ){ MemSetTypeFlag(pOut, MEM_Null); }else{ pOut->u.num = sqlite4_num_from_int64(v1); MemSetTypeFlag(pOut, MEM_Int); } break; } /* Opcode: Not P1 P2 * * * ** |
︙ | ︙ | |||
2023 2024 2025 2026 2027 2028 2029 | case OP_If: /* jump, in1 */ case OP_IfNot: { /* jump, in1 */ int c; pIn1 = &aMem[pOp->p1]; if( pIn1->flags & MEM_Null ){ c = pOp->p3; }else{ | < | < < < | 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 | case OP_If: /* jump, in1 */ case OP_IfNot: { /* jump, in1 */ int c; pIn1 = &aMem[pOp->p1]; if( pIn1->flags & MEM_Null ){ c = pOp->p3; }else{ c = sqlite4VdbeNumValue(pIn1).m!=0; if( pOp->opcode==OP_IfNot ) c = !c; } if( c ){ pc = pOp->p2-1; } break; } |
︙ | ︙ | |||
2550 2551 2552 2553 2554 2555 2556 | ** size, and so forth. P1==0 is the main database file and P1==1 is the ** database file used to store temporary tables. ** ** A transaction must be started before executing this opcode. */ case OP_SetCookie: { /* in3 */ Db *pDb; | | | | | | 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 | ** size, and so forth. P1==0 is the main database file and P1==1 is the ** database file used to store temporary tables. ** ** A transaction must be started before executing this opcode. */ case OP_SetCookie: { /* in3 */ Db *pDb; i64 v; assert( pOp->p1>=0 && pOp->p1<db->nDb ); pDb = &db->aDb[pOp->p1]; pIn3 = &aMem[pOp->p3]; sqlite4VdbeMemIntegerify(pIn3); v = sqlite4_num_to_int64(pIn3->u.num, 0); rc = sqlite4KVStorePutSchema(pDb->pKV, (u32)v); pDb->pSchema->schema_cookie = (int)v; db->flags |= SQLITE4_InternChanges; if( pOp->p1==1 ){ /* Invalidate all prepared statements whenever the TEMP database ** schema is changed. Ticket #1644 */ sqlite4ExpirePreparedStatements(db); p->expired = 0; } |
︙ | ︙ | |||
2706 2707 2708 2709 2710 2711 2712 | if( pOp->p5 ){ assert( p2>0 ); assert( p2<=p->nMem ); pIn2 = &aMem[p2]; assert( memIsValid(pIn2) ); assert( (pIn2->flags & MEM_Int)!=0 ); sqlite4VdbeMemIntegerify(pIn2); | | | 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 | if( pOp->p5 ){ assert( p2>0 ); assert( p2<=p->nMem ); pIn2 = &aMem[p2]; assert( memIsValid(pIn2) ); assert( (pIn2->flags & MEM_Int)!=0 ); sqlite4VdbeMemIntegerify(pIn2); sqlite4_num_to_int32(pIn2->u.num, &p2); /* The p2 value always comes from a prior OP_NewIdxid opcode and ** that opcode will always set the p2 value to 2 or more or else fail. ** If there were a failure, the prepared statement would have halted ** before reaching this instruction. */ if( NEVER(p2<2) ) { rc = SQLITE4_CORRUPT_BKPT; goto abort_due_to_error; |
︙ | ︙ | |||
3238 3239 3240 3241 3242 3243 3244 | ** Write the sequence number into register P2. ** The sequence number on the cursor is incremented after this ** instruction. */ case OP_Sequence: { /* out2-prerelease */ assert( pOp->p1>=0 && pOp->p1<p->nCursor ); assert( p->apCsr[pOp->p1]!=0 ); | | > | 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 | ** Write the sequence number into register P2. ** The sequence number on the cursor is incremented after this ** instruction. */ case OP_Sequence: { /* out2-prerelease */ assert( pOp->p1>=0 && pOp->p1<p->nCursor ); assert( p->apCsr[pOp->p1]!=0 ); pOut->u.num = sqlite4_num_from_int64(p->apCsr[pOp->p1]->seqCount++); break; } /* Opcode: NewRowid P1 P2 P3 * * ** ** Get a new integer primary key (a.k.a "rowid") for table P1. The integer ** should not be currently in use as a primary key on that table. ** ** If P3 is not zero, then it is the number of a register in the top-level ** frame that holds a lower bound for the new rowid. In other words, the ** new rowid must be no less than reg[P3]+1. */ case OP_NewRowid: { /* out2-prerelease */ i64 v; /* The new rowid */ VdbeCursor *pC; /* Cursor of table to get the new rowid */ const KVByteArray *aKey; /* Key of an existing row */ KVSize nKey; /* Size of the existing row key */ int n; /* Number of bytes decoded */ i64 i3; /* Integer value from pIn3 */ v = 0; assert( pOp->p1>=0 && pOp->p1<p->nCursor ); pC = p->apCsr[pOp->p1]; assert( pC!=0 ); /* Some compilers complain about constants of the form 0x7fffffffffffffff. |
︙ | ︙ | |||
3309 3310 3311 3312 3313 3314 3315 | #ifndef SQLITE_OMIT_AUTOINCREMENT if( pOp->p3 && rc==SQLITE4_OK ){ pIn3 = sqlite4RegisterInRootFrame(p, pOp->p3); assert( memIsValid(pIn3) ); REGISTER_TRACE(pOp->p3, pIn3); sqlite4VdbeMemIntegerify(pIn3); assert( (pIn3->flags & MEM_Int)!=0 ); /* mem(P3) holds an integer */ | > | | | > | 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 | #ifndef SQLITE_OMIT_AUTOINCREMENT if( pOp->p3 && rc==SQLITE4_OK ){ pIn3 = sqlite4RegisterInRootFrame(p, pOp->p3); assert( memIsValid(pIn3) ); REGISTER_TRACE(pOp->p3, pIn3); sqlite4VdbeMemIntegerify(pIn3); assert( (pIn3->flags & MEM_Int)!=0 ); /* mem(P3) holds an integer */ i3 = sqlite4_num_to_int64(pIn3->u.num, 0); if( i3==MAX_ROWID ){ rc = SQLITE4_FULL; } if( v<i3 ) v = i3; } #endif pOut->flags = MEM_Int; pOut->u.num = sqlite4_num_from_int64(v+1); break; } /* Opcode: NewIdxid P1 P2 * * * ** ** This opcode is used to allocated new integer index numbers. P1 must ** be an integer value when this opcode is invoked. Before the opcode ** concludes, P1 is set to a value 1 greater than the larger of: ** ** * its current value, or ** * the largest index number still visible in the database using the ** LEFAST query mode used by OP_NewRowid in database P2. */ case OP_NewIdxid: { /* in1 */ u64 iMax; i64 i1; KVStore *pKV; KVCursor *pCsr; pKV = db->aDb[pOp->p2].pKV; pIn1 = &aMem[pOp->p1]; iMax = 0; assert( pIn1->flags & MEM_Int ); |
︙ | ︙ | |||
3357 3358 3359 3360 3361 3362 3363 | } }else if( rc==SQLITE4_NOTFOUND ){ rc = SQLITE4_OK; } sqlite4KVCursorClose(pCsr); } | > | | | > | 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 | } }else if( rc==SQLITE4_NOTFOUND ){ rc = SQLITE4_OK; } sqlite4KVCursorClose(pCsr); } i1 = sqlite4_num_to_int64(pIn1->u.num, 0); if( i1>=(i64)iMax ){ i1++; }else{ i1 = iMax+1; } pIn1->u.num = sqlite4_num_from_int64(i1); break; } /* Opcode: Insert P1 P2 P3 P4 P5 ** ** Write an entry into the table of cursor P1. A new entry is |
︙ | ︙ | |||
3423 3424 3425 3426 3427 3428 3429 | REGISTER_TRACE(pOp->p2, pData); if( pOp->opcode==OP_Insert ){ pKey = &aMem[pOp->p3]; assert( pKey->flags & MEM_Int ); assert( memIsValid(pKey) ); REGISTER_TRACE(pOp->p3, pKey); | | | 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 | REGISTER_TRACE(pOp->p2, pData); if( pOp->opcode==OP_Insert ){ pKey = &aMem[pOp->p3]; assert( pKey->flags & MEM_Int ); assert( memIsValid(pKey) ); REGISTER_TRACE(pOp->p3, pKey); iKey = sqlite4_num_to_int64(pKey->u.num, 0); }else{ /* assert( pOp->opcode==OP_InsertInt ); */ iKey = pOp->p3; } if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++; if( pData->flags & MEM_Null ){ |
︙ | ︙ | |||
3615 3616 3617 3618 3619 3620 3621 | rc = sqlite4KVCursorKey(pC->pKVCur, &aKey, &nKey); if( rc==SQLITE4_OK ){ n = sqlite4GetVarint64(aKey, nKey, (sqlite4_uint64*)&v); n = sqlite4VdbeDecodeIntKey(&aKey[n], nKey-n, &v); if( n==0 ) rc = SQLITE4_CORRUPT; } } | | | 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 | rc = sqlite4KVCursorKey(pC->pKVCur, &aKey, &nKey); if( rc==SQLITE4_OK ){ n = sqlite4GetVarint64(aKey, nKey, (sqlite4_uint64*)&v); n = sqlite4VdbeDecodeIntKey(&aKey[n], nKey-n, &v); if( n==0 ) rc = SQLITE4_CORRUPT; } } pOut->u.num = sqlite4_num_from_int64(v); break; } /* Opcode: NullRow P1 * * * * ** ** Move the cursor P1 to a null row. Any OP_Column operations ** that occur while the cursor is on the null row will always |
︙ | ︙ | |||
4277 4278 4279 4280 4281 4282 4283 4284 | ** within a sub-program). Set the value of register P1 to the maximum of ** its current value and the value in register P2. ** ** This instruction throws an error if the memory cell is not initially ** an integer. */ case OP_MemMax: { /* in2 */ Mem *pIn1; | > > < | > > | > > | > > | > > | > | | 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 | ** within a sub-program). Set the value of register P1 to the maximum of ** its current value and the value in register P2. ** ** This instruction throws an error if the memory cell is not initially ** an integer. */ case OP_MemMax: { /* in2 */ i64 i1; i64 i2; Mem *pIn1; pIn1 = sqlite4RegisterInRootFrame(p, pOp->p1); assert( memIsValid(pIn1) ); sqlite4VdbeMemIntegerify(pIn1); pIn2 = &aMem[pOp->p2]; REGISTER_TRACE(pOp->p1, pIn1); sqlite4VdbeMemIntegerify(pIn2); i1 = sqlite4_num_to_int64(pIn1->u.num, 0); i2 = sqlite4_num_to_int64(pIn2->u.num, 0); if( i1<i2 ){ pIn1->u.num = sqlite4_num_from_int64(i2); } REGISTER_TRACE(pOp->p1, pIn1); break; } #endif /* SQLITE4_OMIT_AUTOINCREMENT */ /* Opcode: IfPos P1 P2 * * * ** ** If the value of register P1 is 1 or greater, jump to P2. ** ** It is illegal to use this instruction on a register that does ** not contain an integer. An assertion fault will result if you try. */ case OP_IfPos: { /* jump, in1 */ i64 i1; pIn1 = &aMem[pOp->p1]; assert( pIn1->flags&MEM_Int ); i1 = sqlite4_num_to_int64(pIn1->u.num, 0); if( i1>0 ){ pc = pOp->p2 - 1; } break; } /* Opcode: IfNeg P1 P2 * * * ** ** If the value of register P1 is less than zero, jump to P2. ** ** It is illegal to use this instruction on a register that does ** not contain an integer. An assertion fault will result if you try. */ case OP_IfNeg: { /* jump, in1 */ i64 i1; pIn1 = &aMem[pOp->p1]; assert( pIn1->flags&MEM_Int ); i1 = sqlite4_num_to_int64(pIn1->u.num, 0); if( i1<0 ){ pc = pOp->p2 - 1; } break; } /* Opcode: IfZero P1 P2 P3 * * ** ** The register P1 must contain an integer. Add literal P3 to the ** value in register P1. If the result is exactly 0, jump to P2. ** ** It is illegal to use this instruction on a register that does ** not contain an integer. An assertion fault will result if you try. */ case OP_IfZero: { /* jump, in1 */ i64 i1; pIn1 = &aMem[pOp->p1]; assert( pIn1->flags&MEM_Int ); i1 = sqlite4_num_to_int64(pIn1->u.num, 0); i1 += pOp->p3; pIn1->u.num = sqlite4_num_from_int64(i1); if( i1==0 ){ pc = pOp->p2 - 1; } break; } /* Opcode: AggStep * P2 P3 P4 P5 ** |
︙ | ︙ | |||
4879 4880 4881 4882 4883 4884 4885 | ** of the fts index to update. If it is zero, then the root page of the ** index is available as part of the Fts5Info structure. */ case OP_FtsUpdate: { Fts5Info *pInfo; /* Description of fts5 index to update */ Mem *pKey; /* Primary key of indexed row */ Mem *aArg; /* Pointer to array of N arguments */ | | < | > < > | > | < | 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962 | ** of the fts index to update. If it is zero, then the root page of the ** index is available as part of the Fts5Info structure. */ case OP_FtsUpdate: { Fts5Info *pInfo; /* Description of fts5 index to update */ Mem *pKey; /* Primary key of indexed row */ Mem *aArg; /* Pointer to array of N arguments */ int iRoot; /* Root page number (or 0) */ assert( pOp->p4type==P4_FTS5INFO ); pInfo = pOp->p4.pFtsInfo; aArg = &aMem[pOp->p3]; pKey = &aMem[pOp->p1]; if( pOp->p2 ){ sqlite4_num_to_int32(aMem[pOp->p2].u.num, &iRoot); }else{ iRoot = 0; } rc = sqlite4Fts5Update(db, pInfo, iRoot, pKey, aArg, pOp->p5, &p->zErrMsg); break; } /* ** Opcode: FtsCksum P1 * P3 P4 P5 ** ** This opcode is used by the integrity-check procedure that verifies that ** the contents of an fts5 index and its corresponding table match. */ case OP_FtsCksum: { Fts5Info *pInfo; /* Description of fts5 index to update */ Mem *pKey; /* Primary key of row */ Mem *aArg; /* Pointer to array of N values */ i64 cksum; /* Checksum for this row or index entry */ i64 i1; assert( pOp->p4type==P4_FTS5INFO ); pInfo = pOp->p4.pFtsInfo; pOut = &aMem[pOp->p1]; pKey = &aMem[pOp->p3]; aArg = &aMem[pOp->p3+1]; cksum = 0; if( pOp->p5 ){ sqlite4Fts5EntryCksum(db, pInfo, pKey, aArg, &cksum); }else{ sqlite4Fts5RowCksum(db, pInfo, pKey, aArg, &cksum); } i1 = sqlite4_num_to_int64(pOut->u.num, 0); pOut->u.num = sqlite4_num_from_int64(i1 ^ cksum); break; } /* Opcode: FtsOpen P1 P2 P3 P4 P5 ** ** Open an FTS cursor named P1. P4 points to an Fts5Info object. ** ** Register P3 contains the MATCH expression that this cursor will iterate ** through the matches for. P5 is set to 0 to iterate through the results ** in ascending PK order, or 1 for descending PK order. ** ** If the expression matches zero rows, jump to instruction P2. Otherwise, ** leave the cursor pointing at the first match and fall through to the ** next instruction. */ case OP_FtsOpen: { /* jump */ Fts5Info *pInfo; /* Description of fts5 index to update */ VdbeCursor *pCur; char *zMatch; Mem *pMatch; pMatch = &aMem[pOp->p3]; Stringify(pMatch, encoding); zMatch = pMatch->z; |
︙ | ︙ |
Changes to src/vdbe.h.
︙ | ︙ | |||
60 61 62 63 64 65 66 67 68 69 70 71 72 73 | Mem *pMem; /* Used when p4type is P4_MEM */ VTable *pVtab; /* Used when p4type is P4_VTAB */ KeyInfo *pKeyInfo; /* Used when p4type is P4_KEYINFO */ int *ai; /* Used when p4type is P4_INTARRAY */ SubProgram *pProgram; /* Used when p4type is P4_SUBPROGRAM */ Fts5Info *pFtsInfo; /* Used when p4type is P4_FTS5INDEXINFO */ int (*xAdvance)(VdbeCursor*); } p4; #ifdef SQLITE4_DEBUG char *zComment; /* Comment to improve readability */ #endif #ifdef VDBE_PROFILE int cnt; /* Number of times this instruction was executed */ u64 cycles; /* Total time spent executing this instruction */ | > | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | Mem *pMem; /* Used when p4type is P4_MEM */ VTable *pVtab; /* Used when p4type is P4_VTAB */ KeyInfo *pKeyInfo; /* Used when p4type is P4_KEYINFO */ int *ai; /* Used when p4type is P4_INTARRAY */ SubProgram *pProgram; /* Used when p4type is P4_SUBPROGRAM */ Fts5Info *pFtsInfo; /* Used when p4type is P4_FTS5INDEXINFO */ int (*xAdvance)(VdbeCursor*); sqlite4_num *pNum; /* Used when p4type is P4_NUM */ } p4; #ifdef SQLITE4_DEBUG char *zComment; /* Comment to improve readability */ #endif #ifdef VDBE_PROFILE int cnt; /* Number of times this instruction was executed */ u64 cycles; /* Total time spent executing this instruction */ |
︙ | ︙ | |||
118 119 120 121 122 123 124 125 126 127 128 129 130 131 | #define P4_REAL (-12) /* P4 is a 64-bit floating point value */ #define P4_INT64 (-13) /* P4 is a 64-bit signed integer */ #define P4_INT32 (-14) /* P4 is a 32-bit signed integer */ #define P4_INTARRAY (-15) /* P4 is a vector of 32-bit integers */ #define P4_SUBPROGRAM (-18) /* P4 is a pointer to a SubProgram structure */ #define P4_ADVANCE (-19) /* P4 is a pointer to BtreeNext() or BtreePrev() */ #define P4_FTS5INFO (-20) /* P4 points to an Fts5Info structure */ /* When adding a P4 argument using P4_KEYINFO, a copy of the KeyInfo structure ** is made. That copy is freed when the Vdbe is finalized. But if the ** argument is P4_KEYINFO_HANDOFF, the passed in pointer is used. It still ** gets freed when the Vdbe is finalized so it still should be obtained ** from a single sqliteMalloc(). But no copy is made and the calling ** function should *not* try to free the KeyInfo. | > | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | #define P4_REAL (-12) /* P4 is a 64-bit floating point value */ #define P4_INT64 (-13) /* P4 is a 64-bit signed integer */ #define P4_INT32 (-14) /* P4 is a 32-bit signed integer */ #define P4_INTARRAY (-15) /* P4 is a vector of 32-bit integers */ #define P4_SUBPROGRAM (-18) /* P4 is a pointer to a SubProgram structure */ #define P4_ADVANCE (-19) /* P4 is a pointer to BtreeNext() or BtreePrev() */ #define P4_FTS5INFO (-20) /* P4 points to an Fts5Info structure */ #define P4_NUM (-21) /* P4 points to an Fts5Info structure */ /* When adding a P4 argument using P4_KEYINFO, a copy of the KeyInfo structure ** is made. That copy is freed when the Vdbe is finalized. But if the ** argument is P4_KEYINFO_HANDOFF, the passed in pointer is used. It still ** gets freed when the Vdbe is finalized so it still should be obtained ** from a single sqliteMalloc(). But no copy is made and the calling ** function should *not* try to free the KeyInfo. |
︙ | ︙ | |||
214 215 216 217 218 219 220 | void sqlite4VdbeSetVarmask(Vdbe*, int); #ifndef SQLITE4_OMIT_TRACE char *sqlite4VdbeExpandSql(Vdbe*, const char*); #endif sqlite4_value *sqlite4ColumnValue(sqlite4_stmt *pStmt, int iCol); void sqlite4VdbeRecordUnpack(KeyInfo*,int,const void*,UnpackedRecord*); | < | 216 217 218 219 220 221 222 223 224 225 226 227 228 229 | void sqlite4VdbeSetVarmask(Vdbe*, int); #ifndef SQLITE4_OMIT_TRACE char *sqlite4VdbeExpandSql(Vdbe*, const char*); #endif sqlite4_value *sqlite4ColumnValue(sqlite4_stmt *pStmt, int iCol); void sqlite4VdbeRecordUnpack(KeyInfo*,int,const void*,UnpackedRecord*); UnpackedRecord *sqlite4VdbeAllocUnpackedRecord(KeyInfo *, char *, int, char **); #ifndef SQLITE4_OMIT_TRIGGER void sqlite4VdbeLinkSubProgram(Vdbe *, SubProgram *); #endif |
︙ | ︙ |
Changes to src/vdbeInt.h.
︙ | ︙ | |||
126 127 128 129 130 131 132 | ** Internally, the vdbe manipulates nearly all SQL values as Mem ** structures. Each Mem struct may cache multiple representations (string, ** integer etc.) of the same value. */ struct Mem { sqlite4 *db; /* The associated database connection */ char *z; /* String or BLOB value */ | < | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | ** Internally, the vdbe manipulates nearly all SQL values as Mem ** structures. Each Mem struct may cache multiple representations (string, ** integer etc.) of the same value. */ struct Mem { sqlite4 *db; /* The associated database connection */ char *z; /* String or BLOB value */ union { sqlite4_num num; /* Numeric value used by MEM_Int and/or MEM_Real */ FuncDef *pDef; /* Used only when flags==MEM_Agg */ RowSet *pRowSet; /* Used only when flags==MEM_RowSet */ VdbeFrame *pFrame; /* Used when flags==MEM_Frame */ } u; int n; /* Number of characters in string value, excluding '\0' */ u16 flags; /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */ u8 type; /* One of SQLITE4_NULL, _TEXT, _INTEGER, etc */ u8 enc; /* SQLITE4_UTF8, SQLITE4_UTF16BE, SQLITE4_UTF16LE */ #ifdef SQLITE4_DEBUG Mem *pScopyFrom; /* This Mem is a shallow copy of pScopyFrom */ void *pFiller; /* So that sizeof(Mem) is a multiple of 8 */ #endif void (*xDel)(void*,void*); /* Function to delete Mem.z */ void *pDelArg; /* First argument to xDel() */ |
︙ | ︙ | |||
406 407 408 409 410 411 412 413 | #endif void sqlite4VdbeMemSetNull(Mem*); int sqlite4VdbeMemMakeWriteable(Mem*); int sqlite4VdbeMemStringify(Mem*, int); i64 sqlite4VdbeIntValue(Mem*); int sqlite4VdbeMemIntegerify(Mem*); double sqlite4VdbeRealValue(Mem*); void sqlite4VdbeIntegerAffinity(Mem*); | > < | 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 | #endif void sqlite4VdbeMemSetNull(Mem*); int sqlite4VdbeMemMakeWriteable(Mem*); int sqlite4VdbeMemStringify(Mem*, int); i64 sqlite4VdbeIntValue(Mem*); int sqlite4VdbeMemIntegerify(Mem*); double sqlite4VdbeRealValue(Mem*); sqlite4_num sqlite4VdbeNumValue(Mem *); void sqlite4VdbeIntegerAffinity(Mem*); int sqlite4VdbeMemNumerify(Mem*); void sqlite4VdbeMemSetRowSet(Mem *pMem); void sqlite4VdbeMemRelease(Mem *p); void sqlite4VdbeMemReleaseExternal(Mem *p); #define VdbeMemRelease(X) \ if((X)->flags&(MEM_Agg|MEM_Dyn|MEM_RowSet|MEM_Frame)) \ |
︙ | ︙ |
Changes to src/vdbeapi.c.
︙ | ︙ | |||
668 669 670 671 672 673 674 | ** these assert()s from failing, when building with SQLITE4_DEBUG defined ** using gcc, we force nullMem to be 8-byte aligned using the magical ** __attribute__((aligned(8))) macro. */ static const Mem nullMem #if defined(SQLITE4_DEBUG) && defined(__GNUC__) __attribute__((aligned(8))) #endif | | | 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 | ** these assert()s from failing, when building with SQLITE4_DEBUG defined ** using gcc, we force nullMem to be 8-byte aligned using the magical ** __attribute__((aligned(8))) macro. */ static const Mem nullMem #if defined(SQLITE4_DEBUG) && defined(__GNUC__) __attribute__((aligned(8))) #endif = {0, "", {{0,0,0,0}}, 0, MEM_Null, SQLITE4_NULL, 0, #ifdef SQLITE4_DEBUG 0, 0, /* pScopyFrom, pFiller */ #endif 0, 0 }; if( pVm && ALWAYS(pVm->db) ){ sqlite4_mutex_enter(pVm->db->mutex); |
︙ | ︙ | |||
1086 1087 1088 1089 1090 1091 1092 | ){ return bindText(pStmt, i, zData, nData, xDel, pDelArg, SQLITE4_UTF16NATIVE); } #endif /* SQLITE4_OMIT_UTF16 */ int sqlite4_bind_value(sqlite4_stmt *pStmt, int i, const sqlite4_value *pValue){ int rc; switch( pValue->type ){ | | < < < > > > > > | > | 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 | ){ return bindText(pStmt, i, zData, nData, xDel, pDelArg, SQLITE4_UTF16NATIVE); } #endif /* SQLITE4_OMIT_UTF16 */ int sqlite4_bind_value(sqlite4_stmt *pStmt, int i, const sqlite4_value *pValue){ int rc; switch( pValue->type ){ case SQLITE4_INTEGER: case SQLITE4_FLOAT: { Mem *p = (Mem *)pValue; Vdbe *v = (Vdbe *)pStmt; vdbeUnbind(v, i); v->aVar[i-1].u.num = p->u.num; MemSetTypeFlag(&v->aVar[i-1], (pValue->type==SQLITE4_FLOAT ? MEM_Real : MEM_Int) ); break; } case SQLITE4_BLOB: { rc = sqlite4_bind_blob(pStmt, i, pValue->z, pValue->n, SQLITE4_TRANSIENT, 0); break; } |
︙ | ︙ |
Changes to src/vdbeaux.c.
︙ | ︙ | |||
578 579 580 581 582 583 584 585 586 587 588 589 590 591 | ** Delete a P4 value if necessary. */ static void freeP4(sqlite4 *db, int p4type, void *p4){ if( p4 ){ assert( db ); switch( p4type ){ case P4_REAL: case P4_INT64: case P4_DYNAMIC: case P4_KEYINFO: case P4_INTARRAY: case P4_KEYINFO_HANDOFF: { sqlite4DbFree(db, p4); break; | > | 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 | ** Delete a P4 value if necessary. */ static void freeP4(sqlite4 *db, int p4type, void *p4){ if( p4 ){ assert( db ); switch( p4type ){ case P4_REAL: case P4_NUM: case P4_INT64: case P4_DYNAMIC: case P4_KEYINFO: case P4_INTARRAY: case P4_KEYINFO_HANDOFF: { sqlite4DbFree(db, p4); break; |
︙ | ︙ | |||
896 897 898 899 900 901 902 | sqlite4_snprintf(zTemp, nTemp, "%.16g", *pOp->p4.pReal); break; } case P4_MEM: { Mem *pMem = pOp->p4.pMem; if( pMem->flags & MEM_Str ){ zP4 = pMem->z; | | | | | | 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 | sqlite4_snprintf(zTemp, nTemp, "%.16g", *pOp->p4.pReal); break; } case P4_MEM: { Mem *pMem = pOp->p4.pMem; if( pMem->flags & MEM_Str ){ zP4 = pMem->z; }else if( pMem->flags & (MEM_Int|MEM_Real) ){ char aOut[30]; sqlite4_num_to_text(pMem->u.num, aOut, (pMem->flags & MEM_Real)); sqlite4_snprintf(zTemp, nTemp, "%s", aOut); }else if( pMem->flags & MEM_Null ){ sqlite4_snprintf(zTemp, nTemp, "NULL"); }else{ assert( pMem->flags & MEM_Blob ); zP4 = "(blob)"; } break; |
︙ | ︙ | |||
1129 1130 1131 1132 1133 1134 1135 | i -= apSub[j]->nOp; } pOp = &apSub[j]->aOp[i]; } if( p->explain==1 ){ pMem->flags = MEM_Int; pMem->type = SQLITE4_INTEGER; | | | | 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 | i -= apSub[j]->nOp; } pOp = &apSub[j]->aOp[i]; } if( p->explain==1 ){ pMem->flags = MEM_Int; pMem->type = SQLITE4_INTEGER; pMem->u.num = sqlite4_num_from_int64(i); /* Program counter */ pMem++; pMem->flags = MEM_Static|MEM_Str|MEM_Term; pMem->z = (char*)sqlite4OpcodeName(pOp->opcode); /* Opcode */ assert( pMem->z!=0 ); pMem->n = sqlite4Strlen30(pMem->z); pMem->type = SQLITE4_TEXT; pMem->enc = SQLITE4_UTF8; pMem++; /* When an OP_Program opcode is encounter (the only opcode that has |
︙ | ︙ | |||
1161 1162 1163 1164 1165 1166 1167 | pSub->flags |= MEM_Blob; pSub->n = nSub*sizeof(SubProgram*); } } } pMem->flags = MEM_Int; | | | | | | 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 | pSub->flags |= MEM_Blob; pSub->n = nSub*sizeof(SubProgram*); } } } pMem->flags = MEM_Int; pMem->u.num = sqlite4_num_from_int64(pOp->p1); /* P1 */ pMem->type = SQLITE4_INTEGER; pMem++; pMem->flags = MEM_Int; pMem->u.num = sqlite4_num_from_int64(pOp->p2); /* P2 */ pMem->type = SQLITE4_INTEGER; pMem++; pMem->flags = MEM_Int; pMem->u.num = sqlite4_num_from_int64(pOp->p3); /* P3 */ pMem->type = SQLITE4_INTEGER; pMem++; if( sqlite4VdbeMemGrow(pMem, 32, 0) ){ /* P4 */ assert( p->db->mallocFailed ); return SQLITE4_ERROR; } pMem->flags = MEM_Dyn|MEM_Str|MEM_Term; z = displayP4(pOp, pMem->z, 32); if( z!=pMem->z ){ sqlite4VdbeMemSetStr(pMem, z, -1, SQLITE4_UTF8, 0, 0); |
︙ | ︙ | |||
2134 2135 2136 2137 2138 2139 2140 | p->pNext->pPrev = p->pPrev; } p->magic = VDBE_MAGIC_DEAD; p->db = 0; sqlite4VdbeDeleteObject(db, p); } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 | p->pNext->pPrev = p->pPrev; } p->magic = VDBE_MAGIC_DEAD; p->db = 0; sqlite4VdbeDeleteObject(db, p); } /* ** If we are on an architecture with mixed-endian floating ** points (ex: ARM7) then swap the lower 4 bytes with the ** upper 4 bytes. Return the result. ** ** For most architectures, this is a no-op. ** |
︙ | ︙ | |||
2282 2283 2284 2285 2286 2287 2288 | return u.r; } # define swapMixedEndianFloat(X) X = floatSwap(X) #else # define swapMixedEndianFloat(X) #endif | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 | return u.r; } # define swapMixedEndianFloat(X) X = floatSwap(X) #else # define swapMixedEndianFloat(X) #endif /* ** This routine is used to allocate sufficient space for an UnpackedRecord ** structure large enough to be used with sqlite4VdbeRecordUnpack() if ** the first argument is a pointer to KeyInfo structure pKeyInfo. ** ** The space is either allocated using sqlite4DbMallocRaw() or from within |
︙ | ︙ | |||
2479 2480 2481 2482 2483 2484 2485 | p->aMem = (Mem*)&((char*)p)[ROUND8(sizeof(UnpackedRecord))]; p->pKeyInfo = pKeyInfo; p->nField = pKeyInfo->nField + 1; return p; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 | p->aMem = (Mem*)&((char*)p)[ROUND8(sizeof(UnpackedRecord))]; p->pKeyInfo = pKeyInfo; p->nField = pKeyInfo->nField + 1; return p; } /* ** This routine sets the value to be returned by subsequent calls to ** sqlite4_changes() on the database handle 'db'. */ void sqlite4VdbeSetChanges(sqlite4 *db, int nChange){ assert( sqlite4_mutex_held(db->mutex) ); |
︙ | ︙ |
Changes to src/vdbecodec.c.
︙ | ︙ | |||
116 117 118 119 120 121 122 123 124 | int iByte; sqlite4_int64 v = ((char*)p->a)[ofst]; for(iByte=1; iByte<size; iByte++){ v = v*256 + p->a[ofst+iByte]; } sqlite4VdbeMemSetInt64(pOut, v); }else if( type<=21 ){ sqlite4_uint64 x; int e; | > | < < < < < < < < < | < | < > > | > > | < | 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 | int iByte; sqlite4_int64 v = ((char*)p->a)[ofst]; for(iByte=1; iByte<size; iByte++){ v = v*256 + p->a[ofst+iByte]; } sqlite4VdbeMemSetInt64(pOut, v); }else if( type<=21 ){ sqlite4_num num = {0, 0, 0, 0}; sqlite4_uint64 x; int e; n = sqlite4GetVarint64(p->a+ofst, p->n-ofst, &x); e = (int)x; n += sqlite4GetVarint64(p->a+ofst+n, p->n-(ofst+n), &x); if( n!=size ) return SQLITE4_CORRUPT; num.m = x; num.e = (e >> 2); if( e & 0x02 ) num.e = -1 * num.e; if( e & 0x01 ) num.sign = 1; pOut->u.num = num; MemSetTypeFlag(pOut, MEM_Real); }else if( cclass==0 ){ if( size==0 ){ sqlite4VdbeMemSetStr(pOut, "", 0, SQLITE4_UTF8, SQLITE4_TRANSIENT, 0); }else if( p->a[ofst]>0x02 ){ sqlite4VdbeMemSetStr(pOut, (char*)(p->a+ofst), size, SQLITE4_UTF8, SQLITE4_TRANSIENT, 0); }else{ |
︙ | ︙ | |||
225 226 227 228 229 230 231 | } nOut = 9; for(i=0; i<nIn; i++){ int flags = aIn[i].flags; if( flags & MEM_Null ){ aOut[nOut++] = 0; }else if( flags & MEM_Int ){ | > > | > | | < < < < < < < < < < < < < < < < < < < | | | | | < | | 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 | } nOut = 9; for(i=0; i<nIn; i++){ int flags = aIn[i].flags; if( flags & MEM_Null ){ aOut[nOut++] = 0; }else if( flags & MEM_Int ){ i64 i1; i1 = sqlite4_num_to_int64(aIn[i].u.num, 0); n = significantBytes(i1); aOut[nOut++] = n+2; nPayload += n; aAux[i].n = n; }else if( flags & MEM_Real ){ sqlite4_num *p = &aIn[i].u.num; int e; assert( p->sign==0 || p->sign==1 ); if( p->e<0 ){ e = (p->e*-4) + 2 + p->sign; }else{ e = (p->e*4) + p->sign; } n = sqlite4PutVarint64(aAux[i].z, (sqlite4_uint64)e); n += sqlite4PutVarint64(aAux[i].z+n, p->m); aAux[i].n = n; aOut[nOut++] = n+9; nPayload += n; }else if( flags & MEM_Str ){ n = aIn[i].n; if( n && (encoding!=SQLITE4_UTF8 || aIn[i].z[0]<2) ) n++; nPayload += n; |
︙ | ︙ | |||
285 286 287 288 289 290 291 | aOut = sqlite4DbReallocOrFree(db, aOut, nOut + nPayload); if( aOut==0 ){ rc = SQLITE4_NOMEM; goto vdbeEncodeData_error; } for(i=0; i<nIn; i++){ int flags = aIn[i].flags; if( flags & MEM_Null ){ /* No content */ }else if( flags & MEM_Int ){ | | > | 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 | aOut = sqlite4DbReallocOrFree(db, aOut, nOut + nPayload); if( aOut==0 ){ rc = SQLITE4_NOMEM; goto vdbeEncodeData_error; } for(i=0; i<nIn; i++){ int flags = aIn[i].flags; if( flags & MEM_Null ){ /* No content */ }else if( flags & MEM_Int ){ sqlite4_int64 v; v = sqlite4_num_to_int64(aIn[i].u.num, 0); n = aAux[i].n; aOut[nOut+(--n)] = v & 0xff; while( n ){ v >>= 8; aOut[nOut+(--n)] = v & 0xff; } nOut += aAux[i].n; |
︙ | ︙ | |||
355 356 357 358 359 360 361 | p->aOut = aNew; p->nAlloc = sqlite4DbMallocSize(p->db, p->aOut); } return SQLITE4_OK; } /* | > > | | < < | | | | | > > > > | > | < < < < < < < < < < | > > > | > > > | > > | | > > > > > > | > > > > > > > > | | > | > > > > > | > > | > > > > > > > > > > > > > > > > > > > | > > > > > > > > < < < < | < < < < < < < < < | < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < < < < < < < < < < < < < < < | < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < | | 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 358 359 360 361 362 363 364 365 366 367 368 369 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 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 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 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 | p->aOut = aNew; p->nAlloc = sqlite4DbMallocSize(p->db, p->aOut); } return SQLITE4_OK; } /* ** Write value v as a varint into buffer p. If parameter bInvert ** is non-zero, write the ones-complement of each byte instead of ** the usual value. */ static void putVarint64(KeyEncoder *p, sqlite4_uint64 v, int bInvert){ unsigned char *z = &p->aOut[p->nOut]; int n = sqlite4PutVarint64(z, v); if( bInvert ){ int i; for(i=0; i<n; i++) z[i] = ~z[i]; } p->nOut += n; } /* ** Write value num into buffer p using the key encoding. */ static void encodeNumericKey(KeyEncoder *p, sqlite4_num num){ if( num.m==0 ){ p->aOut[p->nOut++] = 0x15; /* Numeric zero */ }else if( sqlite4_num_isnan(num) ){ p->aOut[p->nOut++] = 0x06; /* NaN */ }else if( sqlite4_num_isinf(num) ){ p->aOut[p->nOut++] = num.sign ? 0x07 : 0x23; /* Neg and Pos infinity */ }else{ int e; u64 m; int iDigit = 0; u8 aDigit[12]; while( (num.m % 10)==0 ){ num.e++; num.m = num.m / 10; } m = num.m; e = num.e; if( num.e % 2 ){ aDigit[0] = 10 * (m % 10); m = m / 10; e--; iDigit = 1; }else{ iDigit = 0; } while( m ){ aDigit[iDigit++] = (m % 100); m = m / 100; } e = (iDigit + (e/2)); if( e>11 ){ /* Large value */ if( num.sign==0 ){ p->aOut[p->nOut++] = 0x22; putVarint64(p, e, 0); }else{ p->aOut[p->nOut++] = 0x08; putVarint64(p, e, 1); } } else if( e>=0 ){ /* Medium value */ if( num.sign==0 ){ p->aOut[p->nOut++] = 0x17+e; }else{ p->aOut[p->nOut++] = 0x13-e; } } else{ /* Small value */ if( num.sign==0 ){ p->aOut[p->nOut++] = 0x16; putVarint64(p, -1*e, 1); }else{ p->aOut[p->nOut++] = 0x14; putVarint64(p, -1*e, 0); } } /* Write M to the output. */ while( (iDigit--)>0 ){ u8 d = aDigit[iDigit]*2; if( iDigit!=0 ) d |= 0x01; if( num.sign ) d = ~d; p->aOut[p->nOut++] = d; } } } /* ** Encode a single integer using the key encoding. The caller must ** ensure that sufficient space exits in a[] (at least 12 bytes). ** The return value is the number of bytes of a[] used. */ int sqlite4VdbeEncodeIntKey(u8 *a, sqlite4_int64 v){ KeyEncoder s; sqlite4_num num; num = sqlite4_num_from_int64(v); memset(&s, 0, sizeof(s)); s.aOut = a; encodeNumericKey(&s, num); return s.nOut; } /* ** Encode a single column of the key */ static int encodeOneKeyValue( KeyEncoder *p, /* Key encoder context */ Mem *pMem, /* Value to be encoded */ u8 sortOrder, /* Sort order for this value */ u8 isLastValue, /* True if this is the last value in the key */ CollSeq *pColl /* Collating sequence for the value */ ){ int flags = pMem->flags; int i; int n; int iStart = p->nOut; if( flags & MEM_Null ){ if( enlargeEncoderAllocation(p, 1) ) return SQLITE4_NOMEM; p->aOut[p->nOut++] = 0x05; /* NULL */ }else if( flags & (MEM_Real|MEM_Int) ){ if( enlargeEncoderAllocation(p, 16) ) return SQLITE4_NOMEM; encodeNumericKey(p, pMem->u.num); }else if( flags & MEM_Str ){ Mem *pEnc; /* Pointer to memory cell in correct enc. */ Mem sMem; /* Value converted to different encoding */ int enc; /* Required encoding */ /* Figure out the current encoding of pMem, and the encoding required ** (either the encoding specified by the collation sequence, or utf-8 ** if there is no collation sequence). */ |
︙ | ︙ | |||
820 821 822 823 824 825 826 827 828 829 830 831 832 833 | } m = 0; i = 1; do{ m = m*100 + aKey[i]/2; e--; }while( aKey[i++] & 1 ); if( isNeg ){ *pVal = -m; }else{ *pVal = m; } return m==0 ? 0 : i; } | > > | 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 | } m = 0; i = 1; do{ m = m*100 + aKey[i]/2; e--; }while( aKey[i++] & 1 ); while( (e--)>0 ){ m = m*100; } if( isNeg ){ *pVal = -m; }else{ *pVal = m; } return m==0 ? 0 : i; } |
Changes to src/vdbemem.c.
︙ | ︙ | |||
172 173 174 175 176 177 178 | assert( pMem->db==0 || sqlite4_mutex_held(pMem->db->mutex) ); assert( !(fg&(MEM_Str|MEM_Blob)) ); assert( fg&(MEM_Int|MEM_Real) ); assert( (pMem->flags&MEM_RowSet)==0 ); assert( EIGHT_BYTE_ALIGNMENT(pMem) ); | < | < < < < | | 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 | assert( pMem->db==0 || sqlite4_mutex_held(pMem->db->mutex) ); assert( !(fg&(MEM_Str|MEM_Blob)) ); assert( fg&(MEM_Int|MEM_Real) ); assert( (pMem->flags&MEM_RowSet)==0 ); assert( EIGHT_BYTE_ALIGNMENT(pMem) ); if( sqlite4VdbeMemGrow(pMem, nByte, 0) ){ return SQLITE4_NOMEM; } /* For a Real or Integer, use sqlite4_mprintf() to produce the UTF-8 ** string representation of the value. Then, if the required encoding ** is UTF-16le or UTF-16be do a translation. ** ** FIX ME: It would be better if sqlite4_snprintf() could do UTF-16. */ sqlite4_num_to_text(pMem->u.num, pMem->z, (pMem->flags & MEM_Int)==0); pMem->n = sqlite4Strlen30(pMem->z); pMem->enc = SQLITE4_UTF8; pMem->flags |= MEM_Str|MEM_Term; sqlite4VdbeChangeEncoding(pMem, enc); return rc; } |
︙ | ︙ | |||
313 314 315 316 317 318 319 | ** If pMem is a string or blob, then we make an attempt to convert ** it into a integer and return that. If pMem represents an ** an SQL-NULL value, return 0. ** ** If pMem represents a string value, its encoding might be changed. */ i64 sqlite4VdbeIntValue(Mem *pMem){ | < < < < < < < < < < < < < | < > | | > > > > > > > | | < < | | < > | > > > | | < < < < < < < < < < < < < | | > | | < | < < < < < < < < < < < > > > | | < < < < < | 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 358 359 360 361 362 363 364 365 366 367 368 369 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 399 400 401 402 403 404 405 406 407 408 | ** If pMem is a string or blob, then we make an attempt to convert ** it into a integer and return that. If pMem represents an ** an SQL-NULL value, return 0. ** ** If pMem represents a string value, its encoding might be changed. */ i64 sqlite4VdbeIntValue(Mem *pMem){ assert( pMem->db==0 || sqlite4_mutex_held(pMem->db->mutex) ); assert( EIGHT_BYTE_ALIGNMENT(pMem) ); return sqlite4_num_to_int64(sqlite4VdbeNumValue(pMem), 0); } /* ** Return the best representation of pMem that we can get into a ** double. If pMem is already a double or an integer, return its ** value. If it is a string or blob, try to convert it to a double. ** If it is a NULL, return 0.0. */ double sqlite4VdbeRealValue(Mem *pMem){ double rVal = 0.0; assert( pMem->db==0 || sqlite4_mutex_held(pMem->db->mutex) ); assert( EIGHT_BYTE_ALIGNMENT(pMem) ); sqlite4_num_to_double(sqlite4VdbeNumValue(pMem), &rVal); return rVal; } /* ** Extract and return a numeric value from memory cell pMem. This call ** does not modify the contents or flags of *pMem in any way. */ sqlite4_num sqlite4VdbeNumValue(Mem *pMem){ if( pMem->flags & (MEM_Real|MEM_Int) ){ return pMem->u.num; }else if( pMem->flags & (MEM_Str|MEM_Blob) ){ int flags = SQLITE4_PREFIX_ONLY | SQLITE4_IGNORE_WHITESPACE | pMem->enc; return sqlite4_num_from_text(pMem->z, pMem->n, flags, 0); }else{ sqlite4_num zero = {0,0,0,0}; return zero; } } /* ** The MEM structure is already a MEM_Real. Try to also make it a ** MEM_Int if we can. */ void sqlite4VdbeIntegerAffinity(Mem *pMem){ i64 i; int bLossy; assert( pMem->flags & MEM_Real ); assert( (pMem->flags & MEM_RowSet)==0 ); assert( pMem->db==0 || sqlite4_mutex_held(pMem->db->mutex) ); assert( EIGHT_BYTE_ALIGNMENT(pMem) ); i = sqlite4_num_to_int64(pMem->u.num, &bLossy); if( bLossy==0 ){ MemSetTypeFlag(pMem, MEM_Int); pMem->u.num = sqlite4_num_from_int64(i); } } /* ** Convert pMem to type integer. Invalidate any prior representations. */ int sqlite4VdbeMemIntegerify(Mem *pMem){ assert( pMem->db==0 || sqlite4_mutex_held(pMem->db->mutex) ); assert( (pMem->flags & MEM_RowSet)==0 ); assert( EIGHT_BYTE_ALIGNMENT(pMem) ); if( (pMem->flags & MEM_Int)==0 ){ pMem->u.num = sqlite4_num_from_int64(sqlite4VdbeIntValue(pMem)); MemSetTypeFlag(pMem, MEM_Int); } return SQLITE4_OK; } /* ** Convert pMem so that it has types MEM_Real or MEM_Int or both. ** Invalidate any prior representations. ** ** Every effort is made to force the conversion, even if the input ** is a string that does not look completely like a number. Convert ** as much of the string as we can and ignore the rest. */ int sqlite4VdbeMemNumerify(Mem *pMem){ if( (pMem->flags & (MEM_Int|MEM_Real|MEM_Null))==0 ){ int bReal = 0; int flags = (pMem->enc | SQLITE4_PREFIX_ONLY | SQLITE4_IGNORE_WHITESPACE); assert( (pMem->flags & (MEM_Blob|MEM_Str))!=0 ); assert( pMem->db==0 || sqlite4_mutex_held(pMem->db->mutex) ); pMem->u.num = sqlite4_num_from_text(pMem->z, pMem->n, flags, &bReal); MemSetTypeFlag(pMem, (bReal ? MEM_Real : MEM_Int)); } assert( (pMem->flags & (MEM_Int|MEM_Real|MEM_Null))!=0 ); pMem->flags &= ~(MEM_Str|MEM_Blob); return SQLITE4_OK; } /* |
︙ | ︙ | |||
458 459 460 461 462 463 464 | /* ** Delete any previous value and set the value stored in *pMem to val, ** manifest type INTEGER. */ void sqlite4VdbeMemSetInt64(Mem *pMem, i64 val){ sqlite4VdbeMemRelease(pMem); | | | | 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 | /* ** Delete any previous value and set the value stored in *pMem to val, ** manifest type INTEGER. */ void sqlite4VdbeMemSetInt64(Mem *pMem, i64 val){ sqlite4VdbeMemRelease(pMem); pMem->u.num = sqlite4_num_from_int64(val); pMem->flags = MEM_Int; pMem->type = SQLITE4_INTEGER; } #ifndef SQLITE4_OMIT_FLOATING_POINT /* ** Delete any previous value and set the value stored in *pMem to val, ** manifest type REAL. */ void sqlite4VdbeMemSetDouble(Mem *pMem, double val){ if( sqlite4IsNaN(val) ){ sqlite4VdbeMemSetNull(pMem); }else{ sqlite4VdbeMemRelease(pMem); pMem->u.num = sqlite4_num_from_double(val); pMem->flags = MEM_Real; pMem->type = SQLITE4_FLOAT; } } #endif /* |
︙ | ︙ | |||
726 727 728 729 730 731 732 | } /* If one value is a number and the other is not, the number is less. ** If both are numbers, compare as reals if one is a real, or as integers ** if both values are integers. */ if( combined_flags&(MEM_Int|MEM_Real) ){ | | < < | | < < < < < < < < < < < < < < < < < < < < < < < | 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 | } /* If one value is a number and the other is not, the number is less. ** If both are numbers, compare as reals if one is a real, or as integers ** if both values are integers. */ if( combined_flags&(MEM_Int|MEM_Real) ){ if( !(f1&(MEM_Int|MEM_Real)) ) return 1; if( !(f2&(MEM_Int|MEM_Real)) ) return -1; return (sqlite4_num_compare(pMem1->u.num, pMem2->u.num) - 2); } /* If one value is a string and the other is a blob, the string is less. ** If both are strings, compare using the collating functions. */ if( combined_flags&MEM_Str ){ if( (f1 & MEM_Str)==0 ){ |
︙ | ︙ | |||
945 946 947 948 949 950 951 | if( enc!=SQLITE4_UTF8 ){ sqlite4VdbeChangeEncoding(pVal, enc); } }else if( op==TK_UMINUS ) { /* This branch happens for multiple negative signs. Ex: -(-5) */ if( SQLITE4_OK==sqlite4ValueFromExpr(db,pExpr->pLeft,enc,affinity,&pVal) ){ sqlite4VdbeMemNumerify(pVal); | < < < < < | < < | 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 | if( enc!=SQLITE4_UTF8 ){ sqlite4VdbeChangeEncoding(pVal, enc); } }else if( op==TK_UMINUS ) { /* This branch happens for multiple negative signs. Ex: -(-5) */ if( SQLITE4_OK==sqlite4ValueFromExpr(db,pExpr->pLeft,enc,affinity,&pVal) ){ sqlite4VdbeMemNumerify(pVal); pVal->u.num = sqlite4_num_mul(pVal->u.num, sqlite4_num_from_int64(-1)); sqlite4ValueApplyAffinity(pVal, affinity, enc); } }else if( op==TK_NULL ){ pVal = sqlite4ValueNew(db); if( pVal==0 ) goto no_mem; } #ifndef SQLITE4_OMIT_BLOB_LITERAL |
︙ | ︙ |
Changes to src/vdbetrace.c.
︙ | ︙ | |||
115 116 117 118 119 120 121 | } zRawSql += nToken; nextIndex = idx + 1; assert( idx>0 && idx<=p->nVar ); pVar = &p->aVar[idx-1]; if( pVar->flags & MEM_Null ){ sqlite4StrAccumAppend(&out, "NULL", 4); | | | | | | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | } zRawSql += nToken; nextIndex = idx + 1; assert( idx>0 && idx<=p->nVar ); pVar = &p->aVar[idx-1]; if( pVar->flags & MEM_Null ){ sqlite4StrAccumAppend(&out, "NULL", 4); }else if( pVar->flags & (MEM_Int|MEM_Real) ){ char aOut[30]; sqlite4_num_to_text(pVar->u.num, aOut, (pVar->flags & MEM_Real)); sqlite4XPrintf(&out, "%s", aOut); }else if( pVar->flags & MEM_Str ){ #ifndef SQLITE4_OMIT_UTF16 u8 enc = ENC(db); if( enc!=SQLITE4_UTF8 ){ Mem utf8; memset(&utf8, 0, sizeof(utf8)); utf8.db = db; |
︙ | ︙ |
Added test/auth4.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | # 2013 May 8 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # # This file contains tests for the sqlite4_authorizer_push() and # sqlite4_authorizer_pop() API functions. # set testdir [file dirname $argv0] source $testdir/tester.tcl set testprefix auth4 ifcapable !auth { finish_test ; return } #-------------------------------------------------------------------- # Test cases auth4-1.* test that when there are multiple authorizers # on the stack, they are invoked in order from most to least recently # added until all have been invoked or one of them returns other than # SQLITE4_OK. # do_execsql_test 1.0 { CREATE TABLE t1(x, y); INSERT INTO t1 VALUES(1, 'one'); INSERT INTO t1 VALUES(2, 'two'); } proc auth_callback {id code z1 z2 z3 z4} { if {$code == "SQLITE4_READ" && $z1=="t1" && $z2=="y"} { incr ::NAUTH return [lindex $::AUTH $id] } return SQLITE4_OK } sqlite4_authorizer_push db {auth_callback 2} sqlite4_authorizer_push db {auth_callback 1} sqlite4_authorizer_push db {auth_callback 0} foreach {tn codes ncall res} { 1 {SQLITE4_OK SQLITE4_OK SQLITE4_OK} 3 {0 {1 one 2 two}} 2 {SQLITE4_OK SQLITE4_OK SQLITE4_DENY} 3 {1 {access to t1.y is prohibited}} 3 {SQLITE4_DENY SQLITE4_OK SQLITE4_OK} 1 {1 {access to t1.y is prohibited}} 4 {SQLITE4_OK SQLITE4_DENY SQLITE4_OK} 2 {1 {access to t1.y is prohibited}} 5 {SQLITE4_OK SQLITE4_OK SQLITE4_IGNORE} 3 {0 {1 {} 2 {}}} 6 {SQLITE4_IGNORE SQLITE4_OK SQLITE4_OK} 1 {0 {1 {} 2 {}}} 7 {SQLITE4_OK SQLITE4_IGNORE SQLITE4_OK} 2 {0 {1 {} 2 {}}} 8 {SQLITE4_OK SQLITE4_OK SQLITE4_ALLOW} 3 {0 {1 one 2 two}} 9 {SQLITE4_ALLOW SQLITE4_OK SQLITE4_OK} 1 {0 {1 one 2 two}} 10 {SQLITE4_OK SQLITE4_ALLOW SQLITE4_OK} 2 {0 {1 one 2 two}} } { db cache flush set ::AUTH $codes set ::NAUTH 0 do_catchsql_test 1.$tn.1 { SELECT * FROM t1; } $res do_test 1.$tn.2 { set ::NAUTH } $ncall } sqlite4_authorizer_pop db sqlite4_authorizer_pop db sqlite4_authorizer_pop db #-------------------------------------------------------------------- # Test cases auth4-2.* test that the push and pop operations seem to # work correctly. # set ::STACK [list] proc auth_callback {id code z1 z2 z3 z4} { if {$code == "SQLITE4_READ" && $z1=="t1" && $z2=="y"} { lappend ::AUTH $id } return SQLITE4_OK } proc test_stack {} { set ::AUTH [list] db eval { SELECT * FROM t1 } set ::AUTH } proc push {id} { set ::STACK [concat $id $::STACK] sqlite4_authorizer_push db [list auth_callback $id] } proc pop {} { set ::STACK [lrange $::STACK 1 end] sqlite4_authorizer_pop db } do_execsql_test 2.0 { DROP TABLE IF EXISTS t1; CREATE TABLE t1(x, y); INSERT INTO t1 VALUES(1, 'one'); } for {set i 1} {$i <= 100} {incr i} { if { int(rand()*2.0) } { pop } else { push [expr int(rand() * 500.0)] } do_test 2.$i { test_stack } $::STACK } #-------------------------------------------------------------------- # Test that sqlite4_authorizer_pop() returns an error if the stack is # empty when it is called. # db close sqlite4 db test.db do_test 3.1 { sqlite4_authorizer_pop db } {SQLITE4_ERROR} do_test 3.2 { sqlite4_authorizer_push db xyz sqlite4_authorizer_pop db } {SQLITE4_OK} finish_test |
Changes to test/cast.test.
︙ | ︙ | |||
235 236 237 238 239 240 241 | execsql {SELECT CAST(9223372036854774800 AS numeric)} } 9223372036854774800 do_realnum_test cast-3.3 { execsql {SELECT CAST(9223372036854774800 AS real)} } 9.22337203685477e+18 do_test cast-3.4 { execsql {SELECT CAST(CAST(9223372036854774800 AS real) AS integer)} | | | | | | | 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 | execsql {SELECT CAST(9223372036854774800 AS numeric)} } 9223372036854774800 do_realnum_test cast-3.3 { execsql {SELECT CAST(9223372036854774800 AS real)} } 9.22337203685477e+18 do_test cast-3.4 { execsql {SELECT CAST(CAST(9223372036854774800 AS real) AS integer)} } 9223372036854774800 do_test cast-3.5 { execsql {SELECT CAST(-9223372036854774800 AS integer)} } -9223372036854774800 do_test cast-3.6 { execsql {SELECT CAST(-9223372036854774800 AS numeric)} } -9223372036854774800 do_realnum_test cast-3.7 { execsql {SELECT CAST(-9223372036854774800 AS real)} } -9.22337203685477e+18 do_test cast-3.8 { execsql {SELECT CAST(CAST(-9223372036854774800 AS real) AS integer)} } -9223372036854774800 do_test cast-3.11 { execsql {SELECT CAST('9223372036854774800' AS integer)} } 9223372036854774800 do_test cast-3.12 { execsql {SELECT CAST('9223372036854774800' AS numeric)} } 9223372036854774800 do_realnum_test cast-3.13 { execsql {SELECT CAST('9223372036854774800' AS real)} } 9.22337203685477e+18 ifcapable long_double { do_test cast-3.14 { execsql {SELECT CAST(CAST('9223372036854774800' AS real) AS integer)} } 9223372036854774800 } do_test cast-3.15 { execsql {SELECT CAST('-9223372036854774800' AS integer)} } -9223372036854774800 do_test cast-3.16 { execsql {SELECT CAST('-9223372036854774800' AS numeric)} } -9223372036854774800 do_realnum_test cast-3.17 { execsql {SELECT CAST('-9223372036854774800' AS real)} } -9.22337203685477e+18 ifcapable long_double { do_test cast-3.18 { execsql {SELECT CAST(CAST('-9223372036854774800' AS real) AS integer)} } -9223372036854774800 } if {[db eval {PRAGMA encoding}]=="UTF-8"} { do_test cast-3.21 { execsql {SELECT CAST(x'39323233333732303336383534373734383030' AS integer)} } 9223372036854774800 do_test cast-3.22 { execsql {SELECT CAST(x'39323233333732303336383534373734383030' AS numeric)} } 9223372036854774800 do_realnum_test cast-3.23 { execsql {SELECT CAST(x'39323233333732303336383534373734383030' AS real)} } 9.22337203685477e+18 ifcapable long_double { do_test cast-3.24 { execsql { SELECT CAST(CAST(x'39323233333732303336383534373734383030' AS real) AS integer) } } 9223372036854774800 } } do_test case-3.31 { execsql {SELECT CAST(NULL AS numeric)} } {{}} # Test to see if it is possible to trick SQLite into reading past |
︙ | ︙ |
Changes to test/num.test.
︙ | ︙ | |||
84 85 86 87 88 89 90 91 | } {equal} do_test num-6.1.3 { sqlite4_num_to_text [sqlite4_num_div 2 1] } {2} do_test num-6.1.4 { sqlite4_num_to_text [sqlite4_num_div 22 10] } {2.2} finish_test | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 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 | } {equal} do_test num-6.1.3 { sqlite4_num_to_text [sqlite4_num_div 2 1] } {2} do_test num-6.1.4 { sqlite4_num_to_text [sqlite4_num_div 22 10] } {2.2} #------------------------------------------------------------------------- # The following test cases - num-7.* - test the sqlite4_num_from_double() # API function. # foreach {tn in out} { 1 1.0 {sign:0 e:0 m:1} 2 -1.0 {sign:1 e:0 m:1} 3 1.5 {sign:0 e:-1 m:15} 4 -1.5 {sign:1 e:-1 m:15} 5 0.15 {sign:0 e:-2 m:15} 6 -0.15 {sign:1 e:-2 m:15} 7 45.345687 {sign:0 e:-6 m:45345687} 8 1000000000000000000 {sign:0 e:18 m:1} } { do_test num-7.1.$tn { set res [sqlite4_num_from_double $in] list [lindex $res 0] [lindex $res 2] [lindex $res 3] } [list [lindex $out 0] [lindex $out 1] [lindex $out 2]] } #------------------------------------------------------------------------- # Test the boundary conditions in sqlite4_num_from_text() for parsing # values that can fit in a signed 64-bit integer variable. And others. # foreach {tn in out} { 0 9223372036854775806 {sign:0 approx:0 e:0 m:9223372036854775806} 1 9223372036854775807 {sign:0 approx:0 e:0 m:9223372036854775807} 2 -9223372036854775808 {sign:1 approx:0 e:0 m:9223372036854775808} 3 -9223372036854775807 {sign:1 approx:0 e:0 m:9223372036854775807} 4 -9223372036854775806 {sign:1 approx:0 e:0 m:9223372036854775806} } { do_test num-8.1.$tn { sqlite4_num_from_text $in } $out } foreach {tn in out} { 0 9223372036854775808 {sign:0 approx:1 e:1 m:922337203685477581} 1 9223372036854775809 {sign:0 approx:1 e:1 m:922337203685477581} 2 9223372036854775810 {sign:0 approx:0 e:1 m:922337203685477581} 3 9223372036854775811 {sign:0 approx:1 e:1 m:922337203685477581} 4 -9223372036854775809 {sign:1 approx:1 e:1 m:922337203685477581} 5 -9223372036854775810 {sign:1 approx:0 e:1 m:922337203685477581} 6 -9223372036854775811 {sign:1 approx:1 e:1 m:922337203685477581} } { do_test num-8.2.$tn { sqlite4_num_from_text $in } $out } foreach {tn in out} { 0 2147483648 {sign:0 approx:0 e:0 m:2147483648} 1 -2147483648 {sign:1 approx:0 e:0 m:2147483648} } { do_test num-8.3.$tn { sqlite4_num_from_text $in } $out } #------------------------------------------------------------------------- # Test parsing of values with decimal points. # foreach {tn in out} { 0 1.5 {sign:0 approx:0 e:-1 m:15} 1 1.005 {sign:0 approx:0 e:-3 m:1005} 2 00000 {sign:0 approx:0 e:0 m:0} 3 00.000 {sign:0 approx:0 e:-3 m:0} 4 -1.005 {sign:1 approx:0 e:-3 m:1005} 5.1 1 {sign:0 approx:0 e:0 m:1} 5.2 1.0 {sign:0 approx:0 e:-1 m:10} 5.3 1. {sign:0 approx:0 e:0 m:1} 5.4 1e0 {sign:0 approx:0 e:0 m:1} } { do_test num-9.1.$tn { sqlite4_num_from_text $in } [list {*}$out] } #------------------------------------------------------------------------- finish_test |
Added test/num2.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | # 2013 May 29 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. # set testdir [file dirname $argv0] source $testdir/tester.tcl set ::testprefix num2 do_execsql_test 1.1 { SELECT 1.0 } {1.0} do_execsql_test 1.2 { SELECT typeof(1.0) } {real} do_execsql_test 1.3 { SELECT cast(1.0 AS TEXT) } {1.0} do_execsql_test 1.4 { SELECT cast((1.0+1.0) AS TEXT) } {2.0} do_execsql_test 1.5 { SELECT typeof(1.0+1.0) } {real} do_execsql_test 1.6 { SELECT typeof(1.0*1.0) } {real} do_execsql_test 1.7 { SELECT typeof(1.0/1.0) } {real} do_execsql_test 1.8 { SELECT typeof(1.0-1.0) } {real} do_execsql_test 1.8 { SELECT typeof(1.0%1.0) } {real} finish_test |
Changes to test/permutations.test.
︙ | ︙ | |||
181 182 183 184 185 186 187 | misc5.test misc6.test misuse.test notnull.test null.test printf.test quote.test | | | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | misc5.test misc6.test misuse.test notnull.test null.test printf.test quote.test savepoint.test savepoint5.test select1.test select2.test select3.test select4.test select5.test select6.test select7.test select8.test select9.test selectA.test selectB.test selectC.test sort.test storage1.test |
︙ | ︙ |
Changes to test/savepoint2.test.
︙ | ︙ | |||
45 46 47 48 49 50 51 | } } {1024} wal_check_journal_mode savepoint2-1.1 unset -nocomplain ::sig unset -nocomplain SQL | | | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | } } {1024} wal_check_journal_mode savepoint2-1.1 unset -nocomplain ::sig unset -nocomplain SQL set iterations 2 set SQL(1) { DELETE FROM t3 WHERE random()%10!=0; INSERT INTO t3 SELECT randstr(10,10)||x FROM t3; INSERT INTO t3 SELECT randstr(10,10)||x FROM t3; } set SQL(2) { |
︙ | ︙ | |||
146 147 148 149 150 151 152 | # Check that the connection is still running in WAL mode. wal_check_journal_mode savepoint2-$ii.7 } unset -nocomplain ::sig unset -nocomplain SQL | < < | 146 147 148 149 150 151 152 | # Check that the connection is still running in WAL mode. wal_check_journal_mode savepoint2-$ii.7 } unset -nocomplain ::sig unset -nocomplain SQL |
Changes to test/simple.test.
︙ | ︙ | |||
96 97 98 99 100 101 102 | # do_execsql_test 3.3 { INSERT INTO t1 VALUES('one', '111') } {} #------------------------------------------------------------------------- reset_db | < | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | # do_execsql_test 3.3 { INSERT INTO t1 VALUES('one', '111') } {} #------------------------------------------------------------------------- reset_db do_execsql_test 4.1 { CREATE TABLE t1(k PRIMARY KEY, v) } do_execsql_test 4.2 { CREATE INDEX i1 ON t1(v) } do_execsql_test 4.3 { SELECT * FROM sqlite_master } { table t1 t1 2 {CREATE TABLE t1(k PRIMARY KEY, v)} |
︙ | ︙ | |||
1476 1477 1478 1479 1480 1481 1482 1483 1484 | do_execsql_test 75.2 { SELECT count(*) FROM t1 WHERE a = x'12345678' } 1 do_execsql_test 75.3 { SELECT count(*) FROM t1 WHERE b = x'12345678' } 1 finish_test | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 1531 1532 1533 1534 1535 1536 | do_execsql_test 75.2 { SELECT count(*) FROM t1 WHERE a = x'12345678' } 1 do_execsql_test 75.3 { SELECT count(*) FROM t1 WHERE b = x'12345678' } 1 #------------------------------------------------------------------------- # Real vs. integer values. # reset_db do_execsql_test 76.1 { CREATE TABLE t1(a REAL); CREATE TABLE log(x); CREATE TRIGGER BEFORE INSERT ON t1 BEGIN INSERT INTO log VALUES('value = ' || new.a); END; } do_execsql_test 76.2 { INSERT INTO t1 VALUES(-23) } do_execsql_test 76.3 { SELECT * FROM log; } {{value = -23.0}} do_execsql_test 76.4 { CREATE TABLE t2(a REAL, str); } do_execsql_test 76.5 { INSERT INTO t2 VALUES(0.0012345, ''); } do_execsql_test 76.6 { SELECT cast(a AS TEXT) FROM t2 } {0.0012345} #------------------------------------------------------------------------- # Integer keys. # reset_db do_execsql_test 77.1 { CREATE TABLE t1(x) } do_test 77.2 { for {set i 0} {$i < 99} {incr i} { execsql { INSERT INTO t1 VALUES(NULL) } } } {} do_execsql_test 77.3 { INSERT INTO t1 VALUES(NULL) } do_execsql_test 77.4 { INSERT INTO t1 VALUES(NULL) } #------------------------------------------------------------------------- # reset_db do_test 78.1 { execsql { CREATE TABLE t1 (id INTEGER PRIMARY KEY, v); INSERT INTO t1 VALUES(42, 3); } } {} do_execsql_test 78.2 { SELECT id, v FROM t1 WHERE id>1.5; } {42 3} finish_test |
Changes to test/testInt.h.
︙ | ︙ | |||
62 63 64 65 66 67 68 69 70 | #define TESTMEM_CTRL_REPORT 62930001 #define TESTMEM_CTRL_FAULTCONFIG 62930002 #define TESTMEM_CTRL_FAULTREPORT 62930003 sqlite4_mm *test_mm_debug(sqlite4_mm *p); sqlite4_mm *test_mm_faultsim(sqlite4_mm *p); #endif | > > > | 62 63 64 65 66 67 68 69 70 71 72 73 | #define TESTMEM_CTRL_REPORT 62930001 #define TESTMEM_CTRL_FAULTCONFIG 62930002 #define TESTMEM_CTRL_FAULTREPORT 62930003 sqlite4_mm *test_mm_debug(sqlite4_mm *p); sqlite4_mm *test_mm_faultsim(sqlite4_mm *p); /* test_num.c */ int Sqlitetest_num_init(Tcl_Interp *interp); #endif |
Changes to test/test_main.c.
︙ | ︙ | |||
4136 4137 4138 4139 4140 4141 4142 | } return TCL_ERROR; } sqlite4_test_control(SQLITE4_TESTCTRL_OPTIMIZATIONS, db, mask); return TCL_OK; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > | 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 | } return TCL_ERROR; } sqlite4_test_control(SQLITE4_TESTCTRL_OPTIMIZATIONS, db, mask); return TCL_OK; } void sqlite4TestInit(Tcl_Interp *interp){ Sqlitetest_auth_init(interp); Sqlitetest_num_init(interp); } /* ** Register commands with the TCL interpreter. */ int Sqlitetest1_Init(Tcl_Interp *interp){ extern int sqlite4_search_count; |
︙ | ︙ | |||
4391 4392 4393 4394 4395 4396 4397 | { "sqlite4_interrupt", (Tcl_CmdProc*)test_interrupt }, { "sqlite_delete_function", (Tcl_CmdProc*)delete_function }, { "sqlite_delete_collation", (Tcl_CmdProc*)delete_collation }, { "sqlite4_get_autocommit", (Tcl_CmdProc*)get_autocommit }, { "sqlite4_stack_used", (Tcl_CmdProc*)test_stack_used }, { "printf", (Tcl_CmdProc*)test_printf }, { "sqlite4IoTrace", (Tcl_CmdProc*)test_io_trace }, | < < < < < < < < < | 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 | { "sqlite4_interrupt", (Tcl_CmdProc*)test_interrupt }, { "sqlite_delete_function", (Tcl_CmdProc*)delete_function }, { "sqlite_delete_collation", (Tcl_CmdProc*)delete_collation }, { "sqlite4_get_autocommit", (Tcl_CmdProc*)get_autocommit }, { "sqlite4_stack_used", (Tcl_CmdProc*)test_stack_used }, { "printf", (Tcl_CmdProc*)test_printf }, { "sqlite4IoTrace", (Tcl_CmdProc*)test_io_trace }, }; static struct { char *zName; Tcl_ObjCmdProc *xProc; void *clientData; } aObjCmd[] = { { "sqlite4_connection_pointer", get_sqlite_pointer, 0 }, |
︙ | ︙ |