Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48b72ed6 authored Mar 06, 2023 by Daniel Santiago Rivera

Clear statement cache if schema changes.

If DDL statement is executed then the prepared statement cache must be cleaned up on active connections, otherwise their column result information can be outdated.

Bug: 183028015
Test: atest CtsDatabaseTestCases
Change-Id: I7e51007afb029c0591e48eaa0be908bcb92df576

parent c928a86d

core/java/android/database/sqlite/SQLiteConnection.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1392,6 +1392,10 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
		return sql.replaceAll("[\\s]\\n+[\\s]", " ");
		}

		void clearPreparedStatementCache() {
		mPreparedStatementCache.evictAll();
		}

		/**
		* Holder type for a prepared statement.
		*

core/java/android/database/sqlite/SQLiteConnectionPool.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -1126,6 +1126,16 @@ public final class SQLiteConnectionPool implements Closeable {
		mConnectionWaiterPool = waiter;
		}

		void clearAcquiredConnectionsPreparedStatementCache() {
		synchronized (mLock) {
		if (!mAcquiredConnections.isEmpty()) {
		for (SQLiteConnection connection : mAcquiredConnections.keySet()) {
		connection.clearPreparedStatementCache();
		}
		}
		}
		}

		/**
		* Dumps debugging information about this connection pool.
		*

core/java/android/database/sqlite/SQLiteDatabase.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -2088,10 +2088,12 @@ public final class SQLiteDatabase extends SQLiteClosable {
		try (SQLiteStatement statement = new SQLiteStatement(this, sql, bindArgs)) {
		return statement.executeUpdateDelete();
		} finally {
		// If schema was updated, close non-primary connections, otherwise they might
		// have outdated schema information
		// If schema was updated, close non-primary connections and clear prepared
		// statement caches of active connections, otherwise they might have outdated
		// schema information.
		if (statementType == DatabaseUtils.STATEMENT_DDL) {
		mConnectionPoolLocked.closeAvailableNonPrimaryConnectionsAndLogExceptions();
		mConnectionPoolLocked.clearAcquiredConnectionsPreparedStatementCache();
		}
		}
		} finally {