database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2026-01-06 08:01:16 +03:00
Code Activity

Rename vdbeIncrMergerInit() to vdbeMergeEngineInit() - a much more accurate

Browse Source 
name.

FossilOrigin-Name: 5b084a2dd581141b2d0cd9d1a5975625f65ec34d
This commit is contained in:
drh
2014-07-28 19:58:41 +00:00
parent 8a4865f139
commit d906514d98
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C In\svdbesort.c,\srename\svdbeSorterDoCompare()\sto\svdbeMergeEngineCompare()\sand\nmove\sit\scloser\sto\sthe\sone\splace\swhere\sit\sis\scalled.\s\sOther\sminor\scomment\nchanges. C Rename\svdbeIncrMergerInit()\sto\svdbeMergeEngineInit()\s-\sa\smuch\smore\saccurate\nname.
D 2014-07-28T18:57:40.217 D 2014-07-28T19:58:41.375
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -291,7 +291,7 @@ F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
F src/vdbeaux.c 3f1d2baa4a8cbdad33cb255a5f4fd1af7a414683 F src/vdbeaux.c 3f1d2baa4a8cbdad33cb255a5f4fd1af7a414683
F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394 F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
F src/vdbesort.c 2ee0867189cd40199e7d4ed944190b9453e82eec F src/vdbesort.c 143de4b9da4e42a4270cb615dddfc9e8d5224373
F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
@@ -1189,7 +1189,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 518290a7fc0994f9593c5c3ba5b2610a1b86dae1 P 09d50d9f0fe7df26dadb0a332731683a07a89fde
R c47502cced56ced8e0a3892ddc45fd18 R 174b1c88fd5de2d3dafe85889f7f84b2
U drh U drh
Z 1aa9f494eefb9d25759f33de8d16a270 Z dbe81e54bc35480cf09bd2aae1bd678b

2
manifest.uuid
View File

@@ -1 +1 @@
09d50d9f0fe7df26dadb0a332731683a07a89fde 5b084a2dd581141b2d0cd9d1a5975625f65ec34d

8
src/vdbesort.c
View File

@@ -1861,7 +1861,7 @@ static void vdbeMergeEngineCompare(
} }
/* /*
** Allowed values for the eMode parameter to vdbeIncrMergerInit() ** Allowed values for the eMode parameter to vdbeMergeEngineInit()
** and vdbePmaReaderIncrMergeInit(). ** and vdbePmaReaderIncrMergeInit().
*/ */
#define INCRINIT_NORMAL 0 #define INCRINIT_NORMAL 0
@@ -1892,7 +1892,7 @@ static int vdbePmaReaderIncrMergeInit(PmaReader *pReadr, int eMode);
** **
** SQLITE_OK is returned if successful, or an SQLite error code otherwise. ** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
*/ */
static int vdbeIncrMergerInit( static int vdbeMergeEngineInit(
SortSubtask *pTask, /* Thread that will run pMerger */ SortSubtask *pTask, /* Thread that will run pMerger */
MergeEngine *pMerger, /* MergeEngine to initialize */ MergeEngine *pMerger, /* MergeEngine to initialize */
int eMode /* One of the INCRINIT_XXX constants */ int eMode /* One of the INCRINIT_XXX constants */
@@ -1969,7 +1969,7 @@ static int vdbePmaReaderIncrMergeInit(PmaReader *pReadr, int eMode){
SortSubtask *pTask = pIncr->pTask; SortSubtask *pTask = pIncr->pTask;
sqlite3 *db = pTask->pSorter->db; sqlite3 *db = pTask->pSorter->db;
rc = vdbeIncrMergerInit(pTask, pIncr->pMerger, eMode); rc = vdbeMergeEngineInit(pTask, pIncr->pMerger, eMode);
/* Set up the required files for pIncr. A multi-theaded IncrMerge object /* Set up the required files for pIncr. A multi-theaded IncrMerge object
** requires two temp files to itself, whereas a single-threaded object ** requires two temp files to itself, whereas a single-threaded object
@@ -2299,7 +2299,7 @@ static int vdbeSorterSetupMerge(VdbeSorter *pSorter){
}else }else
#endif #endif
{ {
rc = vdbeIncrMergerInit(pTask0, pMain, INCRINIT_NORMAL); rc = vdbeMergeEngineInit(pTask0, pMain, INCRINIT_NORMAL);
pSorter->pMerger = pMain; pSorter->pMerger = pMain;
pMain = 0; pMain = 0;
} }