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

Commit e269d098 authored Mar 09, 2023 by Daniel Santiago Rivera Committed by Automerger Merge Worker Mar 09, 2023

Merge "Revert "Clear statement cache if schema changes."" into udc-dev am: 5003af01

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21938722

Change-Id: I1217c6463c08a7bba4032e05d3f1b6b56276f45e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents a888a23e 5003af01

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -1392,10 +1392,6 @@ 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

+0 −10

Original line number	Diff line number	Diff line
		@@ -1126,16 +1126,6 @@ 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

+2 −4

Original line number	Diff line number	Diff line
		@@ -2088,12 +2088,10 @@ 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 and clear prepared
		// statement caches of active connections, otherwise they might have outdated
		// schema information.
		// If schema was updated, close non-primary connections, otherwise they might
		// have outdated schema information
		if (statementType == DatabaseUtils.STATEMENT_DDL) {
		mConnectionPoolLocked.closeAvailableNonPrimaryConnectionsAndLogExceptions();
		mConnectionPoolLocked.clearAcquiredConnectionsPreparedStatementCache();
		}
		}
		} finally {