dblStrHash for faster fingerprints

Signed-off-by: Mark Hannum <mhannum@bloomberg.net>

Author: markhannum

sqlite/src/vdbeInt.h

@@ -21,6 +21,7 @@
 #if defined(SQLITE_BUILDING_FOR_COMDB2)
 #include <time.h>
 #include <strings.h>
+#include <plhash_glue.h>
 #endif /* defined(SQLITE_BUILDING_FOR_COMDB2) */
 
 /*
@@ -569,6 +570,9 @@ struct Vdbe {
 #ifdef SQLITE_ENABLE_NORMALIZE
   char *zNormSql;         /* Normalization of the associated SQL statement */
   DblquoteStr *pDblStr;   /* List of double-quoted string literals */
+#if defined(SQLITE_BUILDING_FOR_COMDB2)
+  hash_t *dblStrHash;
+#endif
 #endif
   void *pFree;            /* Free this when deleting the vdbe */
   VdbeFrame *pFrame;      /* Parent frame */

sqlite/src/vdbeaux.c

@@ -104,9 +104,17 @@ void sqlite3VdbeAddDblquoteStr(sqlite3 *db, Vdbe *p, const char *z){
     DblquoteStr *pStr = sqlite3DbMallocRawNN(db,
                             sizeof(*pStr)+n+1-sizeof(pStr->z));
     if( pStr ){
+#if defined(SQLITE_BUILDING_FOR_COMDB2)
+      if (!p->dblStrHash) {
+        p->dblStrHash = hash_init_str(0);
+      }
+#endif
       pStr->pNextStr = p->pDblStr;
       p->pDblStr = pStr;
       memcpy(pStr->z, z, n+1);
+#if defined(SQLITE_BUILDING_FOR_COMDB2)
+      hash_add(p->dblStrHash, pStr->z);
+#endif
     }
   }
 }
@@ -124,15 +132,21 @@ int sqlite3VdbeUsesDoubleQuotedString(
   ,int iDefDqId           /* Return value when there is no Vdbe. */
 #endif /* defined(SQLITE_BUILDING_FOR_COMDB2) */
 ){
-  DblquoteStr *pStr;
   assert( zId!=0 );
 #if defined(SQLITE_BUILDING_FOR_COMDB2)
   if( pVdbe==0 ) return iDefDqId;
 #endif /* defined(SQLITE_BUILDING_FOR_COMDB2) */
   if( pVdbe->pDblStr==0 ) return 0;
+#if defined(SQLITE_BUILDING_FOR_COMDB2)
+  if (pVdbe->dblStrHash) {
+    return (hash_find(pVdbe->dblStrHash, zId)) != 0;
+  }
+#else
+  DblquoteStr *pStr;
   for(pStr=pVdbe->pDblStr; pStr; pStr=pStr->pNextStr){
     if( strcmp(zId, pStr->z)==0 ) return 1;
   }
+#endif
   return 0;
 }
 #endif
@@ -3485,6 +3499,13 @@ void sqlite3VdbeClearObject(sqlite3 *db, Vdbe *p){
       pNext = pThis->pNextStr;
       sqlite3DbFree(db, pThis);
     }
+#if defined(SQLITE_BUILDING_FOR_COMDB2)
+    if (p->dblStrHash) {
+      hash_clear(p->dblStrHash);
+      hash_free(p->dblStrHash);
+      p->dblStrHash = NULL;
+    }
+#endif
   }
 #endif
 #ifdef SQLITE_ENABLE_STMT_SCANSTATUS