Remove logTimeStat

Author: developernotes

src/net/sqlcipher/database/SQLiteDatabase.java

@@ -40,7 +40,6 @@
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Random;
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.concurrent.locks.ReentrantLock;
@@ -368,7 +367,6 @@ public static synchronized void loadLibs (Context context, File workingDir) {
     private static int sQueryLogTimeInMillis = 0;  // lazily initialized
     private static final int QUERY_LOG_SQL_LENGTH = 64;
     private static final String COMMIT_SQL = "COMMIT;";
-    private final Random mRandom = new Random();
     private String mLastSqlStatement = null;
 
     // String prefix for slow database query EventLog records that show
@@ -2181,7 +2179,6 @@ public void execSQL(String sql) throws SQLException {
         if (!isOpen()) {
             throw new IllegalStateException("database not open");
         }
-        logTimeStat(mLastSqlStatement, timeStart, GET_LOCK_LOG_PREFIX);
         try {
             native_execSQL(sql);
         } catch (SQLiteDatabaseCorruptException e) {
@@ -2190,15 +2187,6 @@ public void execSQL(String sql) throws SQLException {
         } finally {
             unlock();
         }
-
-        // Log commit statements along with the most recently executed
-        // SQL statement for disambiguation.  Note that instance
-        // equality to COMMIT_SQL is safe here.
-        if (sql == COMMIT_SQL) {
-            logTimeStat(mLastSqlStatement, timeStart, COMMIT_SQL);
-        } else {
-            logTimeStat(sql, timeStart, null);
-        }
     }
 
     public void rawExecSQL(String sql){
@@ -2207,7 +2195,6 @@ public void rawExecSQL(String sql){
         if (!isOpen()) {
             throw new IllegalStateException("database not open");
         }
-        logTimeStat(mLastSqlStatement, timeStart, GET_LOCK_LOG_PREFIX);
         try {
             native_rawExecSQL(sql);
         } catch (SQLiteDatabaseCorruptException e) {
@@ -2216,15 +2203,6 @@ public void rawExecSQL(String sql){
         } finally {
             unlock();
         }
-
-        // Log commit statements along with the most recently executed
-        // SQL statement for disambiguation.  Note that instance
-        // equality to COMMIT_SQL is safe here.
-        if (sql == COMMIT_SQL) {
-            logTimeStat(mLastSqlStatement, timeStart, COMMIT_SQL);
-        } else {
-            logTimeStat(sql, timeStart, null);
-        }
     }
 
     /**
@@ -2266,7 +2244,6 @@ public void execSQL(String sql, Object[] bindArgs) throws SQLException {
             }
             unlock();
         }
-        logTimeStat(sql, timeStart);
     }
 
     @Override
@@ -2469,67 +2446,6 @@ public final String getPath() {
         return mPath;
     }
 
-    /* package */ void logTimeStat(String sql, long beginMillis) {
-        logTimeStat(sql, beginMillis, null);
-    }
-
-    /* package */ void logTimeStat(String sql, long beginMillis, String prefix) {
-        // Keep track of the last statement executed here, as this is
-        // the common funnel through which all methods of hitting
-        // libsqlite eventually flow.
-        mLastSqlStatement = sql;
-
-        // Sample fast queries in proportion to the time taken.
-        // Quantize the % first, so the logged sampling probability
-        // exactly equals the actual sampling rate for this query.
-
-        int samplePercent;
-        long durationMillis = SystemClock.uptimeMillis() - beginMillis;
-        if (durationMillis == 0 && prefix == GET_LOCK_LOG_PREFIX) {
-            // The common case is locks being uncontended.  Don't log those,
-            // even at 1%, which is our default below.
-            return;
-        }
-        if (sQueryLogTimeInMillis == 0) {
-            sQueryLogTimeInMillis = 500;//SystemProperties.getInt("db.db_operation.threshold_ms", 500);
-        }
-        if (durationMillis >= sQueryLogTimeInMillis) {
-            samplePercent = 100;
-        } else {;
-            samplePercent = (int) (100 * durationMillis / sQueryLogTimeInMillis) + 1;
-            if (mRandom.nextInt(100) >= samplePercent) return;
-        }
-
-        // Note: the prefix will be "COMMIT;" or "GETLOCK:" when non-null.  We wait to do
-        // it here so we avoid allocating in the common case.
-        if (prefix != null) {
-            sql = prefix + sql;
-        }
-
-        if (sql.length() > QUERY_LOG_SQL_LENGTH) sql = sql.substring(0, QUERY_LOG_SQL_LENGTH);
-
-        // ActivityThread.currentPackageName() only returns non-null if the
-        // current thread is an application main thread.  This parameter tells
-        // us whether an event loop is blocked, and if so, which app it is.
-        //
-        // Sadly, there's no fast way to determine app name if this is *not* a
-        // main thread, or when we are invoked via Binder (e.g. ContentProvider).
-        // Hopefully the full path to the database will be informative enough.
-
-        //TODO get the current package name
-        String blockingPackage = "unknown";//ActivityThread.currentPackageName();
-        if (blockingPackage == null) blockingPackage = "";
-
-        /*
-          EventLog.writeEvent(
-          EVENT_DB_OPERATION,
-          getPathForLogs(),
-          sql,
-          durationMillis,
-          blockingPackage,
-          samplePercent);*/
-    }
-
     /**
      * Removes email addresses from database filenames before they're
      * logged to the EventLog where otherwise apps could potentially

src/net/sqlcipher/database/SQLiteQuery.java

@@ -62,7 +62,6 @@ public class SQLiteQuery extends SQLiteProgram {
             int maxRead, int lastPos) {
         long timeStart = SystemClock.uptimeMillis();
         mDatabase.lock();
-        mDatabase.logTimeStat(mSql, timeStart, SQLiteDatabase.GET_LOCK_LOG_PREFIX);
         try {
             acquireReference();
             try {
@@ -77,7 +76,6 @@ public class SQLiteQuery extends SQLiteProgram {
                 if (SQLiteDebug.DEBUG_SQL_STATEMENTS) {
                     Log.d(TAG, "fillWindow(): " + mSql);
                 }
-                mDatabase.logTimeStat(mSql, timeStart);
                 return numRows;
             } catch (IllegalStateException e){
                 // simply ignore it

src/net/sqlcipher/database/SQLiteStatement.java

@@ -56,7 +56,6 @@ public void execute() {
         acquireReference();
         try {
             native_execute();
-            mDatabase.logTimeStat(mSql, timeStart);
         } finally {
             releaseReference();
             mDatabase.unlock();
@@ -82,7 +81,6 @@ public long executeInsert() {
         acquireReference();
         try {
             native_execute();
-            mDatabase.logTimeStat(mSql, timeStart);
             return (mDatabase.lastChangeCount() > 0) ? mDatabase.lastInsertRow() : -1;
         } finally {
             releaseReference();
@@ -100,7 +98,6 @@ public int executeUpdateDelete() {
         acquireReference();
         try {
             native_execute();
-            mDatabase.logTimeStat(mSql, timeStart);
             return mDatabase.lastChangeCount();
         } finally {
             releaseReference();
@@ -126,7 +123,6 @@ public long simpleQueryForLong() {
         acquireReference();
         try {
             long retValue = native_1x1_long();
-            mDatabase.logTimeStat(mSql, timeStart);
             return retValue;
         } finally {
             releaseReference();
@@ -152,7 +148,6 @@ public String simpleQueryForString() {
         acquireReference();
         try {
             String retValue = native_1x1_string();
-            mDatabase.logTimeStat(mSql, timeStart);
             return retValue;
         } finally {
             releaseReference();