From 6247a7cd627a9a842f8f46d2205634c274a0dde6 Mon Sep 17 00:00:00 2001 From: "hyeran74.kim" Date: Tue, 16 Sep 2014 17:49:47 +0900 Subject: [PATCH] File : remove unnecessary columns in a select query when getting the chart row index Change-Id: Ice194da2b9920370739bf4fd2cdac6cca739cd7f Signed-off-by: hyeran74.kim --- .../dynamicanalyzer/ui/file/FileChartView.java | 4 +-- .../dynamicanalyzer/ui/file/data/FileApiDB.java | 20 ++++++++----- .../dynamicanalyzer/ui/file/model/FileEvent.java | 35 +++++++++++++--------- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java index 331175a..99a325d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java @@ -169,9 +169,9 @@ public class FileChartView extends DAViewComposite { LogData ldata = (LogData) obData; dataTime = ldata.getTime(); int seq = ldata.getSeq(); - List event = chartManager.getApiDB().selectFileEventBySeq(seq); + FileEvent event = chartManager.getApiDB().selectFileEventBySeq(seq); if(event != null) { - int selectedIndex[] = fileChartBoard.getChartIndex(event.get(0)); + int selectedIndex[] = fileChartBoard.getChartIndex(event); fileChartBoard.selectItem(selectedIndex[0], selectedIndex[1]); if (null != lastSelectedItemForSummary) { AnalyzerManager.getCurrentPage().updateView( diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java index 11c95a5..a21fea2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java @@ -135,7 +135,11 @@ public class FileApiDB extends DBTable { + COLUMN.TARGET.getName() + " = 'true'"; private static final String SELECT_FILE_EVENT_BY_SEQ = "select " - + selectAllColumn + //+ selectAllColumn + + COLUMN.SEQ.getName() + " , " + + COLUMN.FILE_PATH.getName() + " , " + + COLUMN.PID.getName() + " , " + + COLUMN.TID.getName() + " from " + TABLE_NAME + " where " + COLUMN.SEQ.getName() + " = '%d'"+ " and " @@ -210,17 +214,19 @@ public class FileApiDB extends DBTable { return apiList; } - public List selectFileEventBySeq(long seq) { + public FileEvent selectFileEventBySeq(long seq) { String query = String.format(SELECT_FILE_EVENT_BY_SEQ, seq); List> result = SqlConnectionManager.executeQuery(query); if (null == result || result.size() == 0 || result.get(0).size() == 0) { return null; } - List apiList = new ArrayList(); - for (List data : result) { - apiList.add(new FileEvent(data)); - } - return apiList; + List data = result.get(0); + FileEvent fileEvent = new FileEvent( + (Integer) data.get(FileApiDB.COLUMN.SEQ.getValue()), + (String) data.get(FileApiDB.COLUMN.FILE_PATH.getValue()), + (Integer) data.get(FileApiDB.COLUMN.PID.getValue()), + (Integer) data.get(FileApiDB.COLUMN.TID.getValue())); + return fileEvent; } public List select() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java index c38b0d4..3145bbf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java @@ -75,21 +75,28 @@ public class FileEvent extends FileData{ this.target = target; } + public FileEvent(int seq, String filePath, int pid, int tid) { + this.seq = seq; + this.filePath = filePath; + this.pid = pid; + this.tid = tid; + } + public FileEvent(List data) { - this.seq = (Integer)data.get(FileApiDB.COLUMN.SEQ.getValue()); - this.filePath = (String)data.get(FileApiDB.COLUMN.FILE_PATH.getValue()); - this.pid = (Integer)data.get(FileApiDB.COLUMN.PID.getValue()); - this.tid = (Integer)data.get(FileApiDB.COLUMN.TID.getValue()); - this.fdValue = (Long)data.get(FileApiDB.COLUMN.FD.getValue()); - this.fdApiType = (Integer)data.get(FileApiDB.COLUMN.API_TYPE.getValue()); - this.apiId = (Integer)data.get(FileApiDB.COLUMN.API_ID.getValue()); - this.time = (Long)data.get(FileApiDB.COLUMN.EVENT_TIME.getValue()); - this.fileSize = (Long)data.get(FileApiDB.COLUMN.FILE_SIZE.getValue()); - this.size = (Long)data.get(FileApiDB.COLUMN.SIZE.getValue()); - this.ret = (String)data.get(FileApiDB.COLUMN.RETURN_VALUE.getValue()); - this.args = (String)data.get(FileApiDB.COLUMN.ARGS.getValue()); - this.errno = (Long)data.get(FileApiDB.COLUMN.ERRNO.getValue()); - this.target = (Boolean)data.get(FileApiDB.COLUMN.TARGET.getValue()); + this.seq = (Integer) data.get(FileApiDB.COLUMN.SEQ.getValue()); + this.filePath = (String) data.get(FileApiDB.COLUMN.FILE_PATH.getValue()); + this.pid = (Integer) data.get(FileApiDB.COLUMN.PID.getValue()); + this.tid = (Integer) data.get(FileApiDB.COLUMN.TID.getValue()); + this.fdValue = (Long) data.get(FileApiDB.COLUMN.FD.getValue()); + this.fdApiType = (Integer) data.get(FileApiDB.COLUMN.API_TYPE.getValue()); + this.apiId = (Integer) data.get(FileApiDB.COLUMN.API_ID.getValue()); + this.time = (Long) data.get(FileApiDB.COLUMN.EVENT_TIME.getValue()); + this.fileSize = (Long) data.get(FileApiDB.COLUMN.FILE_SIZE.getValue()); + this.size = (Long) data.get(FileApiDB.COLUMN.SIZE.getValue()); + this.ret = (String) data.get(FileApiDB.COLUMN.RETURN_VALUE.getValue()); + this.args = (String) data.get(FileApiDB.COLUMN.ARGS.getValue()); + this.errno = (Long) data.get(FileApiDB.COLUMN.ERRNO.getValue()); + this.target = (Boolean) data.get(FileApiDB.COLUMN.TARGET.getValue()); } public List getDBData() { -- 2.7.4