Modified to limit battery statistics default result size

Change-Id: Ibbda5a3f9ce6c17da8844fc7442d63bd0794a7a5
Signed-off-by: Somin Kim <somin926.kim@samsung.com>

diff --git a/src/battery-stats/BatteryStatisticsTypes.h b/src/battery-stats/BatteryStatisticsTypes.h
index 11dd915..ad2442b 100644 (file)
--- a/src/battery-stats/BatteryStatisticsTypes.h
+++ b/src/battery-stats/BatteryStatisticsTypes.h
@@ -54,6 +54,7 @@
 #define BATTERY_PID "Pid"
 
 #define CURRENT_TIME (int)(time(0))
+#define BATTERY_DEFAULT_LIMIT 50
 
 /* Typedefs */
 namespace ctx {

diff --git a/src/battery-stats/BatteryUsage.cpp b/src/battery-stats/BatteryUsage.cpp
index 532234c..ca2febc 100644 (file)
--- a/src/battery-stats/BatteryUsage.cpp
+++ b/src/battery-stats/BatteryUsage.cpp
@@ -50,18 +50,13 @@ int BatteryUsageProvider::read(Json option, Json *requestResult)
                endTime = CURRENT_TIME;
        }
 
-       int resultSize;
-       bool hasLimit = option.get(NULL, KEY_RESULT_SIZE, &resultSize);
+       int resultSize = BATTERY_DEFAULT_LIMIT;
+       option.get(NULL, KEY_RESULT_SIZE, &resultSize);
 
        BatteryStatsQuerier *querier = getQuerier(option);
        IF_FAIL_RETURN(querier, ERR_OPERATION_FAILED);
 
-       int error;
-       if (hasLimit) {
-               error = querier->query((startTime > timeSpanPoint)? startTime : timeSpanPoint, endTime, resultSize);
-       } else {
-               error = querier->query((startTime > timeSpanPoint)? startTime : timeSpanPoint, endTime);
-       }
+       int error = querier->query((startTime > timeSpanPoint)? startTime : timeSpanPoint, endTime, resultSize);
        IF_FAIL_RETURN_TAG(error == ERR_NONE, ERR_OPERATION_FAILED, _E, "Failed to get app battery usage");
 
        return ERR_NONE;

diff --git a/src/battery-stats/Querier.cpp b/src/battery-stats/Querier.cpp
index f5ce03f..b06936c 100644 (file)
--- a/src/battery-stats/Querier.cpp
+++ b/src/battery-stats/Querier.cpp
@@ -51,16 +51,6 @@ int BatteryStatsQuerier::query(const char *sql)
        return __dbMgr.execute(0, sql, this) ? ERR_NONE : ERR_OPERATION_FAILED;
 }
 
-int BatteryStatsQuerier::query(int startTime, int endTime)
-{
-       char *sql = sqlite3_mprintf(BATTERY_USAGE_QUERY, startTime, endTime, startTime, endTime);
-
-       int error = query(sql);
-       sqlite3_free(sql);
-
-       return error;
-}
-
 int BatteryStatsQuerier::query(int startTime, int endTime, int resultSize)
 {
        char *sql = sqlite3_mprintf(BATTERY_USAGE_QUERY " LIMIT %d", startTime, endTime, startTime, endTime, resultSize);
@@ -71,16 +61,6 @@ int BatteryStatsQuerier::query(int startTime, int endTime, int resultSize)
        return error;
 }
 
-int BatteryStatsQuerier::queryRecent(int startTime, int endTime)
-{
-       char *sql = sqlite3_mprintf(RECENT_BATTERY_USAGE_QUERY, startTime, endTime,  endTime - startTime, startTime, endTime);
-
-       int error = query(sql);
-       sqlite3_free(sql);
-
-       return error;
-}
-
 int BatteryStatsQuerier::queryRecent(int startTime, int endTime, int resultSize)
 {
        char *sql = sqlite3_mprintf(RECENT_BATTERY_USAGE_QUERY " LIMIT %d", startTime, endTime, endTime - startTime, startTime, endTime, resultSize);

diff --git a/src/battery-stats/Querier.h b/src/battery-stats/Querier.h
index 6d320ae..c63bd18 100644 (file)
--- a/src/battery-stats/Querier.h
+++ b/src/battery-stats/Querier.h
@@ -27,10 +27,8 @@ namespace ctx {
                BatteryStatsQuerier(ContextProvider *provider, Json option);
                ~BatteryStatsQuerier();
 
-               // For now, Default result size(10) isn't applied, unlike other history type.
-               int query(int startTime, int endTime);
+               // Default result size for battery statistics is 50, unlike other history type.
                int query(int startTime, int endTime, int resultSize);
-               int queryRecent(int startTime, int endTime);
                int queryRecent(int startTime, int endTime, int resultSize);
 
        protected:

diff --git a/src/battery-stats/RecentBatteryUsage.cpp b/src/battery-stats/RecentBatteryUsage.cpp
index eda9d8e..ad3d627 100644 (file)
--- a/src/battery-stats/RecentBatteryUsage.cpp
+++ b/src/battery-stats/RecentBatteryUsage.cpp
@@ -32,19 +32,14 @@ int RecentBatteryUsageProvider::read(Json option, Json *requestResult)
 {
        BatteryMonitor::getInstance()->prepareData();
 
-       int resultSize;
-       bool hasLimit = option.get(NULL, KEY_RESULT_SIZE, &resultSize);
+       int resultSize = BATTERY_DEFAULT_LIMIT;
+       option.get(NULL, KEY_RESULT_SIZE, &resultSize);
 
        BatteryStatsQuerier *querier = getQuerier(option);
        IF_FAIL_RETURN(querier, ERR_OPERATION_FAILED);
 
-       int error;
        int lastFullTime = BatteryMonitor::getInstance()->getLastFullTime();
-       if (hasLimit) {
-               error = querier->queryRecent(lastFullTime, CURRENT_TIME, resultSize);
-       } else {
-               error = querier->queryRecent(lastFullTime, CURRENT_TIME);
-       }
+       int error = querier->queryRecent(lastFullTime, CURRENT_TIME, resultSize);
        IF_FAIL_RETURN_TAG(error == ERR_NONE, ERR_OPERATION_FAILED, _E, "Failed to get recent app battery usage");
 
        return ERR_NONE;