From 5dd67d6993aebb30445d637583501546523a16d2 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 16 Mar 2015 15:21:45 -0700 Subject: [PATCH] Reduce SQLite logspam. Suppress "automatic index on" warnings unless verbose logging is enabled. Also suppress any notices. Bug: 19773765 Change-Id: I4a4160e81e2cccf5119770182a64d6bbd9cc3505 --- core/jni/android_database_SQLiteGlobal.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/core/jni/android_database_SQLiteGlobal.cpp b/core/jni/android_database_SQLiteGlobal.cpp index d0c592e1461cb..0a1c9f75edec0 100644 --- a/core/jni/android_database_SQLiteGlobal.cpp +++ b/core/jni/android_database_SQLiteGlobal.cpp @@ -35,14 +35,18 @@ static const int SOFT_HEAP_LIMIT = 8 * 1024 * 1024; // Called each time a message is logged. -static void sqliteLogCallback(void* data, int iErrCode, const char* zMsg) { +static void sqliteLogCallback(void* data, int err, const char* msg) { bool verboseLog = !!data; - if (iErrCode == 0 || iErrCode == SQLITE_CONSTRAINT || iErrCode == SQLITE_SCHEMA) { + int errType = err & 255; + if (errType == 0 || errType == SQLITE_CONSTRAINT || errType == SQLITE_SCHEMA + || errType == SQLITE_NOTICE || err == SQLITE_WARNING_AUTOINDEX) { if (verboseLog) { - ALOG(LOG_VERBOSE, SQLITE_LOG_TAG, "(%d) %s\n", iErrCode, zMsg); + ALOG(LOG_VERBOSE, SQLITE_LOG_TAG, "(%d) %s\n", err, msg); } + } else if (errType == SQLITE_WARNING) { + ALOG(LOG_WARN, SQLITE_LOG_TAG, "(%d) %s\n", err, msg); } else { - ALOG(LOG_ERROR, SQLITE_LOG_TAG, "(%d) %s\n", iErrCode, zMsg); + ALOG(LOG_ERROR, SQLITE_LOG_TAG, "(%d) %s\n", err, msg); } }