Simplifications to the SQL function and aggregate calling procedures.

FossilOrigin-Name: 3467049a1705b49905ea88a5c6becb6fe318f2fa

diff --git a/manifest b/manifest
index 658142eff59ff4fc5deba857bc2d97d311145459..0b87bd95d0781356c1f738e0eee5356e5f17f3e8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplification\sto\sthe\srandom\srowid\spicking\slogic\sthat\sbegins\srunning\swhen\nthe\smaximum\spossible\srowid\shas\salready\sbeen\sused.
-D 2014-09-25T12:31:28.476
+C Simplifications\sto\sthe\sSQL\sfunction\sand\saggregate\scalling\sprocedures.
+D 2014-09-25T13:17:30.283
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -184,7 +184,7 @@ F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
 F src/expr.c f32119248996680aa73c5c37bfdd42820804dc17
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
-F src/func.c 727a324e87a3392a47e44568b901d2fb96ba0ed4
+F src/func.c ba47c1671ab3cfdafa6e9d6ee490939ea578adee
 F src/global.c 5110fa12e09729b84eee0191c984ec4008e21937
 F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
 F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
@@ -289,9 +289,9 @@ F src/update.c 729f6f18fc27740591d085e1172cebe311144bf0
 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
 F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
 F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
-F src/vdbe.c 9fe630d05840aa151a5ba9039901478d9524120b
+F src/vdbe.c 73eace757ead9fee63576e8c9f5337edb4c8c69d
 F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
-F src/vdbeInt.h f177bed1ec8d4eb5c7089f012aeb95f374745735
+F src/vdbeInt.h bb7f7ecfdead1a2ae0251b59f86f5724838d975c
 F src/vdbeapi.c e9e33b59834e3edc8790209765e069874c269d9d
 F src/vdbeaux.c a05adc3c96abdaf3db14768ddd63132fc9678060
 F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
@@ -1200,7 +1200,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 6c8924cacc2b875270770fed2cc3b1884f57a655
-R c9d002c28940b83ace850b74161b9f39
+P 1330c72e172324c68ab49e5bb2ceba985935ae01
+R db6a54c99d97f1320af4a50fd756c282
 U drh
-Z a6a7b4b719a1f0df211ae0686c0976a9
+Z 1da03df9544819e54ad17b4099a36954

diff --git a/manifest.uuid b/manifest.uuid
index 5e3b55899b77cc5f7e5434d6a07a3201e34ce44e..d95b1f3d63a3dc95b063205cc59785dfc1ed4f18 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1330c72e172324c68ab49e5bb2ceba985935ae01
\ No newline at end of file
+3467049a1705b49905ea88a5c6becb6fe318f2fa
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index 5b7056b401048c513be3fdde34c6d9c728a93b79..cf556e2439d944f85d955f862e6b8c78a7384a2d 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -22,7 +22,10 @@
 ** Return the collating function associated with a function.
 */
 static CollSeq *sqlite3GetFuncCollSeq(sqlite3_context *context){
-  return context->pColl;
+  VdbeOp *pOp = &context->pVdbe->aOp[context->iOp-1];
+  assert( pOp->opcode==OP_CollSeq );
+  assert( pOp->p4type==P4_COLLSEQ );
+  return pOp->p4.pColl;
 }
 
 /*

diff --git a/src/vdbe.c b/src/vdbe.c
index 27d7e749011e4d1da28aa5447cf70fe662643e96..8ae56416f2dfdc3f70875ae08201e8c9da1eae2d 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -1557,17 +1557,8 @@ case OP_Function: {
   ctx.iOp = pc;
   ctx.pVdbe = p;
   MemSetTypeFlag(ctx.pOut, MEM_Null);
-
   ctx.fErrorOrAux = 0;
-  if( ctx.pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL ){
-    assert( pOp>aOp );
-    assert( pOp[-1].p4type==P4_COLLSEQ );
-    assert( pOp[-1].opcode==OP_CollSeq );
-    ctx.pColl = pOp[-1].p4.pColl;
-  }
-  db->lastRowid = lastRowid;
   (*ctx.pFunc->xFunc)(&ctx, n, apVal); /* IMP: R-24505-23230 */
-  lastRowid = db->lastRowid;
 
   /* If the function returned an error, throw an exception */
   if( ctx.fErrorOrAux ){
@@ -5624,14 +5615,9 @@ case OP_AggStep: {
   sqlite3VdbeMemInit(&t, db, MEM_Null);
   ctx.pOut = &t;
   ctx.isError = 0;
-  ctx.pColl = 0;
+  ctx.pVdbe = p;
+  ctx.iOp = pc;
   ctx.skipFlag = 0;
-  if( ctx.pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL ){
-    assert( pOp>p->aOp );
-    assert( pOp[-1].p4type==P4_COLLSEQ );
-    assert( pOp[-1].opcode==OP_CollSeq );
-    ctx.pColl = pOp[-1].p4.pColl;
-  }
   (ctx.pFunc->xStep)(&ctx, n, apVal); /* IMP: R-24505-23230 */
   if( ctx.isError ){
     sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(&t));

diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index 56b5db7d1aff20bd0861b4530972644d65a879ff..f54c9c6d3bb8941e501734db54155afeebe5c392 100644 (file)
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -272,7 +272,6 @@ struct sqlite3_context {
   Mem *pOut;            /* The return value is stored here */
   FuncDef *pFunc;       /* Pointer to function information */
   Mem *pMem;            /* Memory cell used to store aggregate context */
-  CollSeq *pColl;       /* Collating sequence */
   Vdbe *pVdbe;          /* The VM that owns this context */
   int iOp;              /* Instruction number of OP_Function */
   int isError;          /* Error code returned by the function. */