Remove unnecessary code from sqlite3BtreeClose() and add test cases.

FossilOrigin-Name: edbfdcaefae1e9a42c046c058341bf5b0f533c0b0cbd39543fcaa2a83d67561d

diff --git a/manifest b/manifest
index feaba5c150ec303b9bc6fca03a7ef42a0eaba085..16608f226aaadab0088805542cef0bbefe428d1b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\ssanity\schecking\sof\sthe\sOpenDup\scursors.
-D 2021-03-18T15:42:59.646
+C Remove\sunnecessary\scode\sfrom\ssqlite3BtreeClose()\sand\sadd\stest\scases.
+D 2021-03-18T16:36:31.997
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 25cdff8bd4b3c9bb009bfe585a7edde48fdb9aa1579173922038aac6bb47c0c6
+F src/btree.c 227adc33e70b293955c8f36bc0264cd9e8398aadb0d2a3cd3a9c90cbe88b71fc
 F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
 F src/btreeInt.h 7614cae30f95b6aed0c7cac7718276a55cfe2c77058cbfd8bef5b75329757331
 F src/build.c fec73c39d756f31d35ccbaa80fe1e040a8d675a318d4d30f41c444167bf3b860
@@ -1788,7 +1788,7 @@ F test/windowerr.test a8b752402109c15aa1c5efe1b93ccb0ce1ef84fa964ae1cd6684dd0b3c
 F test/windowfault.test d543d46571b32d19f198cb04b6505747fabf3cc369970daae47074ee793612be
 F test/windowpushd.test 5b9c114e8173c3addacf58a0fcd941437b14649f2033700184479a13f188ad00
 F test/with1.test 780be387f01e290e768bdfd1827280f9e37ba37223eb4736aba386864fac5a94
-F test/with2.test e0030e2f0267a910d6c0e4f46f2dfe941c1cc0d4f659ba69b3597728e7e8f1ab
+F test/with2.test 7f890304fad815e49123d658012f4e463c7a2e9682044187ce21495e34a08ab9
 F test/with3.test 85e059bf4c2ef5626411ee59f399b4bb4b4a0f009bcb7db86f254e570ed11831
 F test/with4.test 257be66c0c67fee1defbbac0f685c3465e2cad037f21ce65f23f86084f198205
 F test/with5.test 6248213c41fab36290b5b73aa3f937309dfba337004d9d8434c3fabc8c7d4be8
@@ -1910,7 +1910,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 39b5af18c0580c8e92516d410f8c465bfec31b2d0be9df1cfd6a1d1a19b4fc14
-R a76f75bf1ec726e3bc7a2a3639bd46d6
+P 0ec71cf16983697f68ab8d921d80a5f39611e4cb5e6e19cbc4a9ad6d49bfc835
+R d6bb4de826da78f3ee27cd7f97de25cd
 U drh
-Z 8ca7de05c1a42b71a557e12a74405656
+Z 33a255e216d282f4bd457b0447324171

diff --git a/manifest.uuid b/manifest.uuid
index aa2b3946c67c39d5b5538daa9c66b3f760cf9ccf..882cd91e8102dfbd61400c5ef0607cd684867499 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0ec71cf16983697f68ab8d921d80a5f39611e4cb5e6e19cbc4a9ad6d49bfc835
\ No newline at end of file
+edbfdcaefae1e9a42c046c058341bf5b0f533c0b0cbd39543fcaa2a83d67561d
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index d7dddde1a5bb7ad912942ab343fc5ab0b970ac7a..2c05a07410343d432b224c0b0a503762b260f71b 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -2754,7 +2754,6 @@ int sqlite3BtreeClose(Btree *p){
     }
   }
 #endif
