Document SQLITE_DEFAULT_CACHE_SIZE and SQLITE_DEFAULT_TEMP_CACHE_SIZE macros. (CVS...

FossilOrigin-Name: ddcea6f8891b02e64f96591af161feb55c00a72c

diff --git a/manifest b/manifest
index b11068c03a11aa7130c370c2ec02d8d22235c2f6..d72af0138cff0102a0e608187c6604e74a4fd9ec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbuggy\sinteraction\sbetween\s"INSERT\s...\sSELECT"\sprocessing\sand\soptimization\s(2170).\s(CVS\s2319)
-D 2005-02-08T08:42:28
+C Document\sSQLITE_DEFAULT_CACHE_SIZE\sand\sSQLITE_DEFAULT_TEMP_CACHE_SIZE\smacros.\s(CVS\s2320)
+D 2005-02-09T01:40:24
 F Makefile.in d928187101fa3d78426cf48ca30e39d0fb714e57
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -19,7 +19,7 @@ F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
 F main.mk 834d5f2feb8d0f79fb3d2bb9db5afac2b3da7349
 F mkdll.sh 468d4f41d3ea98221371df4825cfbffbaac4d7e4
 F mkopcodec.awk bd46ad001c98dfbab07b1713cb8e692fa0e5415d
-F mkopcodeh.awk cc36b29ff7c996cc482f91a6fd3fa33297b075d5
+F mkopcodeh.awk e4d010870a3e98fd4323635c31565a3ca8584741
 F mkso.sh 125868def279650a07d3f0f5e8476fecf99613fd
 F publish.sh 72bde067dda3fc2d33e92f20253b924e3b97da30
 F spec.template b2f6c4e488cbc3b993a57deba22cbc36203c4da3
@@ -36,7 +36,7 @@ F src/date.c f3d1f5cd1503dabf426a198f3ebef5afbc122a7f
 F src/delete.c 4b94395b52a8f7785acd71135c2ce54f3f5550b3
 F src/experimental.c 8cc66b2be6a011055d75ef19ed2584bcfbb585ad
 F src/expr.c b9ffd249cef8cd0f2d3681da8daf9a4292dcd005
-F src/func.c f096b6771cc0aaa11790aca95773a50a8f74ba73
+F src/func.c 4538f82c8ae5f753012f15c4f22cffd578280c56
 F src/hash.c 2b1b13f7400e179631c83a1be0c664608c8f021f
 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
 F src/insert.c 0456649d4d48396f918e7ea1fecbf3d66ed90816
@@ -60,7 +60,7 @@ F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c 37dd84fd228db14e9006e3eafb389f08d823502f
 F src/shell.c 3cb0ef124ed9cd582ce89aec59ff7c659bc6e61b
 F src/sqlite.h.in c85f6bad9ca7de29f505fe886646cfff7df4c55e
-F src/sqliteInt.h 9a53c5b5c591526e22b89deed38467cb8875b121
+F src/sqliteInt.h 3ebdaeee801f79950c38986639dcfb90782042ed
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
 F src/tclsqlite.c 101994a2c4c0eaa69f1de9bfe4a02167f6049e7d
 F src/test1.c feac8a742aca920c8ab18a43b3208ae3a834fe9d
@@ -181,7 +181,7 @@ F test/select5.test 2d414f712bff8e590091e08f9b7287600731be00
 F test/select6.test 6e5a1a70a788cdbe515d1252dd0917d7e9d1d71e
 F test/select7.test 8f3362336c10d828ab6fe9c1b8897b484da8b592
 F test/sort.test 312eade533cb3c7667110ccfa6e818db1078fd6c
-F test/subquery.test 958bf1752c6b1c5c0b45b243fc74899f2037821e
+F test/subquery.test 3b24c027497191658ef2a97e71e659803b8fbd52
 F test/subselect.test 3f3f7a940dc3195c3139f4d530385cb54665d614
 F test/table.test a2a58cae70ef2511cbf27d40fb8f570106a2677e
 F test/tableapi.test 6a66d58b37d46dc0f2b3c7d4bd2617d209399bd1
@@ -238,7 +238,7 @@ F www/capi3.tcl 9676103393dbf1c313b5618c9da59033f82cd924
 F www/capi3ref.tcl c5a3ae75fc3505c034f3c4bbb62ab94cf359ac39
 F www/changes.tcl c4e713f1a478dba14764119c29cb1b5e66b8242b
 F www/common.tcl de758130d54d95d151ea0d17a2ae5b92e1bb01de
-F www/compile.tcl b4bbd488427dfe88b1a2366cf9f0b4b850e1f271
+F www/compile.tcl 65b26bdfc964b66c5f0af841718a52f9795ceb05
 F www/conflict.tcl cdd0f4b59b0ba6d61f67e6a38f3ae45853bacb30
 F www/copyright-release.html 294e011760c439c44951a6bfecd4c81a1ae359e8
 F www/copyright-release.pdf cfca3558fc97095e57c6117d08f1f5b80d95125a
@@ -270,7 +270,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P f0d3ca10c5bccf8fca7143028ebb3e604c0e3f20
-R 93ae7881c0534be4b69c417087656125
+P c54ad2123693be8777d80343979e3261c4892105
+R 1af2a5239838c226531c539e5c814775
 U danielk1977
-Z 4617442cd0669e690e2b0abf1defb4ca
+Z 0212512ce81305fe90a01955b4ef61b6

diff --git a/manifest.uuid b/manifest.uuid
index dd3c863566b75cb0bea341f5740897b91435a6c5..fbcb5c197b166eaa40ab1d76940bcf1ab18a7bef 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c54ad2123693be8777d80343979e3261c4892105
\ No newline at end of file
+ddcea6f8891b02e64f96591af161feb55c00a72c
\ No newline at end of file

diff --git a/mkopcodeh.awk b/mkopcodeh.awk
index d030cf012dc224f44885f7c97d069e7af1720952..641b987a81e63764e8c9c84839d0f7049e68698a 100644 (file)
--- a/mkopcodeh.awk
+++ b/mkopcodeh.awk
@@ -60,7 +60,7 @@ END {
     if( op[name]>max ) max = op[name]
     printf "#define %-25s %15d", name, op[name]
     if( sameas[op[name]] ) {
-      printf "   /*same as %-12s*/", sameas[op[name]]
+      printf "   /* same as %-12s*/", sameas[op[name]]
     } 
     printf "\n"
 

diff --git a/src/func.c b/src/func.c
index 7e2aab6423d0b3642ec552a8c2ea54b91cb14d10..f5e633c57b208e21c7a1bd3a5b5e5c0cde0433ec 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -16,7 +16,7 @@
 ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: func.c,v 1.93 2005/01/28 01:29:08 drh Exp $
+** $Id: func.c,v 1.94 2005/02/09 01:40:25 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -925,8 +925,7 @@ static void test_error(
   int nArg,
   sqlite3_value **argv
 ){
-  // sqlite3_result_error(pCtx, sqlite3_value_text(argv[0]), 0);
-  sqlite3_result_error(pCtx, 0, 0);
+  sqlite3_result_error(pCtx, sqlite3_value_text(argv[0]), 0);
 }
 #endif /* SQLITE_TEST */
 

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 786a16e4b5b847827fd3ecfee9d2fb2c11ddd269..c79e61733e9bb7c436ccdc95a7077df66c9dd930 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.369 2005/02/08 07:50:42 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.370 2005/02/09 01:40:25 danielk1977 Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -51,14 +51,21 @@
 
 /*
 ** The maximum number of in-memory pages to use for the main database
-** table and for temporary tables.
+** table and for temporary tables. Internally, the MAX_PAGES and 
+** TEMP_PAGES macros are used. To override the default values at
+** compilation time, the SQLITE_DEFAULT_CACHE_SIZE and 
+** SQLITE_DEFAULT_TEMP_CACHE_SIZE macros should be set.
 */
 #ifdef SQLITE_DEFAULT_CACHE_SIZE
 # define MAX_PAGES SQLITE_DEFAULT_CACHE_SIZE
 #else
 # define MAX_PAGES   2000
 #endif
-#define TEMP_PAGES   500
+#ifdef SQLITE_DEFAULT_TEMP_CACHE_SIZE
+# define TEMP_PAGES SQLITE_DEFAULT_TEMP_CACHE_SIZE
+#else
+# define TEMP_PAGES   500
+#endif
 
 /*
 ** If the following macro is set to 1, then NULL values are considered

diff --git a/test/subquery.test b/test/subquery.test
index b92cb57910f3d8f8123d3b3d5727200e4ae23fe6..680a5d483d91d5e8036541dce5cbc6e0ca5978fb 100644 (file)
--- a/test/subquery.test
+++ b/test/subquery.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is testing correlated subqueries
 #
-# $Id: subquery.test,v 1.5 2005/02/08 07:50:42 danielk1977 Exp $
+# $Id: subquery.test,v 1.6 2005/02/09 01:40:25 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -240,11 +240,16 @@ do_test subquery-3.3.3 {
     SELECT max(a), (SELECT d FROM t2 WHERE a=c) FROM t1;
   }
 } {2 two}
-do_test subquery-3.3.3 {
+do_test subquery-3.3.4 {
   execsql {
     SELECT a, (SELECT (SELECT d FROM t2 WHERE a=c)) FROM t1 GROUP BY a;
   }
 } {1 one 2 two}
+do_test subquery-3.3.5 {
+  execsql {
+    SELECT a, (SELECT count(*) FROM t2 WHERE a=c) FROM t1;
+  }
+} {1 1 2 1}
 
 #------------------------------------------------------------------
 # These tests - subquery-4.* - use the TCL statement cache to try 

diff --git a/www/compile.tcl b/www/compile.tcl
index d30f52419d013f51df9f555d1f5aa6caa89fe9d9..5ac6c170bc8d4ece9532412f26fb89a6b1627203 100644 (file)
--- a/www/compile.tcl
+++ b/www/compile.tcl
@@ -1,7 +1,7 @@
 #
 # Run this Tcl script to generate the compile.html file.
 #
-set rcsid {$Id: compile.tcl,v 1.3 2005/01/21 08:13:15 danielk1977 Exp $ }
+set rcsid {$Id: compile.tcl,v 1.4 2005/02/09 01:40:25 danielk1977 Exp $ }
 source common.tcl
 header {Compilation Options For SQLite}
 
@@ -34,16 +34,31 @@ databases). In any case the compile-time default may be overridden by the
 "PRAGMA auto_vacuum" command.
 </p>
 
+<p><b>SQLITE_DEFAULT_CACHE_SIZE=<i>&lt;pages&gt;</i></b><br>
+This macro sets the default size of the page-cache for each attached
+database, in pages. This can be overridden by the "PRAGMA cache_size"
+comamnd. The default value is 2000.
+</p>
+
 <p><b>SQLITE_DEFAULT_PAGE_SIZE=<i>&lt;bytes&gt;</i></b><br>
 This macro is used to set the default page-size used when a
 database is created. The value assigned must be a power of 2. The
 default value is 1024. The compile-time default may be overridden at 
 runtime by the "PRAGMA page_size" command.
+</p>
+
+<p><b>SQLITE_DEFAULT_TEMP_CACHE_SIZE=<i>&lt;pages&gt;</i></b><br>
+This macro sets the default size of the page-cache for temporary files
+created by SQLite to store intermediate results, in pages. It does
+not affect the page-cache for the temp database, where tables created
+using "CREATE TEMP TABLE" are stored. The default value is 500.
+</p>
 
 <p><b>SQLITE_MAX_PAGE_SIZE=<i>&lt;bytes&gt;</i></b><br>
 This is used to set the maximum allowable page-size that can
 be specified by the "PRAGMA page_size" command. The default value
 is 8192.
+</p>
 
 <a name="omitfeatures"></a>
 <h2>Options To Omit Features</h2>