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

Merge "Fix slow query log." into qt-dev

Browse Source
This commit is contained in:
Makoto Onuki
2019-06-04 16:57:23 +00:00
committed by Android (Google) Code Review
parent a1d0453641 a9be33f7cf
commit dee07f5d7f
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/preloaded-classes
View File

@@ -1105,7 +1105,6 @@ android.database.sqlite.SQLiteDatabase
android.database.sqlite.SQLiteDatabaseConfiguration
android.database.sqlite.SQLiteDatabaseCorruptException
android.database.sqlite.SQLiteDatabaseLockedException
android.database.sqlite.SQLiteDebug$Consts
android.database.sqlite.SQLiteDebug$DbStats
android.database.sqlite.SQLiteDebug$PagerStats
android.database.sqlite.SQLiteDebug

8
core/java/android/database/sqlite/SQLiteConnection.java
View File

@@ -19,8 +19,8 @@ package android.database.sqlite;
import android.database.Cursor;
import android.database.CursorWindow;
import android.database.DatabaseUtils;
import android.database.sqlite.SQLiteDebug.Consts;
import android.database.sqlite.SQLiteDebug.DbStats;
import android.database.sqlite.SQLiteDebug.NoPreloadHolder;
import android.os.CancellationSignal;
import android.os.OperationCanceledException;
import android.os.ParcelFileDescriptor;
@@ -214,7 +214,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
try {
mConnectionPtr = nativeOpen(mConfiguration.path, mConfiguration.openFlags,
mConfiguration.label,
SQLiteDebug.Consts.DEBUG_SQL_STATEMENTS, SQLiteDebug.Consts.DEBUG_SQL_TIME,
NoPreloadHolder.DEBUG_SQL_STATEMENTS, NoPreloadHolder.DEBUG_SQL_TIME,
mConfiguration.lookasideSlotSize, mConfiguration.lookasideSlotCount);
} finally {
mRecentOperations.endOperation(cookie);
@@ -1500,7 +1500,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
operation.mFinished = true;
final long execTime = operation.mEndTime - operation.mStartTime;
mPool.onStatementExecuted(execTime);
return SQLiteDebug.Consts.DEBUG_LOG_SLOW_QUERIES && SQLiteDebug.shouldLogSlowQuery(
return NoPreloadHolder.DEBUG_LOG_SLOW_QUERIES && SQLiteDebug.shouldLogSlowQuery(
execTime);
}
return false;
@@ -1608,7 +1608,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
if (mSql != null) {
msg.append(", sql=\"").append(trimSqlForDisplay(mSql)).append("\"");
}
final boolean dumpDetails = allowDetailedLog && Consts.DEBUG_LOG_DETAILED
final boolean dumpDetails = allowDetailedLog && NoPreloadHolder.DEBUG_LOG_DETAILED
&& mBindArgs != null && mBindArgs.size() != 0;
if (dumpDetails) {
msg.append(", bindArgs=[");

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

@@ -39,7 +39,7 @@ public final class SQLiteDebug {
*
* {@hide}
*/
public static final class Consts {
public static final class NoPreloadHolder {
/**
* Controls the printing of informational SQL log messages.
*
@@ -103,8 +103,9 @@ public final class SQLiteDebug {
*/
public static boolean shouldLogSlowQuery(long elapsedTimeMillis) {
final int slowQueryMillis = Math.min(
SystemProperties.getInt(Consts.SLOW_QUERY_THRESHOLD_PROP, Integer.MAX_VALUE),
SystemProperties.getInt(Consts.SLOW_QUERY_THRESHOLD_UID_PROP,
SystemProperties.getInt(NoPreloadHolder.SLOW_QUERY_THRESHOLD_PROP,
Integer.MAX_VALUE),
SystemProperties.getInt(NoPreloadHolder.SLOW_QUERY_THRESHOLD_UID_PROP,
Integer.MAX_VALUE));
return elapsedTimeMillis >= slowQueryMillis;
}