database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-16 23:02:26 +03:00
Code Activity

Basic functionality for descending indices is in place. Lots more testing

Browse Source 
needed. (CVS 2840)

FossilOrigin-Name: 7064433e5b06a4f858f39ce57650fba99fd72ffd
This commit is contained in:
drh
2005-12-21 14:43:11 +00:00
parent 85eeb692f3
commit d28bcb305b
6 changed files with 209 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/build.c
View File

@@ -22,7 +22,7 @@
** COMMIT
** ROLLBACK
**
** $Id: build.c,v 1.359 2005/12/21 03:16:43 drh Exp $
** $Id: build.c,v 1.360 2005/12/21 14:43:12 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -2259,12 +2259,8 @@ void sqlite3CreateIndex(
/* Check to see if we should honor DESC requests on index columns
*/
if( pDb->file_format>=4 || (pDb->descIndex && db->init.busy) ){
#if 0
if( pDb->file_format>=4 || (!pDb->descIndex && !db->init.busy) ){
sortOrderMask = -1; /* Honor DESC */
#else
sortOrderMask = 0;
#endif
}else{
sortOrderMask = 0; /* Ignore DESC */
}
@@ -2396,10 +2392,6 @@ void sqlite3CreateIndex(
v = sqlite3GetVdbe(pParse);
if( v==0 ) goto exit_create_index;
/* Make sure the file_format is at least 4 if we have DESC indices. */
if( descSeen ){
sqlite3MinimumFileFormat(pParse, iDb, 4);
}
/* Create the rootpage for the index
*/
@@ -2407,6 +2399,11 @@ void sqlite3CreateIndex(
sqlite3VdbeAddOp(v, OP_CreateIndex, iDb, 0);
sqlite3VdbeAddOp(v, OP_MemStore, iMem, 0);
/* Make sure the file_format is at least 4 if we have DESC indices. */
if( descSeen ){
sqlite3MinimumFileFormat(pParse, iDb, 4);
}
/* Gather the complete text of the CREATE INDEX statement into
** the zStmt variable
*/
@@ -2478,6 +2475,22 @@ exit_create_index:
return;
}
/*
** Generate code to make sure the file format number is at least minFormat.
** The generated code will increase the file format number if necessary.
*/
void sqlite3MinimumFileFormat(Parse *pParse, int iDb, int minFormat){
Vdbe *v;
v = sqlite3GetVdbe(pParse);
if( v ){
sqlite3VdbeAddOp(v, OP_ReadCookie, iDb, 1);
sqlite3VdbeAddOp(v, OP_Integer, minFormat, 0);
sqlite3VdbeAddOp(v, OP_Ge, 0, sqlite3VdbeCurrentAddr(v)+3);
sqlite3VdbeAddOp(v, OP_Integer, minFormat, 0);
sqlite3VdbeAddOp(v, OP_SetCookie, iDb, 1);
}
}
/*
** Fill the Index.aiRowEst[] array with default information - information
** to be used when we have not run the ANALYZE command.