Avoid calling fillInCell() to create an internal node intkey cell from balance_nonroo...

FossilOrigin-Name: 2e5d42aeb40c3c6eea373a9ae3fbdf4e8087cd58

diff --git a/manifest b/manifest
index 00072052365c547908a3f41af8a3f8144854c9c4..6ee35a7cfac13113f0a79f43a9c2add31e5a647b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Only\sdo\sthe\scell\soverread\schecks\sin\ssqlite3BtreeInitPage\sif\nSQLITE_OVERREAD_CHECK\sis\sdefined\sat\scompile-time.\s(CVS\s6733)
-D 2009-06-09T10:37:04
+C Avoid\scalling\sfillInCell()\sto\screate\san\sinternal\snode\sintkey\scell\sfrom\sbalance_nonroot().\sA\ssingle\sputVarint()\sdoes\sthe\ssame\sthing\smore\squickly.\s(CVS\s6734)
+D 2009-06-09T11:34:11
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -106,7 +106,7 @@ F src/auth.c 98db07c2088455797678eb1031f42d4d94d18a71
 F src/backup.c ff50af53184a5fd7bdee4d620b5dabef74717c79
 F src/bitvec.c 0ef0651714728055d43de7a4cdd95e703fac0119
 F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c
-F src/btree.c 30bd9f07840eb40bb7e84718ef222e0d2dabb4a4
+F src/btree.c a5a8e678b06c71547cc6d2b431ada8deed4db82e
 F src/btree.h f70b694e8c163227369a66863b01fbff9009f323
 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5
 F src/build.c 20e02fd72249159ff6829009f3029d16d59cdff5
@@ -733,7 +733,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 8f1c1f61f7bc5270212725cf0a056872df983f49
-R 23881bef89b48856953f16ab4fcdd93d
-U drh
-Z a11e1844a1e55425522b632316002079
+P 49f544ebae8dc3cf7cf6189536c56ebb7d258a86
+R 1f3d12c8cfd8481e0f0a6480315e417f
+U danielk1977
+Z 38c7ee33165ee3f31623c1541ad1c16a

diff --git a/manifest.uuid b/manifest.uuid
index 01e1ca667264b52fcee7e4993d693045f8995a89..086b4c602811dea0203dd67295fb8b23372b5593 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-49f544ebae8dc3cf7cf6189536c56ebb7d258a86
\ No newline at end of file
+2e5d42aeb40c3c6eea373a9ae3fbdf4e8087cd58
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index c35d2902df11b28267f95eb2e7933c76c86a1efe..1c3c189e37221a72cd9aec054305d9fd55c9541d 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.622 2009/06/09 10:37:04 drh Exp $
+** $Id: btree.c,v 1.623 2009/06/09 11:34:11 danielk1977 Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -5734,10 +5734,7 @@ static int balance_nonroot(MemPage *pParent, int iParentIdx, u8 *aOvflSpace){
         j--;
         sqlite3BtreeParseCellPtr(pNew, apCell[j], &info);
         pCell = pTemp;
-        rc = fillInCell(pParent, pCell, 0, info.nKey, 0, 0, 0, &sz);
-        if( rc!=SQLITE_OK ){
-          goto balance_cleanup;
-        }
+       sz = 4 + putVarint(&pCell[4], info.nKey);
         pTemp = 0;
       }else{
         pCell -= 4;