Remove the unused pReadNode prepared statement from each RTREE object.

FossilOrigin-Name: e51dc0ec60d45cd57564735b6b2bb254a588533e

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 432c72781ec1d64b0768d08486cace03cd7e100b..9e6f0e082a28a85a11a70c6b949a5fa2defbf48c 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -139,7 +139,6 @@ struct Rtree {
   sqlite3_blob *pNodeBlob;
 
   /* Statements to read/write/delete a record from xxx_node */
-  sqlite3_stmt *pReadNode;
   sqlite3_stmt *pWriteNode;
   sqlite3_stmt *pDeleteNode;
 
@@ -944,7 +943,6 @@ static void rtreeRelease(Rtree *pRtree){
     pRtree->inWrTrans = 0;
     pRtree->nCursor = 0;
     nodeBlobReset(pRtree);
-    sqlite3_finalize(pRtree->pReadNode);
     sqlite3_finalize(pRtree->pWriteNode);
     sqlite3_finalize(pRtree->pDeleteNode);
     sqlite3_finalize(pRtree->pReadRowid);
@@ -3315,10 +3313,9 @@ static int rtreeSqlInit(
 ){
   int rc = SQLITE_OK;
 
-  #define N_STATEMENT 9
+  #define N_STATEMENT 8
   static const char *azSql[N_STATEMENT] = {
-    /* Read and write the xxx_node table */
-    "SELECT data FROM '%q'.'%q_node' WHERE nodeno = :1",
+    /* Write the xxx_node table */
     "INSERT OR REPLACE INTO '%q'.'%q_node' VALUES(:1, :2)",
     "DELETE FROM '%q'.'%q_node' WHERE nodeno = :1",
 
@@ -3356,15 +3353,14 @@ static int rtreeSqlInit(
     }
   }
 
-  appStmt[0] = &pRtree->pReadNode;
-  appStmt[1] = &pRtree->pWriteNode;
-  appStmt[2] = &pRtree->pDeleteNode;
-  appStmt[3] = &pRtree->pReadRowid;
-  appStmt[4] = &pRtree->pWriteRowid;
-  appStmt[5] = &pRtree->pDeleteRowid;
-  appStmt[6] = &pRtree->pReadParent;
-  appStmt[7] = &pRtree->pWriteParent;
-  appStmt[8] = &pRtree->pDeleteParent;
+  appStmt[0] = &pRtree->pWriteNode;
+  appStmt[1] = &pRtree->pDeleteNode;
+  appStmt[2] = &pRtree->pReadRowid;
+  appStmt[3] = &pRtree->pWriteRowid;
+  appStmt[4] = &pRtree->pDeleteRowid;
+  appStmt[5] = &pRtree->pReadParent;
+  appStmt[6] = &pRtree->pWriteParent;
+  appStmt[7] = &pRtree->pDeleteParent;
 
   rc = rtreeQueryStat1(db, pRtree);
   for(i=0; i<N_STATEMENT && rc==SQLITE_OK; i++){

diff --git a/manifest b/manifest
index 0fcd596e1ec928b80bf5cd9805ec5c9de78c180f..ea1bf5a3bfeca5dc87eb990ee107bfa875cf7d20 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spotential\suninitialized\s(though\sharmless)\svariable\sin\sRTREE.
-D 2017-02-02T16:08:27.041
+C Remove\sthe\sunused\spReadNode\sprepared\sstatement\sfrom\seach\sRTREE\sobject.
+D 2017-02-02T16:30:25.555
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964
@@ -264,7 +264,7 @@ F ext/rbu/sqlite3rbu.c bb0de6cdbdb14a7d55a097238a434b7e99caf318
 F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
 F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c e1b77d0f32241f3c09ab0bc7cf7be5d263902978
+F ext/rtree/rtree.c be9d44f5707c5a73887d3ac3ad14a355e9b92b58
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@ -1552,7 +1552,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 88333441cbf26bfde2acebf2a3f75b5ebbdfb0ae
-R 6c083917a4ecdc09328902e3d7d74ce0
+P a1c74e09d63aca630d022ed074866433eed6b493
+R b4b0a5df6a2ab40920c13363cd1d25e9
 U drh
-Z 3e4bf024e32b2f321d57a48b2d7cd9ed
+Z 5406bbb7ccb82072da8c73ecd9c87865

diff --git a/manifest.uuid b/manifest.uuid
index 507bf4c42c1d9923d1006fb3a158754f7fc3574b..dda662b8b909af684c3a61c1586a2fac6bb672bc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a1c74e09d63aca630d022ed074866433eed6b493
\ No newline at end of file
+e51dc0ec60d45cd57564735b6b2bb254a588533e
\ No newline at end of file