Avoid unnecessary calls to sqlite3GetCollSeq() for a small performance gain.

FossilOrigin-Name: 503ba172e4c32e288abf006fc5cb53fd2b0313c4ee4c526c2d9c4c21b7178f2d

diff --git a/manifest b/manifest
index 20a58908c73b4012dbb86094d32d58ccd82a8649..0ef21d9b64b75685b238a322435c094414925fde 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Slightly\smore\scompact\simplementation\sof\sthe\sbyte-code\sgenerator\sfor\nthe\sCOMMIT\sand\sROLLBACK\scommands.
-D 2017-07-06T01:28:02.582
+C Avoid\sunnecessary\scalls\sto\ssqlite3GetCollSeq()\sfor\sa\ssmall\sperformance\sgain.
+D 2017-07-06T02:49:26.430
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a
@@ -395,7 +395,7 @@ F src/btree.c 00579ff9c2831d6f98cc993f8f2a34c0ff996e89b3cd2f27928f75796bc3a58a
 F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
 F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
 F src/build.c 74108007d286232fb4290464ee5452fa860c26215f8caa0e6c7cbf69a6fafe8f
-F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
+F src/callback.c bd998420bf59f4b2a2a91aaac012d6225fe22ef1c96d89b77ed73454b39fca08
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 928954802b1397d9fb1378c7eb702c94b4735bbab1d5793e21b6a77734f56a1b
 F src/date.c cc42a41c7422389860d40419a5e3bce5eaf6e7835c3ba2677751dc653550a5c7
@@ -1628,7 +1628,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7b2623f1994384484cf31ae9e443ee20f19b278bf2e91898dbc01828822ddf91
-R 4d02593d6df1e309931684487e86df72
+P 4da663d9863004d8cef58259a043fdcf4f466f80d3714cf58321a52485be8766
+R f4f83b4872dfb399b015b0f0e432a06a
 U drh
-Z 33520d435125fac5bddb62d26dcf7b3f
+Z 4ba842650b935d4f0f8e4df94a86f4d5

diff --git a/manifest.uuid b/manifest.uuid
index b16a61af973c421a8bbf2dfd2a6a855f25316299..93bf5daeb71947d53420c18fa2a78d423df91c84 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4da663d9863004d8cef58259a043fdcf4f466f80d3714cf58321a52485be8766
\ No newline at end of file
+503ba172e4c32e288abf006fc5cb53fd2b0313c4ee4c526c2d9c4c21b7178f2d
\ No newline at end of file

diff --git a/src/callback.c b/src/callback.c
index 23511788674efb11ec172eed4bc4664aeb6e9d15..d5341f873c56de9ff2700cbcbf19241fa07ec34d 100644 (file)
--- a/src/callback.c
+++ b/src/callback.c
@@ -121,7 +121,7 @@ CollSeq *sqlite3GetCollSeq(
 ** from the main database is substituted, if one is available.
 */
 int sqlite3CheckCollSeq(Parse *pParse, CollSeq *pColl){
-  if( pColl ){
+  if( pColl && pColl->xCmp==0 ){
     const char *zName = pColl->zName;
     sqlite3 *db = pParse->db;
     CollSeq *p = sqlite3GetCollSeq(pParse, ENC(db), pColl, zName);