commit ededfd5e83236dfa0359ff8eade6de0c269016ec
author danielk1977 <danielk1977@noemail.net> Thu Jun 17 07:53:01 2004 +0000
committer danielk1977 <danielk1977@noemail.net> Thu Jun 17 07:53:01 2004 +0000
tree 458ab4067694d5e8f17d8ceb991aaef1716ee98d
parent f736b771608d7d9bd3a42c6cdd30131700cad962

Remove redundant opcodes OP_MakeKey and OP_MakeIdxKey. (CVS 1612)

FossilOrigin-Name: a71a9ff114f2162696d8d37fbc87b315568f6dcb

src/where.c

diff --git a/src/where.c b/src/where.c
index 40ba9fb..2afb825 100644
--- a/src/where.c
+++ b/src/where.c
@@ -12,7 +12,7 @@
 ** This module contains C code that generates VDBE code used to process
 ** the WHERE clause of SQL statements.
 **
-** $Id: where.c,v 1.106 2004/06/16 12:03:10 danielk1977 Exp $
+** $Id: where.c,v 1.107 2004/06/17 07:53:04 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -827,7 +827,7 @@
       sqlite3VdbeAddOp(v, OP_Goto, 0, brk);
 
       /* Generate an index key from the top nColumn elements of the stack */
-      sqlite3VdbeAddOp(v, OP_MakeKey, nColumn, 0);
+      sqlite3VdbeAddOp(v, OP_MakeRecord, nColumn, 0);
       sqlite3IndexAffinityStr(v, pIdx);
       sqlite3VdbeAddOp(v, OP_MemStore, pLevel->iMem, 0);
 
@@ -1029,7 +1029,7 @@
         sqlite3VdbeAddOp(v, OP_NotNull, -nCol, sqlite3VdbeCurrentAddr(v)+3);
         sqlite3VdbeAddOp(v, OP_Pop, nCol, 0);
         sqlite3VdbeAddOp(v, OP_Goto, 0, brk);
-        sqlite3VdbeAddOp(v, OP_MakeKey, nCol, 0);
+        sqlite3VdbeAddOp(v, OP_MakeRecord, nCol, 0);
         sqlite3IndexAffinityStr(v, pIdx);
         if( pLevel->bRev ){
           int op = leFlag ? OP_MoveLe : OP_MoveLt;
@@ -1083,7 +1083,7 @@
         sqlite3VdbeAddOp(v, OP_NotNull, -nCol, sqlite3VdbeCurrentAddr(v)+3);
         sqlite3VdbeAddOp(v, OP_Pop, nCol, 0);
         sqlite3VdbeAddOp(v, OP_Goto, 0, brk);
-        sqlite3VdbeAddOp(v, OP_MakeKey, nCol, 0);
+        sqlite3VdbeAddOp(v, OP_MakeRecord, nCol, 0);
         sqlite3IndexAffinityStr(v, pIdx);
         if( pLevel->bRev ){
           pLevel->iMem = pParse->nMem++;