Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "caching bug in SQLiteDatabase causes invalid finalizer warnings"

Browse Source
This commit is contained in:
Vasu Nori
2010-03-08 11:13:52 -08:00
committed by Android (Google) Code Review
parent c8195ffcfd 49d02acec8
commit d1356e440d
2 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
core/java/android/database/sqlite/SQLiteDatabase.java
View File

@@ -261,7 +261,7 @@ public class SQLiteDatabase extends SQLiteClosable {
public static final int MAX_SQL_CACHE_SIZE = 250;
private int mMaxSqlCacheSize = MAX_SQL_CACHE_SIZE; // max cache size per Database instance
private int mCacheFullWarnings;
private static final int MAX_WARNINGS_ON_CACHESIZE_CONDITION = 5;
private static final int MAX_WARNINGS_ON_CACHESIZE_CONDITION = 1;
/** maintain stats about number of cache hits and misses */
private int mNumCacheHits;
@@ -1909,43 +1909,28 @@ public class SQLiteDatabase extends SQLiteClosable {
}
// add this <sql, compiledStatement> to the cache
if (mCompiledQueries.size() == mMaxSqlCacheSize) {
/* reached max cachesize. before adding new entry, remove an entry from the
* cache. we don't want to wipe out the entire cache because of this:
* GCing {@link SQLiteCompiledSql} requires call to sqlite3_finalize
* JNI method. If entire cache is wiped out, it could cause a big GC activity
* just because a (rogue) process is using the cache incorrectly.
/*
* cache size of {@link #mMaxSqlCacheSize} is not enough for this app.
* log a warning MAX_WARNINGS_ON_CACHESIZE_CONDITION times
* chances are it is NOT using ? for bindargs - so caching is useless.
* TODO: either let the callers set max cchesize for their app, or intelligently
* figure out what should be cached for a given app.
*/
Log.w(TAG, "Reached MAX size for compiled-sql statement cache for database " +
getPath() + "; i.e., NO space for this sql statement in cache: " +
sql + ". Please change your sql statements to use '?' for " +
"bindargs, instead of using actual values");
/* increment the number of times this warnings has been printed.
* if this warning is printed too many times, clear the whole cache - the app
* is doing something weird or incorrect and printing more warnings will only
* flood the logfile.
*/
if (++mCacheFullWarnings > MAX_WARNINGS_ON_CACHESIZE_CONDITION) {
mCacheFullWarnings = 0;
// clear the cache
mCompiledQueries.clear();
Log.w(TAG, "Compiled-sql statement cache for database: " +
getPath() + " hit MAX size-limit too many times. " +
"Removing all compiled-sql statements from the cache.");
} else {
// clear just a single entry from cache
Set<String> keySet = mCompiledQueries.keySet();
for (String s : keySet) {
mCompiledQueries.remove(s);
break;
}
if (++mCacheFullWarnings == MAX_WARNINGS_ON_CACHESIZE_CONDITION) {
Log.w(TAG, "Reached MAX size for compiled-sql statement cache for database " +
getPath() + "; i.e., NO space for this sql statement in cache: " +
sql + ". Please change your sql statements to use '?' for " +
"bindargs, instead of using actual values");
}
// don't add this entry to cache
} else {
// cache is NOT full. add this to cache.
mCompiledQueries.put(sql, compiledStatement);
if (SQLiteDebug.DEBUG_SQL_CACHE) {
Log.v(TAG, "|adding_sql_to_cache|" + getPath() + "|" +
mCompiledQueries.size() + "|" + sql);
}
}
mCompiledQueries.put(sql, compiledStatement);
}
if (SQLiteDebug.DEBUG_SQL_CACHE) {
Log.v(TAG, "|adding_sql_to_cache|" + getPath() + "|" + mCompiledQueries.size() + "|" +
sql);
}
return;
}

7
core/java/android/database/sqlite/SQLiteProgram.java
View File

@@ -58,11 +58,10 @@ public abstract class SQLiteProgram extends SQLiteClosable {
db.addSQLiteClosable(this);
this.nHandle = db.mNativeHandle;
// shouldn't reuse compiled-plans of PRAGMA sql statements
// because sqlite returns OLD values if compiled-pragma-statements are reused
//TODO: remove this code when sqlite fixes it (and add tests too)
// only cache CRUD statements
String prefixSql = mSql.substring(0, 6);
if (prefixSql.toLowerCase().startsWith("pragma")) {
if (!prefixSql.equalsIgnoreCase("INSERT") && !prefixSql.equalsIgnoreCase("UPDATE") &&
!prefixSql.equalsIgnoreCase("DELETE") && !prefixSql.equalsIgnoreCase("SELECT")) {
mCompiledSql = new SQLiteCompiledSql(db, sql);
nStatement = mCompiledSql.nStatement;
// since it is not in the cache, no need to acquire() it.