Faster implementation of sqlite3IsBinary().

FossilOrigin-Name: be05d0db09f43cc3362c28273463d1d236af737a4f8a494cf1050da07ed0df47

diff --git a/manifest b/manifest
index 8733168556e3d05260945bf0976a6edf322e29c4..a1c63d4fe760e473f9e6eefac379ee312daab458 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Only\srun\sthe\sconstant\spropagation\soptimization\son\sjoins\ssince\sthat\sis\sthe\nonly\sscenario\swhere\sit\sis\suseful.\s\sThis\ssaves\sprepare\stime\sfor\sthe\scommon\ncase\sof\sa\ssimple\squery.
-D 2018-07-27T17:51:20.481
+C Faster\simplementation\sof\ssqlite3IsBinary().
+D 2018-07-27T18:12:40.840
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -450,7 +450,7 @@ F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
 F src/dbpage.c 4aa7f26198934dbd002e69418220eae3dbc71b010bbac32bd78faf86b52ce6c3
 F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91
 F src/delete.c 4c8c7604277a2041647f96b78f4b9a47858e9217e4fb333d35e7b5ab32c5b57f
-F src/expr.c eaf12eb8eb1dcf6358ee32bb21fd31225783a28ca42b27b1cdc497cc6c356493
+F src/expr.c fe08e0dbf1c561491f879cf4bbf9d3be5ff8ccb9555f60093d3c56c0c37a37b3
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c b1da9ef8dc834603bb0d28972378a7ce65897847f9a1e89ab800bbdf24c788ee
 F src/func.c 7c288b4ce309b5a8b8473514b88e1f8e69a80134509a8c0db8e39c858e367e7f
@@ -462,7 +462,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 8613af9c5ba1503bc68f4e9432c6c024e0fdafdc791575c50f380f73ec91189f
 F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 F src/loadext.c 6aae5739198d96c51ae6eb97c4a5b1744c22ed7a5a565a5399a717780d48a36b
-F src/main.c 73a3db1c9788de97a826ac794bf98a8a811c7594e93bef4f0c085b3f9ddeb76d
+F src/main.c dc023f468eda20aed1fb7c300673cbb40617607b5771840e4229ec239dade250
 F src/malloc.c 07295435093ce354c6d9063ac05a2eeae28bd251d2e63c48b3d67c12c76f7e18
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -1753,7 +1753,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 82c67efb723dba387964f690cd459b420e59e3367d9589016597a76531596391
-R 25b438a30597294879dd2d1bc42efd58
+P 598d608359005b13fa1151c6c69f2fd12ef3ab7f563a035fc4a6f3c569dc6c67
+R 1d79df50e5dd49c24c2c0d46db1dcbfe
 U drh
-Z bbd08ff7c79abf3a0e619aafbe2d2c13
+Z d36b5ae00dc0d8f1b3add00c50463640

diff --git a/manifest.uuid b/manifest.uuid
index 5a7c8b3472c4d09a11a209847f7bf9b22abf1cbb..16820a46c5cb03c00e8064e96cb17d021880b72a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-598d608359005b13fa1151c6c69f2fd12ef3ab7f563a035fc4a6f3c569dc6c67
\ No newline at end of file
+be05d0db09f43cc3362c28273463d1d236af737a4f8a494cf1050da07ed0df47
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 98d93333bf7b521f39085427b9f25c45d6e37adb..5c9a29f63e1c7b7634ef6194c97fd58933618c52 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -328,13 +328,6 @@ CollSeq *sqlite3BinaryCompareCollSeq(
   return pColl;
 }
 
-/*
-** Return true if CollSeq is the default built-in BINARY.
-*/
-int sqlite3IsBinary(const CollSeq *p){
-  return p==0 || sqlite3StrICmp(p->zName,sqlite3StrBINARY)==0;
-}
-
 /*
 ** Generate code for a comparison operator.
 */
@@ -3592,8 +3585,7 @@ expr_code_doover:
     case TK_COLUMN: {
       int iTab = pExpr->iTable;
       if( ExprHasProperty(pExpr, EP_FixedCol) ){
-        pExpr = pExpr->pLeft;
-        goto expr_code_doover;
+        return sqlite3ExprCodeTarget(pParse, pExpr->pLeft,target);
       }
       if( iTab<0 ){
         if( pParse->iSelfTab<0 ){

diff --git a/src/main.c b/src/main.c
index 07f668881022339e37739b92b2cc33234aa85aa9..4ae5c7ecdd4826ecc9440df2863f969f6c74f101 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -910,6 +910,15 @@ static int binCollFunc(
   return rc;
 }
 
+/*
+** Return true if CollSeq is the default built-in BINARY.
+*/
+int sqlite3IsBinary(const CollSeq *p){
+  assert( p==0 || p->xCmp!=binCollFunc || p->pUser!=0
+            || strcmp(p->zName,"BINARY")==0 );
+  return p==0 || (p->xCmp==binCollFunc && p->pUser==0);
+}
+
 /*
 ** Another built-in collating sequence: NOCASE. 
 **