database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Improvement to the OP_Permutation opcode to prevent it from using CPU cycles

Browse Source 
for initialization in prepared statements that do not use that opcode.

FossilOrigin-Name: b4a98f65564a0d9fba2fef95ebd00a39b3e1e572
This commit is contained in:
drh
2017-01-26 18:00:00 +00:00
parent fae58d51ce
commit b7dab70a92
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Remove\sthe\sobsolete\slastRowid\scache\sfrom\sthe\ssqlite3VdbeExec()\sfor\sa\ssize\nreduction\sand\sperformance\simprovement. C Improvement\sto\sthe\sOP_Permutation\sopcode\sto\sprevent\sit\sfrom\susing\sCPU\scycles\nfor\sinitialization\sin\sprepared\sstatements\sthat\sdo\snot\suse\sthat\sopcode.
D 2017-01-26T17:26:44.998 D 2017-01-26T18:00:00.328
F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -457,7 +457,7 @@ F src/update.c b356b29d04c71f33c779f2cb557cf953819bdd7a
F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
F src/util.c a88b0466fddf445ce752226d4698ca3faada620a F src/util.c a88b0466fddf445ce752226d4698ca3faada620a
F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16 F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
F src/vdbe.c 96f1639399feb97500d927219b87183aad3ef94c F src/vdbe.c c27cc34be1d9169c1c191238025781684bdcd4ec
F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e
F src/vdbeapi.c 7a65f10684982daecfce50f557f2632b7f20b198 F src/vdbeapi.c 7a65f10684982daecfce50f557f2632b7f20b198
@@ -1547,7 +1547,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 1e96e5ec1ee617cb5b5cbdc5a2ee79c8cc35821d P b4803184652e5f4f823c1521412bc480baeb3dbf
R f17134692e3127e9f97d9e12f2b91a46 R 5d2cc4b6c4ee841c772ca9230a25766d
U drh U drh
Z 7f3d9d2e9e1038bd56eb8c4623402887 Z 39169c59805d0271c33a4d8ecd6430ca

2
manifest.uuid
View File

@@ -1 +1 @@
b4803184652e5f4f823c1521412bc480baeb3dbf b4a98f65564a0d9fba2fef95ebd00a39b3e1e572

20
src/vdbe.c
View File

@@ -583,7 +583,6 @@ int sqlite3VdbeExec(
Mem *pIn2 = 0; /* 2nd input operand */ Mem *pIn2 = 0; /* 2nd input operand */
Mem *pIn3 = 0; /* 3rd input operand */ Mem *pIn3 = 0; /* 3rd input operand */
Mem *pOut = 0; /* Output operand */ Mem *pOut = 0; /* Output operand */
int *aPermute = 0; /* Permutation of columns for OP_Compare */
#ifdef VDBE_PROFILE #ifdef VDBE_PROFILE
u64 start; /* CPU clock count at start of opcode */ u64 start; /* CPU clock count at start of opcode */
#endif #endif
@@ -2136,8 +2135,8 @@ case OP_ElseNotEq: { /* same as TK_ESCAPE, jump */
/* Opcode: Permutation * * * P4 * /* Opcode: Permutation * * * P4 *
** **
** Set the permutation used by the OP_Compare operator to be the array ** Set the permutation used by the OP_Compare operator in the next
** of integers in P4. ** instruction. The permutation is stored in the P4 operand.
** **
** The permutation is only valid until the next OP_Compare that has ** The permutation is only valid until the next OP_Compare that has
** the OPFLAG_PERMUTE bit set in P5. Typically the OP_Permutation should ** the OPFLAG_PERMUTE bit set in P5. Typically the OP_Permutation should
@@ -2149,7 +2148,8 @@ case OP_ElseNotEq: { /* same as TK_ESCAPE, jump */
case OP_Permutation: { case OP_Permutation: {
assert( pOp->p4type==P4_INTARRAY ); assert( pOp->p4type==P4_INTARRAY );
assert( pOp->p4.ai ); assert( pOp->p4.ai );
aPermute = pOp->p4.ai + 1; assert( pOp[1].opcode==OP_Compare );
assert( pOp[1].p5 & OPFLAG_PERMUTE );
break; break;
} }
@@ -2182,8 +2182,17 @@ case OP_Compare: {
int idx; int idx;
CollSeq *pColl; /* Collating sequence to use on this term */ CollSeq *pColl; /* Collating sequence to use on this term */
int bRev; /* True for DESCENDING sort order */ int bRev; /* True for DESCENDING sort order */
int *aPermute; /* The permutation */
if( (pOp->p5 & OPFLAG_PERMUTE)==0 ) aPermute = 0; if( (pOp->p5 & OPFLAG_PERMUTE)==0 ){
aPermute = 0;
}else{
assert( pOp>aOp );
assert( pOp[-1].opcode==OP_Permutation );
assert( pOp[-1].p4type==P4_INTARRAY );
aPermute = pOp[-1].p4.ai + 1;
assert( aPermute!=0 );
}
n = pOp->p3; n = pOp->p3;
pKeyInfo = pOp->p4.pKeyInfo; pKeyInfo = pOp->p4.pKeyInfo;
assert( n>0 ); assert( n>0 );
@@ -2216,7 +2225,6 @@ case OP_Compare: {
break; break;
} }
} }
aPermute = 0;
break; break;
} }