Timeline : invalid query fix and revision query string

Change-Id: Ic58842a487a52e6000a20f90f5373660a9fb74a1
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java
index 969ba6b..287b4f7 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java
@@ -682,8 +682,7 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer
        }
 
        public List<List<Object>> getSystemDataFromDB(long start, long end) {
-               String where = "WHERE " + SystemDataDBTable.SAMPLING_TIME + " BETWEEN " + start + " AND " + end +
-                               " ORDER BY " + SystemDataDBTable.SAMPLING_TIME;
+               String where = "WHERE SAMPLING_TIME BETWEEN " + start + " AND " + end + " ORDER BY SAMPLING_TIME";
                List<List<Object>> result = systemDataTable.selectAllColumnData(where);
 
                if (result != null) {
@@ -695,15 +694,13 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer
 
        public Object[] getCPULoadFromDB(long time) {
                Object[] cpuLoadList = null;
-               String query = "SELECT " + SystemDataDBTable.CPU_LOAD + " FROM "
-                               + systemDataTable.getTableName() + " WHERE " + SystemDataDBTable.SAMPLING_TIME +
-                               " = (SELECT MAX(TIME) FROM " + systemDataTable.getTableName() + " WHERE " +
-                               SystemDataDBTable.SAMPLING_TIME + " <= " + time + ")";
+               String query = "SELECT CPU_LOAD FROM TIMELINE_SYSTEM_DATA WHERE SAMPLING_TIME = " +
+                               "(SELECT MAX(SAMPLING_TIME) FROM TIMELINE_SYSTEM_DATA WHERE SAMPLING_TIME <= " + time + ")";
                ResultSet rs = SqlConnectionManager.executeQueryRS(query);
                if (rs != null) {
                        try {
                                while (rs.next()) {
-                                       cpuLoadList = (Object[])rs.getArray(SystemDataDBTable.CPU_LOAD).getArray();
+                                       cpuLoadList = (Object[]) rs.getArray(SystemDataDBTable.CPU_LOAD).getArray();
                                }
                        } catch (SQLException e) {
                                e.printStackTrace();
@@ -711,13 +708,12 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer
                                SqlConnectionManager.releaseResultSet(rs);
                        }
                }
-               
+
                return cpuLoadList;
        }
 
        public List<List<Object>> getUIEventDataFromDB(long start, long end) {
-               String where = "WHERE " + UIEventDBTable.EVENT_TIME + " BETWEEN " + start + " AND " +
-                               end + " ORDER BY " + UIEventDBTable.EVENT_TIME;
+               String where = "WHERE EVENT_TIME BETWEEN " + start + " AND " + end + " ORDER BY EVENT_TIME";
                List<List<Object>> result = uiEventDBTable.selectAllColumnData(where);
 
                if (result != null) {
@@ -728,10 +724,8 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer
        }
 
        public List<List<Object>> getScreenShotDataFromDB(long start, long end) {
-               String where = "WHERE " + ScreenShotDBTable.CAPTURE_TIME + " BETWEEN " + start + " AND " +
-                               end + " ORDER BY " + ScreenShotDBTable.CAPTURE_TIME;
-               List<List<Object>> result = ScreenshotDataManager.getInstance().getScreenShotTable()
-                               .selectAllColumnData(where);
+               String where = "WHERE CAPTURE_TIME BETWEEN " + start + " AND " + end + " ORDER BY CAPTURE_TIME";
+               List<List<Object>> result = ScreenshotDataManager.getInstance().getScreenShotTable().selectAllColumnData(where);
 
                if (result != null) {
                        return result;
@@ -741,8 +735,7 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer
        }
 
        public List<List<Object>> getCustomDataFromDB(long start, long end) {
-               String where = "where TIME BETWEEN " + start + " AND " + end + " ORDER BY "
-                               + CustomDataDBTable.TIME;
+               String where = "WHERE TIME BETWEEN " + start + " AND " + end + " ORDER BY TIME";
                List<List<Object>> result = customDataDBTable.selectAllColumnData(where);
 
                if (result != null) {
@@ -754,9 +747,8 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer
 
        public Map<Integer, List<List<Object>>> getTargetProcessDataFromDB(long start, long end) {
                Map<Integer, List<List<Object>>> processedResult = new HashMap<Integer, List<List<Object>>>();
-
-               String where = "WHERE " + TargetProcessDBTable.SAMPLING_TIME + " BETWEEN " + start + " AND " + end +
-                               " ORDER BY " + TargetProcessDBTable.SAMPLING_TIME;
+               String where = "WHERE SAMPLING_TIME BETWEEN " + start + " AND " + end + " ORDER BY SAMPLING_TIME";
+               
                List<List<Object>> queryResult = targetProcessDBTable.selectAllColumnData(where);
                if (queryResult == null) {
                        return processedResult;
@@ -777,10 +769,8 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer
 
        public long getProcessMemoriesFromDB(long time) {
                long processMemories = 0;
-               String query = "SELECT " + TargetProcessDBTable.MEMORY_RESIDENT + " FROM "
-                               + targetProcessDBTable.getTableName() + " WHERE " + TargetProcessDBTable.SAMPLING_TIME +
-                               " = (SELECT MAX(TIME) FROM " + targetProcessDBTable.getTableName() + " WHERE " + 
-                               TargetProcessDBTable.SAMPLING_TIME + " <= " + time + ")";
+               String query = "SELECT MEMORY_RESIDENT FROM TIMELINE_TARGET_PROCESS WHERE SAMPLING_TIME = " +
+                               "(SELECT MAX(SAMPLING_TIME) FROM TIMELINE_TARGET_PROCESS WHERE SAMPLING_TIME <= " + time + ")";
                ResultSet rs = SqlConnectionManager.executeQueryRS(query);
                if (rs != null) {
                        try {