-  pBt->openFlags &= ~BTREE_SINGLE;
 
   /* Rollback any active transaction and free the handle structure.
   ** The call to sqlite3BtreeRollback() drops any table-locks held by

diff --git a/test/with2.test b/test/with2.test
index 004ec94b97498c8ef7ff16e0589e72297bb660c1..5676f9601f283e83dc31596b8a107d35b49f5a80 100644 (file)
--- a/test/with2.test
+++ b/test/with2.test
@@ -414,5 +414,121 @@ do_execsql_test 8.3 {
   SELECT * FROM q;
 } {1 2 3 4 5}
 
+# 2021-03-18
+# Ticket bb8a9fd4a9b7fce5
+reset_db
+do_execsql_test 9.1 {
+  WITH xyz(a) AS (
+    WITH abc AS ( SELECT 1234 ) SELECT * FROM abc
+  )
+  SELECT * FROM xyz AS one, xyz AS two, (
+    SELECT * FROM xyz UNION ALL SELECT * FROM xyz
+  );
+} {1234 1234 1234 1234 1234 1234}
+load_static_extension db series
+do_execsql_test 9.2 {
+  WITH
+    cst(rsx, rsy) AS  (
+      SELECT 100, 100
+    ),
+    cst2(minx, maxx, stepx, miny, maxy, stepy, qualitativex, qualitativey) AS (
+      SELECT NULL, NULL, NULL, NULL, NULL, NULL, 0, 0
+    ),
+    ds0(m, n, x, y, x2, y2, title, size, mark, label, markmode) AS (
+      SELECT 1, 2, 3, 4, 5, 6, 7 , 8, 9, 10, 11
+    ),
+    ds(m, n, x, y, x2, y2, title, size, mark, label, markmode) AS (
+      SELECT m, n, x,
+        y, x2,
+        y2,
+        title, size, mark, label, markmode
+      FROM ds0
+      WINDOW w AS (PARTITION BY m, x ORDER BY n)
+    ),
+    d(m, n, x, y, x2, y2, labelx,labely,title,size,mark,label,markmode) AS (
+      SELECT m, n, x, y,  x2, y2, x, y, title, size, mark, label, markmode
+      FROM ds, cst2
+    ),
+    ylabels(y, label) AS (
+      SELECT y, MIN(labely) FROM d GROUP BY y
+    ),
+    yaxis(maxy, miny, stepy , minstepy) AS (
+      WITH
+        xt0(minx, maxx) AS (
+          SELECT  coalesce(miny, min(min(y2),
+                  min(y))), coalesce(maxy, max(max(y2),
+                  max(y))) + qualitativey
+           FROM d, cst2
+        ),
+        xt1(mx, mn) AS (SELECT maxx, minx FROM xt0),
+        xt2(mx, mn, step) AS (SELECT mx, mn, (mx-mn)  FROM xt1),
+        
+        xt3(mx, mn, ms) AS (
+          SELECT mx, mn, first_value(rs) OVER (order by x desc) AS ms
+            FROM (SELECT mx, mn, step, f,(mx-mn) as rng,
+                         1.0*step/f as rs, 1.0*(mx-mn)/(step/f) AS x
+                    FROM xt2, (SELECT 1 AS f UNION ALL SELECT 2
+                                UNION ALL SELECT 4
+                                UNION ALL SELECT 5)) AS src
+                   WHERE x < 10 limit 1),
+        xt4(minstepy) AS (
+          SELECT MIN(abs(y2-y)) FROM d WHERE y2 != y
+        )
+      SELECT (mx/ms)*ms, (mn/ms)*ms, coalesce(stepy, ms),
+                     coalesce(minstepy, ms, stepy)  FROM xt3, cst2,xt4
+    ),
+    distinct_mark_n_m(mark, ze, zem, title) AS (
+      SELECT DISTINCT mark, n AS ze, m AS zem, title FROM ds0
+    ),
+    facet0(m, mi, title, radial) AS (
+      SELECT md, row_number() OVER () - 1, title, 'radial'
+                      IN (SELECT mark FROM distinct_mark_n_m WHERE zem = md)
+      FROM (SELECT DISTINCT zem AS md, title AS title
+                       FROM distinct_mark_n_m ORDER BY 2, 1)
+    ),
+    facet(m, mi, xorigin, yorigin, title, radial) AS (
+      SELECT m, mi,
+        rsx * 1.2 * IFNULL(CASE WHEN (
+          0
+        ) > 0 THEN mi / (
+          0
+        ) ELSE mi % (
+          2
+        )  END, mi),
+        rsy  * 1.2 * IFNULL(CASE WHEN (
+          2
+        ) > 0 THEN mi / (
+          2
+        ) ELSE mi / (
+          0
+        )  END, 0),
+        title, radial FROM facet0, cst
+    ),
+    radygrid(m, mi, tty, wty, ttx, ttx2, xorigin, yorigin) AS (
+      SELECT m, mi,  rsy / 2 / ((maxy-miny)/stepy) * (value-1) AS tty,
+             coalesce(NULL, miny + stepy * (value-1)) AS wty,
+             xorigin, xorigin+rsx, xorigin + rsx / 2,
+             yorigin + rsy / 2
+        FROM generate_series(1), yaxis, cst,
+             facet LEFT JOIN ylabels ON ylabels.y = (miny + (value-1) * stepy)
+       WHERE radial AND stop = 1+1.0*(maxy-miny)/stepy
+    ),
+    ypos(m, mi, pcx, pcy, radial) AS (
+      SELECT m, mi, xorigin, yorigin + CASE
+        WHEN 0 BETWEEN miny AND maxy THEN
+          rsy - (0 - miny) * rsy / (maxy-miny)
+        WHEN 0 >= maxy THEN 0
+        ELSE  rsy
+      END, radial FROM yaxis, cst, facet WHERE NOT radial
+      UNION ALL
+      SELECT m, mi, xorigin + rsx / 2, yorigin + (CASE
+        WHEN 0 BETWEEN miny AND maxy THEN
+          rsy - (0 - miny) * rsy / 2 / (maxy-miny)
+        WHEN 0 >= maxy THEN 0
+        ELSE  rsy
+      END ) / 2, radial FROM yaxis, cst, facet WHERE radial
+    )
+  SELECT * FROM radygrid , ypos;
+} {}
 
 finish_test