1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00

Remove an unused #define from whereInt.h. Add comments describing the new sqlite3BtreeCursor() flags.

FossilOrigin-Name: 4c0ba8be43bb7c7100456bd8cd6921c164be31e1
This commit is contained in:
dan
2015-10-23 11:50:23 +00:00
parent fd261ec67e
commit 2b4e95226c
4 changed files with 20 additions and 14 deletions

View File

@@ -1,5 +1,5 @@
C Modifications\sto\spass\sa\sflag\sto\sinternal\sroutine\ssqlite3BtreeCursor()\swhen\sa\scursor\sthat\sis\sused\ssolely\sfor\sdeleting\sb-tree\sentries,\sor\sfor\sobtaining\sthe\scomponents\sof\skeys\sto\sdelete\sfrom\sother\sb-trees,\sis\sopened. C Remove\san\sunused\s#define\sfrom\swhereInt.h.\sAdd\scomments\sdescribing\sthe\snew\ssqlite3BtreeCursor()\sflags.
D 2015-10-22T20:54:33.626 D 2015-10-23T11:50:23.745
F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4 F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
@@ -281,7 +281,7 @@ F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
F src/btree.c 9d684e19f84633323de7a767da2e2b8cf51fa600 F src/btree.c 9d684e19f84633323de7a767da2e2b8cf51fa600
F src/btree.h ccc489437299e48ba5f7d957baa686a9adf2d1ba F src/btree.h cf936d962b3f4179948d53ea58f3580de9b2ed0c
F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0 F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
F src/build.c d6162335d690396dfc5c4bd59e8b2b0c14ba6285 F src/build.c d6162335d690396dfc5c4bd59e8b2b0c14ba6285
F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
@@ -416,7 +416,7 @@ F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
F src/where.c 0bb01a0545afb9ee064d64e4821f34a79742a6cf F src/where.c 0bb01a0545afb9ee064d64e4821f34a79742a6cf
F src/whereInt.h 87b0b66cf0a337c8b282a33e4233e9dad14b626b F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
F src/wherecode.c b924b78acd9e623fb69bfa2cb65cd7d542166dd3 F src/wherecode.c b924b78acd9e623fb69bfa2cb65cd7d542166dd3
F src/whereexpr.c e63244ca06c503e5f3c5b7f3c9aea0db826089ed F src/whereexpr.c e63244ca06c503e5f3c5b7f3c9aea0db826089ed
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1392,10 +1392,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 4315d20200d578c9252dcb26e60739063a8eff1d P cdc92919e600007cae5eb61223684f48a65babc0
R f9b9301d7918e2f3aec8c2ac058ff295 R 372ed0826353f0987c018dd56c7ed9e6
T *branch * btree-fordelete-flag
T *sym-btree-fordelete-flag *
T -sym-trunk *
U dan U dan
Z 49648c9fd09be094288b39d12da5947c Z 7d97368360f9df42d106befc4db01e49

View File

@@ -1 +1 @@
cdc92919e600007cae5eb61223684f48a65babc0 4c0ba8be43bb7c7100456bd8cd6921c164be31e1

View File

@@ -167,9 +167,19 @@ int sqlite3BtreeNewDb(Btree *p);
/* /*
** Flags passed as the third argument to sqlite3BtreeCursor(). ** Flags passed as the third argument to sqlite3BtreeCursor().
**
** For read-only cursors the wrFlag argument is always zero. For read-write
** cursors it may be set to either (BTREE_WRCSR|BTREE_FORDELETE) or
** (BTREE_WRCSR). If the BTREE_FORDELETE flag is set, then the cursor will
** only be used by SQLite for the following:
**
** * to seek to and delete specific entries, and/or
**
** * to read values that will be used to create keys that other
** BTREE_FORDELETE cursors will seek to and delete.
*/ */
#define BTREE_WRCSR 0x00000004 /* read-write cursor */ #define BTREE_WRCSR 0x00000004 /* read-write cursor */
#define BTREE_FORDELETE 0x00000008 /* Cursor is for seek/delete only */ #define BTREE_FORDELETE 0x00000008 /* Cursor is for seek/delete only */
int sqlite3BtreeCursor( int sqlite3BtreeCursor(
Btree*, /* BTree containing table to open */ Btree*, /* BTree containing table to open */

View File

@@ -530,4 +530,3 @@ void sqlite3WhereTabFuncArgs(Parse*, struct SrcList_item*, WhereClause*);
#define WHERE_SKIPSCAN 0x00008000 /* Uses the skip-scan algorithm */ #define WHERE_SKIPSCAN 0x00008000 /* Uses the skip-scan algorithm */
#define WHERE_UNQ_WANTED 0x00010000 /* WHERE_ONEROW would have been helpful*/ #define WHERE_UNQ_WANTED 0x00010000 /* WHERE_ONEROW would have been helpful*/
#define WHERE_PARTIALIDX 0x00020000 /* The automatic index is partial */ #define WHERE_PARTIALIDX 0x00020000 /* The automatic index is partial */
#define WHERE_FORDELETE 0x00040000 /* Table cursor is "for-delete" */