Do not bother to initialize unused fields in the BtreePayload object.

FossilOrigin-Name: b10d0f939c82c4de3faa90b86de9ec4a89992856

diff --git a/manifest b/manifest
index b70497eb6efff15e3c15b5793ee1371a44663574..51195f39a9ad9d4486c32379425a9cf2d532feb1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sdeterministic\sfunctions\sin\sthe\sWHERE\sclause\sof\sa\spartial\sindex.
-D 2016-10-03T18:13:23.577
+C Do\snot\sbother\sto\sinitialize\sunused\sfields\sin\sthe\sBtreePayload\sobject.
+D 2016-10-04T00:47:26.005
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -329,7 +329,7 @@ F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
-F src/btree.c a0a80fbbb34a35ca02cd829bad693b7854bee313
+F src/btree.c 7a45743fb947c89bd6c972bfb18c8f80c070ad51
 F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde
 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 F src/build.c 59dcfdc1ee55439d069af301ef7f2e84421b5102
@@ -453,7 +453,7 @@ F src/update.c 8179e699dbd45b92934fd02d3d8e3732e8da8802
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 3e2da6101888d073e79ecc6af5e0a2f70fa1e498
 F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3
-F src/vdbe.c 51e754eec26d892abc6279f5e949545af68ec1b3
+F src/vdbe.c f43aa96f2efe9bc8a06d17115661af527a3318fa
 F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
 F src/vdbeInt.h 0a18713d0a2fec6807d076bd333d9bf3e57530cd
 F src/vdbeapi.c 8272f9342c39ab8d7eb4b9decc6caa7bc75b7d83
@@ -1525,7 +1525,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 109852e51e2cc2674940ba3e5097a92e66f88bb8
-R 570e98b0ce01791f7df81d2307617f83
+P c6e9b9421805c904b20900b711fa0e51773aef3e
+R 66af79a90ae1c2b03d628f9e680deefb
 U drh
-Z 806f5071a81ad8307711df9ff707b7fc
+Z c238f953392eb5f8e38079e9a79ab2f6

diff --git a/manifest.uuid b/manifest.uuid
index 6e617448ac7412398e2bb867f6099e31ee4b7145..70d83898eaa314c75c3ded30a5dec955f4d14497 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c6e9b9421805c904b20900b711fa0e51773aef3e
\ No newline at end of file
+b10d0f939c82c4de3faa90b86de9ec4a89992856
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 45b4750b7bb84eabd2c121cb1a9174df932c19bc..3e8e59f3a3537ec92ea2380e6be8881260ce7ad5 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -6100,8 +6100,6 @@ static int fillInCell(
     nHeader += putVarint32(&pCell[nHeader], nPayload);
     nHeader += putVarint(&pCell[nHeader], *(u64*)&pX->nKey);
   }else{
-    assert( pX->nData==0 );
-    assert( pX->nZero==0 );
     assert( pX->nKey<=0x7fffffff && pX->pKey!=0 );
     nSrc = nPayload = (int)pX->nKey;
     pSrc = pX->pKey;

diff --git a/src/vdbe.c b/src/vdbe.c
index 25b507f37fcd29a6b70219f72292b4fc23f984da..54df5c536d49d407deb31a38288aaf081bc9bb51 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -5059,9 +5059,6 @@ case OP_IdxInsert: {        /* in2 */
   }else{
     x.nKey = pIn2->n;
     x.pKey = pIn2->z;
-    x.nData = 0;
-    x.nZero = 0;
-    x.pData = 0;
     rc = sqlite3BtreeInsert(pC->uc.pCursor, &x, pOp->p3, 
         ((pOp->p5 & OPFLAG_USESEEKRESULT) ? pC->seekResult : 0)
         );