diff options
author | Dmitri Plotnikov <dplotnikov@google.com> | 2009-09-15 10:52:17 -0700 |
---|---|---|
committer | Dmitri Plotnikov <dplotnikov@google.com> | 2009-09-15 15:53:24 -0700 |
commit | 90142c959e6de38eae1563cd8b3d2d448393e15f (patch) | |
tree | 31d3559fd27084fe398b8762c741aece4242e740 /core/java/android/database | |
parent | a4fe2aca527ee45ddde6ace2316cad27dd487379 (diff) | |
download | frameworks_base-90142c959e6de38eae1563cd8b3d2d448393e15f.zip frameworks_base-90142c959e6de38eae1563cd8b3d2d448393e15f.tar.gz frameworks_base-90142c959e6de38eae1563cd8b3d2d448393e15f.tar.bz2 |
Adding a system property to log slow queries
Change-Id: I4d139e222319f56169924e14aa967f07b233c00e
Diffstat (limited to 'core/java/android/database')
-rw-r--r-- | core/java/android/database/sqlite/SQLiteDatabase.java | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index 0cd4036..e425f3a 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -22,10 +22,11 @@ import android.database.DatabaseUtils; import android.database.SQLException; import android.os.Debug; import android.os.SystemClock; +import android.os.SystemProperties; import android.text.TextUtils; import android.util.Config; -import android.util.Log; import android.util.EventLog; +import android.util.Log; import java.io.File; import java.util.HashMap; @@ -221,6 +222,10 @@ public class SQLiteDatabase extends SQLiteClosable { // that logging is not enabled. /* package */ final boolean mLogStats; + // System property that enables logging of slow queries. Specify the threshold in ms. + private static final String LOG_SLOW_QUERIES_PROPERTY = "db.log.slow_query_threshold"; + private final int mSlowQueryThreshold; + /** * @param closable */ @@ -1202,27 +1207,38 @@ public class SQLiteDatabase extends SQLiteClosable { String editTable) { long timeStart = 0; - if (Config.LOGV) { + if (Config.LOGV || mSlowQueryThreshold != -1) { timeStart = System.currentTimeMillis(); } SQLiteCursorDriver driver = new SQLiteDirectCursorDriver(this, sql, editTable); + Cursor cursor = null; try { - return driver.query( + cursor = driver.query( cursorFactory != null ? cursorFactory : mFactory, selectionArgs); } finally { - if (Config.LOGV) { + if (Config.LOGV || mSlowQueryThreshold != -1) { + + // Force query execution + if (cursor != null) { + cursor.moveToFirst(); + cursor.moveToPosition(-1); + } + long duration = System.currentTimeMillis() - timeStart; - Log.v(SQLiteCursor.TAG, - "query (" + duration + " ms): " + driver.toString() + ", args are " - + (selectionArgs != null - ? TextUtils.join(",", selectionArgs) - : "<null>")); + if (Config.LOGV || duration >= mSlowQueryThreshold) { + Log.v(SQLiteCursor.TAG, + "query (" + duration + " ms): " + driver.toString() + ", args are " + + (selectionArgs != null + ? TextUtils.join(",", selectionArgs) + : "<null>")); + } } } + return cursor; } /** @@ -1671,6 +1687,7 @@ public class SQLiteDatabase extends SQLiteClosable { mFlags = flags; mPath = path; mLogStats = "1".equals(android.os.SystemProperties.get("db.logstats")); + mSlowQueryThreshold = SystemProperties.getInt(LOG_SLOW_QUERIES_PROPERTY, -1); mLeakedException = new IllegalStateException(path + " SQLiteDatabase created and never closed"); |