diff options
author | drh <drh@noemail.net> | 2015-06-12 12:54:15 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2015-06-12 12:54:15 +0000 |
commit | 36b80349b7b1b05c53f98bd6d34716d1bc3c6154 (patch) | |
tree | 61bb70dc8efd45c5b6d2791f1bc32065b267a01d /src/expr.c | |
parent | aca55cfec3c5261ffe48f0485c2c08fb36fdae1d (diff) | |
parent | 97bae794c202a995b9073866e894a3fc03381e1f (diff) | |
download | sqlite-36b80349b7b1b05c53f98bd6d34716d1bc3c6154.tar.gz sqlite-36b80349b7b1b05c53f98bd6d34716d1bc3c6154.zip |
Add the OP_ColumnsUsed opcode (when compiled with
SQLITE_ENABLE_COLUMN_USED_MASK) as a hint to the b-tree layer as to which
columns of a btree cursor will be used.
FossilOrigin-Name: 711a176cbfad5dde6defa9648fba6d0d663af134
Diffstat (limited to 'src/expr.c')
-rw-r--r-- | src/expr.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/expr.c b/src/expr.c index 06993e737..ddf939d3f 100644 --- a/src/expr.c +++ b/src/expr.c @@ -2208,17 +2208,6 @@ static void sqlite3ExprCodeIN( } #endif /* SQLITE_OMIT_SUBQUERY */ -/* -** Duplicate an 8-byte value -*/ -static char *dup8bytes(Vdbe *v, const char *in){ - char *out = sqlite3DbMallocRaw(sqlite3VdbeDb(v), 8); - if( out ){ - memcpy(out, in, 8); - } - return out; -} - #ifndef SQLITE_OMIT_FLOATING_POINT /* ** Generate an instruction that will put the floating point @@ -2231,12 +2220,10 @@ static char *dup8bytes(Vdbe *v, const char *in){ static void codeReal(Vdbe *v, const char *z, int negateFlag, int iMem){ if( ALWAYS(z!=0) ){ double value; - char *zV; sqlite3AtoF(z, &value, sqlite3Strlen30(z), SQLITE_UTF8); assert( !sqlite3IsNaN(value) ); /* The new AtoF never returns NaN */ if( negateFlag ) value = -value; - zV = dup8bytes(v, (char*)&value); - sqlite3VdbeAddOp4(v, OP_Real, 0, iMem, 0, zV, P4_REAL); + sqlite3VdbeAddOp4Dup8(v, OP_Real, 0, iMem, 0, (u8*)&value, P4_REAL); } } #endif @@ -2262,10 +2249,8 @@ static void codeInteger(Parse *pParse, Expr *pExpr, int negFlag, int iMem){ assert( z!=0 ); c = sqlite3DecOrHexToI64(z, &value); if( c==0 || (c==2 && negFlag) ){ - char *zV; if( negFlag ){ value = c==2 ? SMALLEST_INT64 : -value; } - zV = dup8bytes(v, (char*)&value); - sqlite3VdbeAddOp4(v, OP_Int64, 0, iMem, 0, zV, P4_INT64); + sqlite3VdbeAddOp4Dup8(v, OP_Int64, 0, iMem, 0, (u8*)&value, P4_INT64); }else{ #ifdef SQLITE_OMIT_FLOATING_POINT sqlite3ErrorMsg(pParse, "oversized integer: %s%s", negFlag ? "-" : "", z); |