From: drh <drh@noemail.net>
Date: Sat, 1 Apr 2017 11:40:05 +0000 (+0000)
Subject: Remove unused fields from the BtCursor object.
X-Git-Tag: version-3.19.0~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6017a44c5beca2c8d47cc1e16795f5a464db9d2;p=thirdparty%2Fsqlite.git

Remove unused fields from the BtCursor object.

FossilOrigin-Name: 1c0d82e0786ed22d07d774b8b166340fad97bcaab6016e395c469bcfcb7c77a3
---

diff --git a/manifest b/manifest
index 8cff8164b6..1e16c25a50 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Save\sa\s78\sbytes\sof\scode\sspace\sand\sa\smillion\sCPU\scycles\sin\sspeedtest1\sby\nstoring\sthe\scell\sindex\sfor\sthe\sleaf\spage\sin\sthe\sBtCursor\sobject\sin\sits\sown\nfield\s(BtCursor.ix),\srather\sthan\sas\san\sentry\sin\sthe\sBtCursor.aiIdx\sarray.
-D 2017-04-01T00:20:06.305
+C Remove\sunused\sfields\sfrom\sthe\sBtCursor\sobject.
+D 2017-04-01T11:40:05.090
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
@@ -346,7 +346,7 @@ F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
 F src/btree.c 24ae5472bd0b53b4130ecdda389deb621af721d1fcb50890b878102b00bd10fa
 F src/btree.h bf64dfeeddeebdb775a5eba0098bbc00d073290d
-F src/btreeInt.h 874e49bdfab514285dda1cb01880e4c82b7a428a0de7d9b2978d8d8849fbb210
+F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
 F src/build.c 43f903c9082040ced2b421543cb0300c2973647d
 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@ -1569,7 +1569,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 c8000e94cca59dabf83d6cb75b40441aaf793d29880582dc4baa17246449b5fe
-R a50a3e5b98174af9f9e2e47aca996e63
+P 2452f0617d1085689264b5f66681788cfe9e3b1a7b318307c93942b702a443df
+R a9b36ce777e90549c853b64c225197a6
 U drh
-Z 14f3c01fb36e600191848f3a558eb584
+Z 4b939d3dd6a7f0c2f29593c397a2c2a8
diff --git a/manifest.uuid b/manifest.uuid
index c9a1f2708c..773ed91459 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2452f0617d1085689264b5f66681788cfe9e3b1a7b318307c93942b702a443df
\ No newline at end of file
+1c0d82e0786ed22d07d774b8b166340fad97bcaab6016e395c469bcfcb7c77a3
\ No newline at end of file
diff --git a/src/btreeInt.h b/src/btreeInt.h
index a676010ace..47de58f509 100644
--- a/src/btreeInt.h
+++ b/src/btreeInt.h
@@ -518,10 +518,9 @@ struct BtCursor {
   i8 iPage;                 /* Index of current page in apPage */
   u8 curIntKey;             /* Value of apPage[0]->intKey */
   u16 ix;                   /* Current index for apPage[iPage] */
-  struct KeyInfo *pKeyInfo; /* Argument passed to comparison function */
-  void *padding1;           /* Make object size a multiple of 16 */
-  u16 aiIdx[BTCURSOR_MAX_DEPTH];        /* Current index in apPage[i] */
-  MemPage *apPage[BTCURSOR_MAX_DEPTH];  /* Pages from root to current page */
+  u16 aiIdx[BTCURSOR_MAX_DEPTH-1];     /* Current index in apPage[i] */
+  struct KeyInfo *pKeyInfo;            /* Arg passed to comparison function */
+  MemPage *apPage[BTCURSOR_MAX_DEPTH]; /* Pages from root to current page */
 };
 
 /*