Change the sqlite3_namelist() interface to return a pointer to an array of

pointers to strings, and to avoid duplicates.

FossilOrigin-Name: 702911104424f03f6ebe3beb9090f73b52abe2e655537b8cd8a32e799718ed14

diff --git a/manifest b/manifest
index 4db3f0ea2f1c8c97ec1d7a78830a902b4a6ed0b2..0f0120add79bc4ff535fec155c2fce7e2bbf3a68 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\ssqlite3_namelist()\sroutine\snow\sworks\sfor\sall\sname\stypes.
-D 2017-07-06T18:25:27.748
+C Change\sthe\ssqlite3_namelist()\sinterface\sto\sreturn\sa\spointer\sto\san\sarray\sof\npointers\sto\sstrings,\sand\sto\savoid\sduplicates.
+D 2017-07-06T18:52:36.337
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a
@@ -407,7 +407,7 @@ F src/fkey.c 5ff2c895fe087756d8085dc1a9bc229b5670e2a65c3929dd87c71e43649af333
 F src/func.c 7647140a8624c66cc6e34bdf8005a92390253d6272e87c7901dc8065b563d435
 F src/global.c 8a6ab6b4d91effb96ffa81b39f0d70c862abca157f8aaa194600a4a8b7923344
 F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a
-F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
+F src/hash.h f650e8a7d2cc7585cb741246188ca5c96ed6b72aa1df4ede80f094ea6f2d7eee
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c bb70abf32c7c926745eb550938db9132309584a667a44c2db0e5fa3207600391
@@ -450,14 +450,14 @@ F src/resolve.c d1e69759e7a79c156c692793f5d16f82f9a60ce5e82efd95e4374b2423034946
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c c9f7b7196e196e93979665680d055a789938b8e025556097bf484b184c0dd576
 F src/shell.c a2b148e4ca8eb81b96e1050207c83d4a16ea6bf9182374faee4dd2a43628c291
-F src/sqlite.h.in 35afb0f728107946d24cd19079893b6abdc50c66e2776f6a7e1b8a740fb1517a
+F src/sqlite.h.in 51170f66b6fe5ab8d74caf40a790ea738c34ec0ffc58fca49e00ecf3b070976c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
 F src/sqliteInt.h 7a7cd6f682471cce4afe64216f71fd64c622712aeb9d947c33c38337a7cf19a9
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
-F src/tclsqlite.c c18cf90f93f5ba6d2f9ed90d072bf25b973f490e1c16b3f79d9d6f2db00aa80e
+F src/tclsqlite.c c2390f9f84b036b1a8fbbec84eac924f4094bbf055531e878cd0a987d5464754
 F src/test1.c 1c0726cdf7389ed053a9b9aa0dc3c63f3b9bbc607a25decae6549682008510b3
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c b8434949dfb8aff8dfa082c8b592109e77844c2135ed3c492113839b6956255b
@@ -508,7 +508,7 @@ F src/test_windirent.c 17f91f5f2aa1bb7328abb49414c363b5d2a9d3ff
 F src/test_windirent.h 5d67483a55442e31e1bde0f4a230e6e932ad5906
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
-F src/tokenize.c 81b384fcc8ee8818313da9ce7732823b03e2f126a910fcb6bb82052600de72af
+F src/tokenize.c 3ab044b75a06e2992dcca05f4292ce552eb6c1fc277d856e4508e81b1250ce36
 F src/treeview.c 6cf8d7fe9e63fae57dad1bb57f6615e14eac0c527e43d868e805042cae8ed1f7
 F src/trigger.c d1cae560bfacc8bfb3a072d73658245c1714c0389097da69b4cb23877a082d7e
 F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc
@@ -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 04ef6783a56d87ef7ddc8c58f899d2dd3f5d9c95ac435246e92a670c1eb861e9
-R 5865202d3fcbf67976018c9d406f172d
+P e41d62175b65428567a05130725ad0547ea3e8095cbad4f71948d2d2d9697a0e
+R 64f273e58e69154759e9cc87fb4f8b04
 U drh
-Z a63f9d43390938d12f22aba3f6bca9f3
+Z 7d8fd28d29c72acf900177b93faef8d9

