Disable external merge source when SQLITE_TEMP_STORE==3. Add documentation

to the OP_OpenSorter opcode.

FossilOrigin-Name: 5a690486811379cea40c6ed48b2902f421234832

diff --git a/manifest b/manifest
index 00ce24eee83dc59f85d682ef86cf64538445a573..e276e4913bd587cd08ae3ca40c4b9863c8743056 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sSQLITE_DISABLE_DIRSYNC\scompile\stime\soption.
-D 2011-08-25T13:46:32.991
+C Disable\sexternal\smerge\ssource\swhen\sSQLITE_TEMP_STORE==3.\s\sAdd\sdocumentation\nto\sthe\sOP_OpenSorter\sopcode.
+D 2011-08-25T18:01:28.912
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -183,7 +183,7 @@ F src/select.c d219c4b68d603cc734b6f9b1e2780fee12a1fa0d
 F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
 F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb
 F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
-F src/sqliteInt.h ba4a6d6288efb25b84bc0d7d0aaf80f9b42523ba
+F src/sqliteInt.h 18876859c6a60fd42b4e3772229387390702f096
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -238,7 +238,7 @@ F src/update.c 74a6cfb34e9732c1e2a86278b229913b4b51eeec
 F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
 F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
 F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
-F src/vdbe.c 22d0d5bc8e8e467e1e0fa20a0a6b21c297f5601f
+F src/vdbe.c 8f18a857e7cc1eba1a59d2ab011d4cf0d05f48ad
 F src/vdbe.h 2bf6ec77d8b9980fc19da6e0b0a36d0dbf884ce4
 F src/vdbeInt.h f9250326f264ca5f100acc19e9c07096bb889096
 F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
@@ -961,7 +961,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P ddb8d3e80df868bda0704feed31171fa055432b5
-R 8156f8cef08e6f8b5e271e42f6684a40
-U dan
-Z 3bd35289d7fa3fba45bc6fb085762931
+P 6deb3ea1f080324ea23ebdc9008753fbbc4063e2
+R e577d29da99527ab60f52d6969060c0e
+U drh
+Z 85fefc5da7f19ffe66dceac3b6402fe3

diff --git a/manifest.uuid b/manifest.uuid
index 2beb2081a6d976a0b7e0e2cc1d990fe7289aacfe..57ec6ddcd44748f91f6541ff0cce32f293899d61 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6deb3ea1f080324ea23ebdc9008753fbbc4063e2
\ No newline at end of file
+5a690486811379cea40c6ed48b2902f421234832
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index bcf6a591af3a5e159898fa1a99bf2e86182725ce..c97499b30df210db0e2e16ff57251ef39a463aea 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -366,6 +366,14 @@
 # define SQLITE_TEMP_STORE 1
 #endif
 
+/*
+** If all temporary storage is in-memory, then omit the external merge-sort
+** logic since it is superfluous.
+*/
+#if SQLITE_TEMP_STORE==3 && !defined(SQLITE_OMIT_MERGE_SORT)
+# define SQLITE_OMIT_MERGE_SORT
+#endif
+
 /*
 ** GCC does not define the offsetof() macro so we'll have to do it
 ** ourselves.

diff --git a/src/vdbe.c b/src/vdbe.c
index 3cab3b3fd5fbceb7653f9e59bdfa4f0d16e1835a..be07f60872bcff65bbe996ac0dc6ca78ab0f1328 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -3156,6 +3156,12 @@ case OP_OpenWrite: {
 ** by this opcode will be used for automatically created transient
 ** indices in joins.
 */
+/* Opcode: OpenSorter P1 P2 * P4 *
+**
+** This opcode works like OP_OpenEphemeral except that it opens
+** a transient index that is specifically designed to sort large
+** tables using an external merge-sort algorithm.
+*/
 case OP_OpenSorter: 
 case OP_OpenAutoindex: 
 case OP_OpenEphemeral: {