network : change the select db query using resultset function. 30/28430/2
authorHyunjong.park <phjwithyou.park@samsung.com>
Tue, 7 Oct 2014 05:06:12 +0000 (14:06 +0900)
committerjuyoung kim <j0.kim@samsung.com>
Wed, 15 Oct 2014 03:05:41 +0000 (20:05 -0700)
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I981d4c7e5652848df6a7b6b3fe9be1b4c1e0e5f4

org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkAPIDBManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkSeriesDBManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/type/NetworkAPIType.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/type/NetworkSeriesType.java

index 6cace58..0124b4d 100644 (file)
@@ -150,7 +150,7 @@ public class NetworkChart {
                        DAChartSeriesItem seriesItem = null;
                        double time = getConvertTime(data.getTime());
                        Color color = ColorResources.NETWORK_API_USED;
-                       String apiName = Global.getFunctionName(data.getApiNameID());
+                       String apiName = Global.getFunctionName(data.getApiId());
                        if (data.getErrno() != 0) {
                                color = ColorResources.NETWORK_API_FAILED;
                        }
index 0258b92..65f3ee8 100644 (file)
@@ -231,7 +231,7 @@ public class NetworkTable extends DAApiListTableComposite {
        }
 
        private String apiEqualsKey(NetworkAPIType contentTemp) {
-               return Global.getFunctionName(contentTemp.getApiNameID())
+               return Global.getFunctionName(contentTemp.getApiId())
                                + contentTemp.getPid() + contentTemp.getTid();
        }
 
index 7c0b5a6..c24d68a 100644 (file)
@@ -27,6 +27,7 @@
 package org.tizen.dynamicanalyzer.ui.network.data;
 
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
@@ -75,41 +76,32 @@ public class NetworkAPIDBManager extends DBTable {
        public static final int DB_LIB_NAME_INDEX = 14;
 
        private static final String SELECT_API_SERIES_QUERY = "select " //$NON-NLS-1$ 
-                       + SEQ + CommonConstants.COMMA
-                       + DESTINATION_ADDRESS
-                       + CommonConstants.COMMA + FD_VALUE
-                       + CommonConstants.COMMA
-                       + API_TIME + CommonConstants.COMMA
+                       + SEQ + CommonConstants.COMMA + DESTINATION_ADDRESS + CommonConstants.COMMA
+                       + FD_VALUE
+                       + CommonConstants.COMMA + API_TIME + CommonConstants.COMMA
                        + API_NAME_ID
-                       + CommonConstants.COMMA + ERRNO
-                       + " from " //$NON-NLS-1$
-                       + TABLENAME + " where %s <= " + API_TIME + " and "
-                       + API_TIME
-                       + " <= %s";//$NON-NLS-1$
+                       + CommonConstants.COMMA + ERRNO + " from " //$NON-NLS-1$
+                       + TABLENAME + " where " + API_TIME + " BETWEEN %s and %s";//$NON-NLS-1$
 
        private static final String SELECT_API_TABLE_CHILD_QUERY = "select " + SEQ//$NON-NLS-1$
-                       + CommonConstants.COMMA + DESTINATION_ADDRESS
-                       + CommonConstants.COMMA + FD_VALUE + CommonConstants.COMMA
-                       + API_TIME + CommonConstants.COMMA + API_NAME_ID
-                       + CommonConstants.COMMA + ERRNO + CommonConstants.COMMA + PID
-                       + CommonConstants.COMMA + TID + CommonConstants.COMMA + ARGUMENT
-                       + CommonConstants.COMMA + RETURN + CommonConstants.COMMA
-                       + BYTE_SIZE + CommonConstants.COMMA + PAYLOAD
-                       + CommonConstants.COMMA + API_TYPE + CommonConstants.COMMA
-                       + CALLER_PC_ADDRESS + CommonConstants.COMMA + LIB_NAME + " from "//$NON-NLS-1$
+                       + CommonConstants.COMMA + DESTINATION_ADDRESS + CommonConstants.COMMA + FD_VALUE
+                       + CommonConstants.COMMA + API_TIME + CommonConstants.COMMA + API_NAME_ID
+                       + CommonConstants.COMMA + ERRNO + CommonConstants.COMMA + PID + CommonConstants.COMMA
+                       + TID + CommonConstants.COMMA + ARGUMENT + CommonConstants.COMMA + RETURN
+                       + CommonConstants.COMMA + BYTE_SIZE + CommonConstants.COMMA + PAYLOAD
+                       + CommonConstants.COMMA + API_TYPE + CommonConstants.COMMA + CALLER_PC_ADDRESS
+                       + CommonConstants.COMMA + LIB_NAME + " from "//$NON-NLS-1$
                        + TABLENAME + " where " + DESTINATION_ADDRESS + " = '%s' and "//$NON-NLS-1$
                        + FD_VALUE + " = '%s'";//$NON-NLS-1$
 
        private static final String SELECT_API_TABLE_PARENT_QUERY = "select " + SEQ//$NON-NLS-1$
-                       + CommonConstants.COMMA + DESTINATION_ADDRESS
-                       + CommonConstants.COMMA + FD_VALUE + CommonConstants.COMMA
-                       + API_TIME + CommonConstants.COMMA + API_NAME_ID
-                       + CommonConstants.COMMA + ERRNO + CommonConstants.COMMA + PID
-                       + CommonConstants.COMMA + TID + CommonConstants.COMMA + ARGUMENT
-                       + CommonConstants.COMMA + RETURN + CommonConstants.COMMA
-                       + BYTE_SIZE + CommonConstants.COMMA + PAYLOAD
-                       + CommonConstants.COMMA + API_TYPE + CommonConstants.COMMA
-                       + CALLER_PC_ADDRESS + CommonConstants.COMMA + LIB_NAME + " from "//$NON-NLS-1$
+                       + CommonConstants.COMMA + DESTINATION_ADDRESS + CommonConstants.COMMA + FD_VALUE
+                       + CommonConstants.COMMA + API_TIME + CommonConstants.COMMA + API_NAME_ID
+                       + CommonConstants.COMMA + ERRNO + CommonConstants.COMMA + PID + CommonConstants.COMMA
+                       + TID + CommonConstants.COMMA + ARGUMENT + CommonConstants.COMMA + RETURN
+                       + CommonConstants.COMMA + BYTE_SIZE + CommonConstants.COMMA + PAYLOAD
+                       + CommonConstants.COMMA + API_TYPE + CommonConstants.COMMA + CALLER_PC_ADDRESS
+                       + CommonConstants.COMMA + LIB_NAME + " from "//$NON-NLS-1$
                        + TABLENAME + " where " + DESTINATION_ADDRESS + " = '%s'";//$NON-NLS-1$ //$NON-NLS-2$
 
        @Override
@@ -118,72 +110,92 @@ public class NetworkAPIDBManager extends DBTable {
        }
 
        public NetworkAPIDBManager() {
-               addColumn(new DBColumn(SEQ, DBConstants.PRIMARY_KEY,
-                               DBConstants.INTEGER));
-               addColumn(new DBColumn(DESTINATION_ADDRESS, DBConstants.NOT_NULL,
-                               DBConstants.BIG_TEXT));
+               addColumn(new DBColumn(SEQ, DBConstants.PRIMARY_KEY, DBConstants.INTEGER));
+               addColumn(new DBColumn(DESTINATION_ADDRESS, DBConstants.NOT_NULL, DBConstants.BIG_TEXT));
                addColumn(new DBColumn(FD_VALUE, DBConstants.NOT_NULL, DBConstants.TEXT));
                addColumn(new DBColumn(API_TIME, DBConstants.NOT_NULL, DBConstants.LONG));
-               addColumn(new DBColumn(API_NAME_ID, DBConstants.NOT_NULL,
-                               DBConstants.INTEGER));
+               addColumn(new DBColumn(API_NAME_ID, DBConstants.NOT_NULL, DBConstants.INTEGER));
                addColumn(new DBColumn(ERRNO, DBConstants.NOT_NULL, DBConstants.LONG));
                addColumn(new DBColumn(PID, DBConstants.NOT_NULL, DBConstants.INTEGER));
                addColumn(new DBColumn(TID, DBConstants.NOT_NULL, DBConstants.INTEGER));
-               addColumn(new DBColumn(ARGUMENT, DBConstants.NOT_NULL,
-                               DBConstants.BIG_TEXT));
-               addColumn(new DBColumn(RETURN, DBConstants.NOT_NULL,
-                               DBConstants.BIG_TEXT));
-               addColumn(new DBColumn(BYTE_SIZE, DBConstants.NOT_NULL,
-                               DBConstants.INTEGER));
-               addColumn(new DBColumn(PAYLOAD, DBConstants.NOT_NULL,
-                               DBConstants.BIG_TEXT));
-               addColumn(new DBColumn(API_TYPE, DBConstants.NOT_NULL,
-                               DBConstants.INTEGER));
-               addColumn(new DBColumn(CALLER_PC_ADDRESS, DBConstants.NOT_NULL,
-                               DBConstants.LONG));
-               addColumn(new DBColumn(LIB_NAME, DBConstants.NOT_NULL, DBConstants.TEXT));
+               addColumn(new DBColumn(ARGUMENT, DBConstants.NOT_NULL, DBConstants.BIG_TEXT));
+               addColumn(new DBColumn(RETURN, DBConstants.NOT_NULL, DBConstants.BIG_TEXT));
+               addColumn(new DBColumn(BYTE_SIZE, DBConstants.NOT_NULL, DBConstants.INTEGER));
+               addColumn(new DBColumn(PAYLOAD, DBConstants.NOT_NULL, DBConstants.BIG_TEXT));
+               addColumn(new DBColumn(API_TYPE, DBConstants.NOT_NULL, DBConstants.INTEGER));
+               addColumn(new DBColumn(CALLER_PC_ADDRESS, DBConstants.NOT_NULL, DBConstants.LONG));
+               addColumn(new DBColumn(LIB_NAME, DBConstants.NOT_NULL, DBConstants.INTEGER));
        }
 
        public void insert(List<List<Object>> insetData) {
                insertData(insetData);
        }
 
-       public List<NetworkAPIType> selectAPISeries(double visibleStartTime,
-                       double visibleEndTime) {
-               double selectStartTime = visibleStartTime
-                               * TimelineConstants.MEGA_DOUBLE;
+       public List<NetworkAPIType> selectAPISeries(double visibleStartTime, double visibleEndTime) {
+               double selectStartTime = visibleStartTime * TimelineConstants.MEGA_DOUBLE;
                double selectEndTime = visibleEndTime * TimelineConstants.MEGA_DOUBLE;
-               String query = String.format(SELECT_API_SERIES_QUERY, selectStartTime,
-                               selectEndTime);
-               List<List<Object>> result = SqlConnectionManager.executeQuery(query);
-               if (null == result || result.size() == 0 || result.get(0).size() == 0) {
+               String query = String.format(SELECT_API_SERIES_QUERY, selectStartTime, selectEndTime);
+               ResultSet rs = SqlConnectionManager.executeQueryRS(query);
+               if (rs == null) {
+                       SqlConnectionManager.releaseResultSet(rs);
                        return null;
                }
-               List<NetworkAPIType> statusSeriesList = new ArrayList<NetworkAPIType>();
-               for (List<Object> data : result) {
-                       statusSeriesList.add(new NetworkAPIType(data));
+               List<NetworkAPIType> returnValue = new ArrayList<NetworkAPIType>();
+               try {
+                       while (rs.next()) {
+                               NetworkAPIType data = new NetworkAPIType();
+                               data.setSeq(rs.getInt(DB_SEQ_INDEX + 1));
+                               data.setDestinationAddress(rs.getString(DB_DESTINATION_ADDRESS_INDEX + 1));
+                               data.setFdStr(rs.getString(DB_FD_VALUE_INDEX + 1));
+                               data.setTime(rs.getLong(DB_API_TIME_INDEX + 1));
+                               data.setApiId(rs.getInt(DB_API_NAME_ID_INDEX + 1));
+                               data.setErrNo(rs.getLong(DB_ERRNO_INDEX + 1));
+                               returnValue.add(data);
+                       }
+                       SqlConnectionManager.releaseResultSet(rs);
+               } catch (SQLException e) {
+                       e.printStackTrace();
                }
-               return statusSeriesList;
+               return returnValue;
        }
 
-       public List<NetworkAPIType> selectAPITable(String address, String fd,
-                       boolean isParentChart) {
-               String query = String.format(SELECT_API_TABLE_CHILD_QUERY,
-                               address.trim(), fd.trim());
+       public List<NetworkAPIType> selectAPITable(String address, String fd, boolean isParentChart) {
+               String query = String.format(SELECT_API_TABLE_CHILD_QUERY, address.trim(), fd.trim());
                if (isParentChart) {
-                       query = String
-                                       .format(SELECT_API_TABLE_PARENT_QUERY, address.trim());
+                       query = String.format(SELECT_API_TABLE_PARENT_QUERY, address.trim());
                }
 
-               List<List<Object>> result = SqlConnectionManager.executeQuery(query);
-               if (null == result || result.size() == 0 || result.get(0).size() == 0) {
+               ResultSet rs = SqlConnectionManager.executeQueryRS(query);
+               if (rs == null) {
+                       SqlConnectionManager.releaseResultSet(rs);
                        return null;
                }
-               List<NetworkAPIType> statusSeriesList = new ArrayList<NetworkAPIType>();
-               for (List<Object> data : result) {
-                       statusSeriesList.add(new NetworkAPIType(data));
+               List<NetworkAPIType> returnValue = new ArrayList<NetworkAPIType>();
+               try {
+                       while (rs.next()) {
+                               NetworkAPIType data = new NetworkAPIType();
+                               data.setSeq(rs.getInt(DB_SEQ_INDEX + 1));
+                               data.setDestinationAddress(rs.getString(DB_DESTINATION_ADDRESS_INDEX + 1));
+                               data.setFdStr(rs.getString(DB_FD_VALUE_INDEX + 1));
+                               data.setTime(rs.getLong(DB_API_TIME_INDEX + 1));
+                               data.setApiId(rs.getInt(DB_API_NAME_ID_INDEX + 1));
+                               data.setErrNo(rs.getLong(DB_ERRNO_INDEX + 1));
+                               data.setPid(rs.getInt(DB_PID_INDEX + 1));
+                               data.setTid(rs.getInt(DB_TID_INDEX + 1));
+                               data.setArgs(rs.getString(DB_ARGUMENT_INDEX + 1));
+                               data.setReturn(rs.getString(DB_RETURN_INDEX + 1));
+                               data.setPacketMessageSize(rs.getInt(DB_BYTE_SIZE_INDEX + 1));
+                               data.setPacketMessage(rs.getString(DB_PAYLOAD_INDEX + 1));
+                               data.setFdApiType(rs.getInt(DB_API_TYPE_INDEX + 1));
+                               data.setCallerAddress(rs.getLong(DB_CALLER_PC_ADDRESS_INDEX + 1));
+                               data.setBinaryId(rs.getInt(DB_LIB_NAME_INDEX + 1));
+                               returnValue.add(data);
+                       }
+                       SqlConnectionManager.releaseResultSet(rs);
+               } catch (SQLException e) {
+                       e.printStackTrace();
                }
-               return statusSeriesList;
+               return returnValue;
        }
 
        @Override
@@ -194,36 +206,23 @@ public class NetworkAPIDBManager extends DBTable {
                        isPrepared = false;
                } else {
                        try {
-                               prep.setInt(DB_SEQ_INDEX + 1,
-                                               (Integer) (rowData.get(DB_SEQ_INDEX)));
+                               prep.setInt(DB_SEQ_INDEX + 1, (Integer) (rowData.get(DB_SEQ_INDEX)));
                                prep.setString(DB_DESTINATION_ADDRESS_INDEX + 1,
                                                (String) (rowData.get(DB_DESTINATION_ADDRESS_INDEX)));
-                               prep.setString(DB_FD_VALUE_INDEX + 1,
-                                               (String) (rowData.get(DB_FD_VALUE_INDEX)));
-                               prep.setLong(DB_API_TIME_INDEX + 1,
-                                               (Long) (rowData.get(DB_API_TIME_INDEX)));
-                               prep.setInt(DB_API_NAME_ID_INDEX + 1,
-                                               (Integer) (rowData.get(DB_API_NAME_ID_INDEX)));
-                               prep.setLong(DB_ERRNO_INDEX + 1,
-                                               (Long) (rowData.get(DB_ERRNO_INDEX)));
-                               prep.setInt(DB_PID_INDEX + 1,
-                                               (Integer) (rowData.get(DB_PID_INDEX)));
-                               prep.setInt(DB_TID_INDEX + 1,
-                                               (Integer) (rowData.get(DB_TID_INDEX)));
-                               prep.setString(DB_ARGUMENT_INDEX + 1,
-                                               (String) (rowData.get(DB_ARGUMENT_INDEX)));
-                               prep.setString(DB_RETURN_INDEX + 1,
-                                               (String) (rowData.get(DB_RETURN_INDEX)));
-                               prep.setInt(DB_BYTE_SIZE_INDEX + 1,
-                                               (Integer) (rowData.get(DB_BYTE_SIZE_INDEX)));
-                               prep.setString(DB_PAYLOAD_INDEX + 1,
-                                               (String) (rowData.get(DB_PAYLOAD_INDEX)));
-                               prep.setInt(DB_API_TYPE_INDEX + 1,
-                                               (Integer) (rowData.get(DB_API_TYPE_INDEX)));
+                               prep.setString(DB_FD_VALUE_INDEX + 1, (String) (rowData.get(DB_FD_VALUE_INDEX)));
+                               prep.setLong(DB_API_TIME_INDEX + 1, (Long) (rowData.get(DB_API_TIME_INDEX)));
+                               prep.setInt(DB_API_NAME_ID_INDEX + 1, (Integer) (rowData.get(DB_API_NAME_ID_INDEX)));
+                               prep.setLong(DB_ERRNO_INDEX + 1, (Long) (rowData.get(DB_ERRNO_INDEX)));
+                               prep.setInt(DB_PID_INDEX + 1, (Integer) (rowData.get(DB_PID_INDEX)));
+                               prep.setInt(DB_TID_INDEX + 1, (Integer) (rowData.get(DB_TID_INDEX)));
+                               prep.setString(DB_ARGUMENT_INDEX + 1, (String) (rowData.get(DB_ARGUMENT_INDEX)));
+                               prep.setString(DB_RETURN_INDEX + 1, (String) (rowData.get(DB_RETURN_INDEX)));
+                               prep.setInt(DB_BYTE_SIZE_INDEX + 1, (Integer) (rowData.get(DB_BYTE_SIZE_INDEX)));
+                               prep.setString(DB_PAYLOAD_INDEX + 1, (String) (rowData.get(DB_PAYLOAD_INDEX)));
+                               prep.setInt(DB_API_TYPE_INDEX + 1, (Integer) (rowData.get(DB_API_TYPE_INDEX)));
                                prep.setLong(DB_CALLER_PC_ADDRESS_INDEX + 1,
                                                (Long) (rowData.get(DB_CALLER_PC_ADDRESS_INDEX)));
-                               prep.setString(DB_LIB_NAME_INDEX + 1,
-                                               (String) (rowData.get(DB_LIB_NAME_INDEX)));
+                               prep.setInt(DB_LIB_NAME_INDEX + 1, (Integer) (rowData.get(DB_LIB_NAME_INDEX)));
 
                        } catch (SQLException e) {
                                e.printStackTrace();
index c772a05..e77bd86 100644 (file)
@@ -46,7 +46,6 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogData;
 import org.tizen.dynamicanalyzer.ui.network.data.type.NetworkAPIType;
 import org.tizen.dynamicanalyzer.ui.network.data.type.NetworkSeriesType;
 import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea;
-import org.tizen.dynamicanalyzer.util.Logger;
 import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 
@@ -243,15 +242,15 @@ public class NetworkDataManager extends PageDataManager {
        /*** make network data thread ***/
        @Override
        protected void makeData(LogPackage pack) {
-               try {
+//             try {
                        Logs logs = pack.getLogs(DataChannelConstants.MSG_PROBE_NETWORK);
                        if (null != logs && logs.getRawLogs().size() != 0) {
                                List<LogData> inputs = logs.getLogs();
 
                                networkDataMaker.makeData(inputs);
                        }
-               } catch (Exception e) {
-                       Logger.error("exception network updateView");
-               }
+//             } catch (Exception e) {
+//                     Logger.error("exception network updateView");
+//             }
        }
 }
index 6202167..aea9c57 100644 (file)
@@ -27,6 +27,7 @@
 package org.tizen.dynamicanalyzer.ui.network.data;
 
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
@@ -60,19 +61,15 @@ public class NetworkSeriesDBManager extends DBTable {
        public final static int DB_API_ID_INDEX = 6;
        public final static int DB_PID_INDEX = 7;
 
-       private static final String SELECT_QUERY = "select " + RID
-                       + CommonConstants.COMMA + DESTINATION_ADDRESS
-                       + CommonConstants.COMMA + FD_VALUE + CommonConstants.COMMA
-                       + START_TIME + CommonConstants.COMMA + END_TIME
-                       + CommonConstants.COMMA + STATUS_TYPE + CommonConstants.COMMA
-                       + API_ID + CommonConstants.COMMA + PID + " from " + TABLENAME; //$NON-NLS-1$
-
-       private static final String SELECT_PID_QUERY = "select " + RID
-                       + CommonConstants.COMMA + DESTINATION_ADDRESS
-                       + CommonConstants.COMMA + FD_VALUE + CommonConstants.COMMA
-                       + START_TIME + CommonConstants.COMMA + END_TIME
-                       + CommonConstants.COMMA + STATUS_TYPE + CommonConstants.COMMA
-                       + API_ID + CommonConstants.COMMA + PID
+       private static final String SELECT_QUERY = "select " + RID + CommonConstants.COMMA
+                       + DESTINATION_ADDRESS + CommonConstants.COMMA + FD_VALUE + CommonConstants.COMMA
+                       + START_TIME + CommonConstants.COMMA + END_TIME + CommonConstants.COMMA + STATUS_TYPE
+                       + CommonConstants.COMMA + API_ID + CommonConstants.COMMA + PID + " from " + TABLENAME; //$NON-NLS-1$
+
+       private static final String SELECT_PID_QUERY = "select " + RID + CommonConstants.COMMA
+                       + DESTINATION_ADDRESS + CommonConstants.COMMA + FD_VALUE + CommonConstants.COMMA
+                       + START_TIME + CommonConstants.COMMA + END_TIME + CommonConstants.COMMA + STATUS_TYPE
+                       + CommonConstants.COMMA + API_ID + CommonConstants.COMMA + PID
                        + " from " + TABLENAME + " where pid = '%s'"; //$NON-NLS-1$
 
        private static int rid = 0;
@@ -83,18 +80,13 @@ public class NetworkSeriesDBManager extends DBTable {
        }
 
        public NetworkSeriesDBManager() {
-               addColumn(new DBColumn(RID, DBConstants.PRIMARY_KEY,
-                               DBConstants.INTEGER));
-               addColumn(new DBColumn(DESTINATION_ADDRESS, DBConstants.NOT_NULL,
-                               DBConstants.TEXT));
+               addColumn(new DBColumn(RID, DBConstants.PRIMARY_KEY, DBConstants.INTEGER));
+               addColumn(new DBColumn(DESTINATION_ADDRESS, DBConstants.NOT_NULL, DBConstants.TEXT));
                addColumn(new DBColumn(FD_VALUE, DBConstants.NOT_NULL, DBConstants.TEXT));
-               addColumn(new DBColumn(START_TIME, DBConstants.NOT_NULL,
-                               DBConstants.LONG));
+               addColumn(new DBColumn(START_TIME, DBConstants.NOT_NULL, DBConstants.LONG));
                addColumn(new DBColumn(END_TIME, DBConstants.NOT_NULL, DBConstants.LONG));
-               addColumn(new DBColumn(STATUS_TYPE, DBConstants.NOT_NULL,
-                               DBConstants.INTEGER));
-               addColumn(new DBColumn(API_ID, DBConstants.NOT_NULL,
-                               DBConstants.INTEGER));
+               addColumn(new DBColumn(STATUS_TYPE, DBConstants.NOT_NULL, DBConstants.INTEGER));
+               addColumn(new DBColumn(API_ID, DBConstants.NOT_NULL, DBConstants.INTEGER));
                addColumn(new DBColumn(PID, DBConstants.NOT_NULL, DBConstants.INTEGER));
                rid = 0;
        }
@@ -106,28 +98,42 @@ public class NetworkSeriesDBManager extends DBTable {
                insertData(insertDataList);
        }
 
-       public List<NetworkSeriesType> select(double visibleStartTime,
-                       double visibleEndTime) {
+       public List<NetworkSeriesType> select(double visibleStartTime, double visibleEndTime) {
                String selectQuery = SELECT_QUERY;
                int selectedPid = ToolbarArea.getInstance().getSelectedPid();
                if (selectedPid != 0) {
                        selectQuery = String.format(SELECT_PID_QUERY, selectedPid);
                }
 
-               double selectStartTime = visibleStartTime
-                               * TimelineConstants.MEGA_DOUBLE;
+               double selectStartTime = visibleStartTime * TimelineConstants.MEGA_DOUBLE;
                double selectEndTime = visibleEndTime * TimelineConstants.MEGA_DOUBLE;
-               String query = String.format(selectQuery, selectStartTime,
-                               selectEndTime);
-               List<List<Object>> result = SqlConnectionManager.executeQuery(query);
-               if (null == result || result.size() == 0 || result.get(0).size() == 0) {
+               String query = String.format(selectQuery, selectStartTime, selectEndTime);
+               ResultSet rs = SqlConnectionManager.executeQueryRS(query);
+               if (rs == null) {
+                       SqlConnectionManager.releaseResultSet(rs);
                        return null;
                }
+
                List<NetworkSeriesType> statusSeriesList = new ArrayList<NetworkSeriesType>();
-               for (List<Object> data : result) {
-                       statusSeriesList.add(new NetworkSeriesType(data));
+               try {
+                       while (rs.next()) {
+                               NetworkSeriesType data = new NetworkSeriesType();
+                               data.setRid(rs.getInt(DB_RID_INDEX + 1));
+                               data.setDestinationAddress(rs.getString(DB_DESTINATION_ADDRESSINDEX + 1));
+                               data.setFdValue(rs.getString(DB_FD_VALUE_INDEX + 1));
+                               data.setStartTime(rs.getLong(DB_START_TIME_INDEX + 1));
+                               data.setEndTime(rs.getLong(DB_END_TIME_INDEX + 1));
+                               data.setAPIType(rs.getInt(DB_STATUS_TYPE_INDEX + 1));
+                               data.setApiID(rs.getInt(DB_API_ID_INDEX + 1));
+                               data.setpId(rs.getInt(DB_PID_INDEX + 1));
+                               statusSeriesList.add(data);
+                       }
+                       SqlConnectionManager.releaseResultSet(rs);
+               } catch (SQLException e) {
+                       e.printStackTrace();
                }
                return statusSeriesList;
+
        }
 
        @Override
@@ -138,22 +144,15 @@ public class NetworkSeriesDBManager extends DBTable {
                        isPrepared = false;
                } else {
                        try {
-                               prep.setInt(DB_RID_INDEX + 1,
-                                               (Integer) (rowData.get(DB_RID_INDEX)));
+                               prep.setInt(DB_RID_INDEX + 1, (Integer) (rowData.get(DB_RID_INDEX)));
                                prep.setString(DB_DESTINATION_ADDRESSINDEX + 1,
                                                (String) (rowData.get(DB_DESTINATION_ADDRESSINDEX)));
-                               prep.setString(DB_FD_VALUE_INDEX + 1,
-                                               (String) (rowData.get(DB_FD_VALUE_INDEX)));
-                               prep.setLong(DB_START_TIME_INDEX + 1,
-                                               (Long) (rowData.get(DB_START_TIME_INDEX)));
-                               prep.setLong(DB_END_TIME_INDEX + 1,
-                                               (Long) (rowData.get(DB_END_TIME_INDEX)));
-                               prep.setInt(DB_STATUS_TYPE_INDEX + 1,
-                                               (Integer) (rowData.get(DB_STATUS_TYPE_INDEX)));
-                               prep.setInt(DB_API_ID_INDEX + 1,
-                                               (Integer) (rowData.get(DB_API_ID_INDEX)));
-                               prep.setInt(DB_PID_INDEX + 1,
-                                               (Integer) (rowData.get(DB_PID_INDEX)));
+                               prep.setString(DB_FD_VALUE_INDEX + 1, (String) (rowData.get(DB_FD_VALUE_INDEX)));
+                               prep.setLong(DB_START_TIME_INDEX + 1, (Long) (rowData.get(DB_START_TIME_INDEX)));
+                               prep.setLong(DB_END_TIME_INDEX + 1, (Long) (rowData.get(DB_END_TIME_INDEX)));
+                               prep.setInt(DB_STATUS_TYPE_INDEX + 1, (Integer) (rowData.get(DB_STATUS_TYPE_INDEX)));
+                               prep.setInt(DB_API_ID_INDEX + 1, (Integer) (rowData.get(DB_API_ID_INDEX)));
+                               prep.setInt(DB_PID_INDEX + 1, (Integer) (rowData.get(DB_PID_INDEX)));
 
                        } catch (SQLException e) {
                                e.printStackTrace();
index f77db57..75eb1d5 100644 (file)
@@ -30,27 +30,30 @@ package org.tizen.dynamicanalyzer.ui.network.data.type;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.tizen.dynamicanalyzer.common.Global;
 import org.tizen.dynamicanalyzer.constant.CommonConstants;
+import org.tizen.dynamicanalyzer.project.BinaryInfo;
 import org.tizen.dynamicanalyzer.swap.model.data.NetworkData;
-import org.tizen.dynamicanalyzer.ui.network.data.NetworkAPIDBManager;
 
 public class NetworkAPIType extends NetworkData {
-       private final static int apiSeriesColumnSize = 6;
-       private int seq = -1;
-       private long time = -1;
        private String destinationAddress = CommonConstants.EMPTY;
        private String fdStr = CommonConstants.EMPTY;
+       private int binaryId = 0;
 
-       public NetworkAPIType(int sequenceNumber, String destinationAddress,
-                       String fdValue, long apiTime, int apiNameID, long errno, int pID,
-                       int tID, String arg, String returnValue, int byteSize,
-                       String payLoad, int apiType, long callerAddress, String libName) {
+       public NetworkAPIType() {
+
+       }
+
+       public NetworkAPIType(int sequenceNumber, String destinationAddress, String fdValue,
+                       long apiTime, int apiNameID, long errno, int pID, int tID, String arg,
+                       String returnValue, int byteSize, String payLoad, int apiType, long callerAddress,
+                       String libName) {
                setSeq(sequenceNumber);
                setDestinationAddress(destinationAddress);
                setFdStr(fdValue);
                setTime(apiTime);
-               setApiNameID(apiNameID);
-               setErrno(errno);
+               setApiId(apiNameID);
+               setErrNo(errno);
                setPid(pID);
                setTid(tID);
                setArgs(arg);
@@ -59,42 +62,12 @@ public class NetworkAPIType extends NetworkData {
                setPacketMessage(payLoad);
                setFdApiType(apiType);
                setCallerAddress(callerAddress);
-               setLibName(libName);
-
-       }
-
-       public NetworkAPIType(List<Object> data) {
-               setSeq((Integer) data.get(NetworkAPIDBManager.DB_SEQ_INDEX));
-               setDestinationAddress((String) data
-                               .get(NetworkAPIDBManager.DB_DESTINATION_ADDRESS_INDEX));
-               setFdStr((String) data.get(NetworkAPIDBManager.DB_FD_VALUE_INDEX));
-               setTime((Long) data.get(NetworkAPIDBManager.DB_API_TIME_INDEX));
-               setApiNameID((Integer) data
-                               .get(NetworkAPIDBManager.DB_API_NAME_ID_INDEX));
-               setErrno((Long) data.get(NetworkAPIDBManager.DB_ERRNO_INDEX));
-               if (data.size() <= apiSeriesColumnSize) {
-                       return;
-               }
-               setPid((Integer) data.get(NetworkAPIDBManager.DB_PID_INDEX));
-               setTid((Integer) data.get(NetworkAPIDBManager.DB_PID_INDEX));
-               setArgs((String) data.get(NetworkAPIDBManager.DB_ARGUMENT_INDEX));
-               setReturn((String) data.get(NetworkAPIDBManager.DB_RETURN_INDEX));
-               setPacketMessageSize((Integer) data
-                               .get(NetworkAPIDBManager.DB_BYTE_SIZE_INDEX));
-               setPacketMessage((String) data
-                               .get(NetworkAPIDBManager.DB_PAYLOAD_INDEX));
-               setFdApiType((Integer) data.get(NetworkAPIDBManager.DB_API_TYPE_INDEX));
-               setCallerAddress((Long) data
-                               .get(NetworkAPIDBManager.DB_CALLER_PC_ADDRESS_INDEX));
-               setLibName((String) data.get(NetworkAPIDBManager.DB_LIB_NAME_INDEX));
-       }
+               setBinaryID(libName);
 
-       public int getSeq() {
-               return seq;
        }
 
-       public void setSeq(int sequenceNumber) {
-               this.seq = sequenceNumber;
+       public String getLibName() {
+               return libName;
        }
 
        public String getDestinationAddress() {
@@ -113,100 +86,32 @@ public class NetworkAPIType extends NetworkData {
                this.fdStr = fdValue;
        }
 
-       public long getTime() {
-               return time;
-       }
-
-       public void setTime(long apiTime) {
-               this.time = apiTime;
-       }
-
-       public int getApiNameID() {
-               return apiId;
-       }
-
-       public void setApiNameID(int apiNameID) {
-               this.apiId = apiNameID;
-       }
-
-       public long getErrno() {
-               return errno;
-       }
-
-       public void setErrno(long errno) {
-               this.errno = errno;
-       }
-
-       public int getPid() {
-               return pid;
-       }
-
-       public void setPid(int pID) {
-               this.pid = pID;
-       }
-
-       public int getTid() {
-               return tid;
-       }
-
-       public void setTid(int tID) {
-               this.tid = tID;
-       }
-
-       public String getArgs() {
-               return args.trim();
-       }
-
-       public void setArgs(String argument) {
-               this.args = argument;
-       }
-
-       public String getReturn() {
-               return ret.trim();
-       }
-
-       public void setReturn(String returnValue) {
-               this.ret = returnValue;
-       }
-
-       public int getPacketMessageSize() {
-               return messageSize;
-       }
-
        public void setPacketMessageSize(int byteSize) {
                this.messageSize = byteSize;
        }
 
-       public String getPacketMessage() {
-               return packetMessage;
-       }
-
        public void setPacketMessage(String payload) {
                this.packetMessage = payload;
        }
 
-       public int getFdApiType() {
-               return fdApiType;
-       }
-
        public void setFdApiType(int apiType) {
                this.fdApiType = apiType;
        }
 
-       public long getCallerPcAddr() {
-               return callerAddress;
-       }
-
-       public void setCallerAddress(long callerAddress) {
-               this.callerAddress = callerAddress;
+       public int getBinaryId() {
+               return binaryId;
        }
 
-       public String getLibName() {
-               return libName;
+       public void setBinaryId(int binaryId) {
+               this.binaryId = binaryId;
+               BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo().getBinaryInfo(getBinaryId());
+               libName = binInfo.getTargetBinaryPath();
        }
 
-       public void setLibName(String libName) {
-               this.libName = libName;
+       public void setBinaryID(String binaryPath) {
+               BinaryInfo binInfo = Global.getProject().getDeviceStatusInfo().getBinaryInfo(binaryPath);
+               this.binaryId = binInfo.getID();
+               libName = binInfo.getTargetBinaryPath();
        }
 
        public List<Object> getDBInsertData() {
@@ -215,7 +120,7 @@ public class NetworkAPIType extends NetworkData {
                data.add(getDestinationAddress());
                data.add(getFdStr());
                data.add(getTime());
-               data.add(getApiNameID());
+               data.add(getApiId());
                data.add(getErrno());
                data.add(getPid());
                data.add(getTid());
@@ -225,7 +130,7 @@ public class NetworkAPIType extends NetworkData {
                data.add(getPacketMessage());
                data.add(getFdApiType());
                data.add(getCallerPcAddr());
-               data.add(getLibName());
+               data.add(getBinaryId());
                return data;
        }
 
index 7bdd971..9c1f428 100644 (file)
@@ -50,8 +50,12 @@ public class NetworkSeriesType {
        private int apiID = -1;
        private int pId = -1;
 
-       public NetworkSeriesType(String destinationAddress, String fdValue,
-                       long startTime, long endTime, int statusType, int apiId, int pId) {
+       public NetworkSeriesType() {
+
+       }
+
+       public NetworkSeriesType(String destinationAddress, String fdValue, long startTime,
+                       long endTime, int statusType, int apiId, int pId) {
                setRid(0);
                setDestinationAddress(destinationAddress);
                setFdValue(fdValue);
@@ -64,14 +68,11 @@ public class NetworkSeriesType {
 
        public NetworkSeriesType(List<Object> data) {
                setRid((Integer) data.get(NetworkSeriesDBManager.DB_RID_INDEX));
-               setDestinationAddress((String) data
-                               .get(NetworkSeriesDBManager.DB_DESTINATION_ADDRESSINDEX));
+               setDestinationAddress((String) data.get(NetworkSeriesDBManager.DB_DESTINATION_ADDRESSINDEX));
                setFdValue((String) data.get(NetworkSeriesDBManager.DB_FD_VALUE_INDEX));
-               setStartTime((Long) data
-                               .get(NetworkSeriesDBManager.DB_START_TIME_INDEX));
+               setStartTime((Long) data.get(NetworkSeriesDBManager.DB_START_TIME_INDEX));
                setEndTime((Long) data.get(NetworkSeriesDBManager.DB_END_TIME_INDEX));
-               setAPIType((Integer) data
-                               .get(NetworkSeriesDBManager.DB_STATUS_TYPE_INDEX));
+               setAPIType((Integer) data.get(NetworkSeriesDBManager.DB_STATUS_TYPE_INDEX));
                setApiID((Integer) data.get(NetworkSeriesDBManager.DB_API_ID_INDEX));
                setpId((Integer) data.get(NetworkSeriesDBManager.DB_API_ID_INDEX));
        }