diff --git a/manifest.uuid b/manifest.uuid
index 13720f627440bb8dcbde9aacbff88fadf4f6cde3..e5c4985170d873337a414abccf292b34024f2244 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e41d62175b65428567a05130725ad0547ea3e8095cbad4f71948d2d2d9697a0e
\ No newline at end of file
+702911104424f03f6ebe3beb9090f73b52abe2e655537b8cd8a32e799718ed14
\ No newline at end of file

diff --git a/src/hash.h b/src/hash.h
index 90540eda50ebcff1bd76c1f266cf29312b21d99d..c7aab5bb34ff4b3f3a46d050c7a272fd90716a2a 100644 (file)
--- a/src/hash.h
+++ b/src/hash.h
@@ -91,6 +91,6 @@ void sqlite3HashClear(Hash*);
 /*
 ** Number of entries in a hash table
 */
-/* #define sqliteHashCount(H)  ((H)->count) // NOT USED */
+#define sqliteHashCount(H)  ((H)->count)
 
 #endif /* SQLITE_HASH_H */

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index f1c32d02fdf4f117481980b4594a84ec1563bc07..0a747158dda070b704a09c822ec3ef82b65cfc55 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -8472,26 +8472,26 @@ int sqlite3_preupdate_new(sqlite3 *, int, sqlite3_value **);
 /*
 ** CAPI3REF: List Of Symbolic Names
 **
-** ^The sqlite3_namelist(D,P,F) interface returns a list of symbolic names
+** ^The sqlite3_namelist(D,P,F,N) interface returns a list of symbolic names
 ** and keywords that might appear in valid SQL statements for [connection]
 ** D and that all begin with the prefix P.  ^The F parameter is a bitmask
 ** that determines the kinds of symbolic names and keywords that are found
 ** in the list.  ^Matching against the prefix P is performed using
 ** [sqlite3_strnicmp()] and is thus case insensitive for ASCII characters.
+** ^If the pointer N is not NULL, then the number of matching names is
+** stored in *N.
 **
 ** ^The value returned by sqlite3_namelist() is stored in memory obtained
 ** from [sqlite3_malloc()] and must be released by the caller using
 ** [sqlite3_free()].  ^The sqlite3_namelist() interface returns NULL if a
 ** memory allocation error occurs.
 **
-** ^Elements of the list are in no particular order and may include duplicates.
-** ^Each element is separated from the next by a single 0x00 byte.  ^The list
-** is terminated by a single zero-length entry.
+** ^Elements of the list are unique but are in no particular order.
 **
 ** This interface is intended to facilitate tab-completion for interactive
 ** interfaces for SQLite.
 */
-char *sqlite3_namelist(sqlite3 *db, const char *zPrefix, int typeMask);
+char **sqlite3_namelist(sqlite3 *db, const char *zPrefix, int typeMask, int*);
 
 /*
 ** CAPI3REF: Symbolic Name Typemask Values

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 35c991b2797ec01de65a0834c094552877f5378b..384378fd494ea9a6043e5683e4b425ce38f101f1 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -2670,22 +2670,23 @@ static int SQLITE_TCLAPI DbObjCmd(
   case DB_NAMELIST: {
     const char *zPrefix;
     int mask;
-    char *zList;
+    char **azList;
+    int nList, i;
     if( objc!=4 ){
       Tcl_WrongNumArgs(interp, 2, objv, "PREFIX MASK");
       return TCL_ERROR;
     }
     zPrefix = Tcl_GetString(objv[2]);
     if( Tcl_GetIntFromObj(interp, objv[3], &mask) ) return TCL_ERROR;
-    zList = sqlite3_namelist(pDb->db, zPrefix, mask);
-    if( zList ){
-      Tcl_Obj *pList = Tcl_NewObj();
-      int i, n;
-      for(i=0; zList[i]; i += n+1){
-        n = (int)strlen(&zList[i]);
-        Tcl_ListObjAppendElement(interp, pList, Tcl_NewStringObj(&zList[i],-1));
+    azList = sqlite3_namelist(pDb->db, zPrefix, mask, &nList);
+    if( azList ){
+      Tcl_Obj *pList = Tcl_NewListObj(nList, 0);
+      for(i=0; azList[i]; i++){
+        Tcl_ListObjAppendElement(interp, pList,
+                                 Tcl_NewStringObj(azList[i],-1));
       }
-      sqlite3_free(zList);
+      assert( i==nList );
+      sqlite3_free(azList);
       Tcl_SetObjResult(interp, pList);
     }
     break;

diff --git a/src/tokenize.c b/src/tokenize.c
index 42e83eb5a56de5a2fdfdc02e7b5516738adbf4c5..30468d92921d7570fe99162fc95f407d99db4d85 100644 (file)
--- a/src/tokenize.c
+++ b/src/tokenize.c
@@ -619,7 +619,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){
 ** of names for the sqlite3_namelist() interface
 */
 struct NameAccum {
-  StrAccum x;              /* Name list string stored here */
+  Hash x;                  /* Hash table of all names */
   const char *zPrefix;     /* All names must start with this prefix */
   int nPrefix;             /* Size of the prefix in bytes */
 };
