Address review: don't expose cache API

Author: Erlend E. Aasland

Doc/library/sqlite3.rst

@@ -515,16 +515,6 @@ Connection Objects
 
       .. XXX what's a db_row-based solution?
 
-   .. method:: statement_cache()
-
-      Returns the LRU statement cache for this connection.  The statement
-      cache is implemented using :meth:`functools.lru_cache`, so it's
-      possible to inspect its state by calling :func:`~functools.cache_info`
-      or :func:`~functools.cache_parameters` on the returned object.  The
-      cache can be cleared by calling :func:`~functools.cache_clear` on
-      the returned object.
-
-      .. versionadded:: 3.10
 
    .. attribute:: text_factory
 

Doc/whatsnew/3.11.rst

@@ -86,15 +86,6 @@ New Modules
 Improved Modules
 ================
 
-sqlite3
--------
-
-:mod:`sqlite3` now utilizes :meth:`functools.lru_cache` to implement the
-connection statement cache. The statement cache can be accessed via the new
-method :meth:`sqlite3.Connection.statement_cache`. As a small optimisation, the
-default statement cache size has been increased from 100 to 128.
-(Contributed by Erlend E. Aasland in :issue:`42862`.)
-
 
 Optimizations
 =============

Lib/sqlite3/test/dbapi.py

@@ -197,33 +197,6 @@ def test_open_uri(self):
         gc_collect()
 
 
-class StatementCacheTests(unittest.TestCase):
-    def test_statement_cache(self):
-        query = 'select * from sqlite_master'
-        cx = sqlite.connect(':memory:')
-        cx.execute(query)  # cache miss
-        cx.execute(query)  # cache hit
-        cache = cx.statement_cache()
-        info = cache.cache_info()
-        self.assertEqual(info.hits, 1)
-        self.assertEqual(info.misses, 1)
-        self.assertEqual(info.maxsize, 128)
-        self.assertEqual(info.currsize, 1)
-
-    def test_statement_cache_maxsize(self):
-        maxsize = 8
-        testsize = maxsize + 1
-        cx = sqlite.connect(':memory:', cached_statements=maxsize)
-        for i in range(testsize):
-            cx.execute(f'select {i}')
-        cache = cx.statement_cache()
-        info = cache.cache_info()
-        self.assertEqual(info.hits, 0)
-        self.assertEqual(info.misses, testsize)
-        self.assertEqual(info.maxsize, maxsize)
-        self.assertEqual(info.currsize, maxsize)
-
-
 class CursorTests(unittest.TestCase):
     def setUp(self):
         self.cx = sqlite.connect(":memory:")
@@ -975,7 +948,6 @@ def suite():
         ExtensionTests,
         ModuleTests,
         SqliteOnConflictTests,
-        StatementCacheTests,
         ThreadTests,
     ]
     return unittest.TestSuite(

Misc/NEWS.d/next/Library/2021-01-13-00-02-44.bpo-42862.Z6ACLN.rst

@@ -1,5 +1,4 @@
 :mod:`sqlite3` now utilizes :meth:`functools.lru_cache` to implement the
-connection statement cache. The statement cache can be accessed via the new
-method :meth:`sqlite3.Connection.statement_cache`. As a small optimisation, the
-default statement cache size has been increased from 100 to 128.
+connection statement cache. As a small optimisation, the default
+statement cache size has been increased from 100 to 128.
 Patch by Erlend E. Aasland.

Modules/_sqlite/clinic/connection.c.h

@@ -2,24 +2,6 @@
 preserve
 [clinic start generated code]*/
 
-PyDoc_STRVAR(pysqlite_connection_statement_cache__doc__,
-"statement_cache($self, /)\n"
-"--\n"
-"\n"
-"Return the connection statement cache.");
-
-#define PYSQLITE_CONNECTION_STATEMENT_CACHE_METHODDEF    \
-    {"statement_cache", (PyCFunction)pysqlite_connection_statement_cache, METH_NOARGS, pysqlite_connection_statement_cache__doc__},
-
-static PyObject *
-pysqlite_connection_statement_cache_impl(pysqlite_Connection *self);
-
-static PyObject *
-pysqlite_connection_statement_cache(pysqlite_Connection *self, PyObject *Py_UNUSED(ignored))
-{
-    return pysqlite_connection_statement_cache_impl(self);
-}
-
 PyDoc_STRVAR(pysqlite_connection_cursor__doc__,
 "cursor($self, /, factory=<unrepresentable>)\n"
 "--\n"
@@ -728,4 +710,4 @@ pysqlite_connection_exit(pysqlite_Connection *self, PyObject *const *args, Py_ss
 #ifndef PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF
     #define PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF
 #endif /* !defined(PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF) */
-/*[clinic end generated code: output=9620be094a4fea95 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c1bf09db3bcd0105 input=a9049054013a1b77]*/

Modules/_sqlite/connection.c

@@ -329,20 +329,6 @@ int pysqlite_connection_register_cursor(pysqlite_Connection* connection, PyObjec
 }
 
 
-/*[clinic input]
-_sqlite3.Connection.statement_cache as pysqlite_connection_statement_cache
-
-Return the connection statement cache.
-[clinic start generated code]*/
-
-static PyObject *
-pysqlite_connection_statement_cache_impl(pysqlite_Connection *self)
-/*[clinic end generated code: output=a88b63d0c46650ba input=32465d5ec271ca8c]*/
-{
-    return Py_NewRef(self->statement_cache);
-}
-
-
 /*[clinic input]
 _sqlite3.Connection.cursor as pysqlite_connection_cursor
 
@@ -1954,7 +1940,6 @@ static PyMethodDef connection_methods[] = {
     PYSQLITE_CONNECTION_SET_AUTHORIZER_METHODDEF
     PYSQLITE_CONNECTION_SET_PROGRESS_HANDLER_METHODDEF
     PYSQLITE_CONNECTION_SET_TRACE_CALLBACK_METHODDEF
-    PYSQLITE_CONNECTION_STATEMENT_CACHE_METHODDEF
     {NULL, NULL}
 };