database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Eliminate the OP_SortMakeRec and OP_SortCallback opcodes. Sort using the

Browse Source 
standard record format. (CVS 1426)

FossilOrigin-Name: 25643a0137d395572f16cfec3ab3327d913138ba
This commit is contained in:
drh
2004-05-21 03:01:58 +00:00
parent 736c22b803
commit ce665cf60e
5 changed files with 20 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/select.c
View File

@@ -12,7 +12,7 @@
** This file contains C code routines that are called by the parser
** to handle SELECT statements in SQLite.
**
** $Id: select.c,v 1.173 2004/05/21 02:14:25 drh Exp $
** $Id: select.c,v 1.174 2004/05/21 03:01:59 drh Exp $
*/
#include "sqliteInt.h"
@@ -486,7 +486,7 @@ static int selectInnerLoop(
case SRT_Callback:
case SRT_Sorter: {
if( pOrderBy ){
sqlite3VdbeAddOp(v, OP_SortMakeRec, nColumn, 0);
sqlite3VdbeAddOp(v, OP_MakeRecord, nColumn, 0);
pushOntoSorter(pParse, v, pOrderBy);
}else{
assert( eDest==SRT_Callback );
@@ -566,10 +566,6 @@ static void generateSortTail(
sqlite3VdbeAddOp(v, OP_MemIncr, p->iLimit, end2);
}
switch( eDest ){
case SRT_Callback: {
sqlite3VdbeAddOp(v, OP_SortCallback, nColumn, 0);
break;
}
case SRT_Table:
case SRT_TempTable: {
sqlite3VdbeAddOp(v, OP_NewRecno, iParm, 0);
@@ -593,6 +589,7 @@ static void generateSortTail(
sqlite3VdbeAddOp(v, OP_Goto, 0, end1);
break;
}
case SRT_Callback:
case SRT_Subroutine: {
int i;
sqlite3VdbeAddOp(v, OP_Integer, p->pEList->nExpr, 0);
@@ -600,7 +597,11 @@ static void generateSortTail(
for(i=0; i<nColumn; i++){
sqlite3VdbeAddOp(v, OP_Column, -1-i, i);
}
sqlite3VdbeAddOp(v, OP_Gosub, 0, iParm);
if( eDest==SRT_Callback ){
sqlite3VdbeAddOp(v, OP_Callback, nColumn, 0);
}else{
sqlite3VdbeAddOp(v, OP_Gosub, 0, iParm);
}
sqlite3VdbeAddOp(v, OP_Pop, 2, 0);
break;
}