@@ -630,11 +630,14 @@ struct NameAccum {
 ** of the name in bytes, or -1 if zName is zero-terminated.
 */
 static void addName(struct NameAccum *p, const char *zName, int nName){
+  char *zCopy;
+  char *zOld;
   if( nName<0 ) nName = sqlite3Strlen30(zName);
   if( nName<p->nPrefix ) return;
   if( sqlite3StrNICmp(p->zPrefix, zName, p->nPrefix)!=0 ) return;
-  sqlite3StrAccumAppend(&p->x, zName, nName);
-  sqlite3StrAccumAppend(&p->x, "", 1);
+  zCopy = sqlite3_mprintf("%.*s", nName, zName);
+  zOld = sqlite3HashInsert(&p->x, zCopy, zCopy);
+  sqlite3_free(zOld);  
 }
 
 /*
@@ -650,13 +653,20 @@ static void addName(struct NameAccum *p, const char *zName, int nName){
 ** Each word is separated from the next by a single 0x00 byte.  The list
 ** is terminated by two 0x00 bytes in a row.
 */
-char *sqlite3_namelist(sqlite3 *db, const char *zPrefix, int typeMask){
+char **sqlite3_namelist(
+  sqlite3 *db,             /* Database from which to extract names */
+  const char *zPrefix,     /* Only extract names matching this prefix */
+  int typeMask,            /* Mask of the types of names to extract */
+  int *pCount              /* Write the number of names here */
+){
   struct NameAccum x;
-  int i;
+  int i, n, nEntry;
   HashElem *j;
+  char **azAns;
+  char *zFree;
   x.zPrefix = zPrefix;
   x.nPrefix = sqlite3Strlen30(zPrefix);
-  sqlite3StrAccumInit(&x.x, 0, 0, 0, 100000000);
+  sqlite3HashInit(&x.x);
   if( typeMask & SQLITE_NAMETYPE_KEYWORD ){
     for(i=0; i<ArraySize(aKWOffset); i++){
       addName(&x, zKWText + aKWOffset[i], aKWLen[i]);
@@ -724,6 +734,32 @@ char *sqlite3_namelist(sqlite3 *db, const char *zPrefix, int typeMask){
         }
       }
     }
+    if( typeMask & SQLITE_NAMETYPE_COLUMN ){
+      addName(&x, "rowid", -1);
+    }
+  }
+  nEntry = sqliteHashCount(&x.x);
+  if( pCount ) *pCount = nEntry;
+  n = 0;
+  for(j=sqliteHashFirst(&x.x); j; j=sqliteHashNext(j)){
+    n += sqlite3Strlen30((const char*)sqliteHashData(j));
+  }
+  zFree = sqlite3_malloc( (nEntry+1)*sizeof(char*) + n + nEntry );
+  if( zFree ){
+    memset(zFree, 0, (nEntry+1)*sizeof(char*) + n + nEntry );
+    azAns = (char**)zFree;
+    zFree += (nEntry+1)*sizeof(char*);
+    for(i=0, j=sqliteHashFirst(&x.x); j; i++, j=sqliteHashNext(j)){
+      const char *zName = (const char*)sqliteHashData(j);
+      azAns[i] = zFree;
+      n = sqlite3Strlen30(zName);
+      memcpy(zFree, zName, n+1);
+      zFree += n+1;
+    }
+  }
+  for(j=sqliteHashFirst(&x.x); j; j=sqliteHashNext(j)){
+    sqlite3_free(sqliteHashData(j));
   }
-  return sqlite3StrAccumFinish(&x.x);
+  sqlite3HashClear(&x.x);
+  return azAns;
 }