From: greatim Date: Wed, 1 Oct 2014 12:15:17 +0000 (+0900) Subject: DB: change some DB column name and table name X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F86%2F28286%2F1;p=sdk%2Ftools%2Fdynamic-analyzer.git DB: change some DB column name and table name change some DB column name and table name (to upper case) Change-Id: If177157b66891053aac0b04f9b2e2e7f6e884110 Signed-off-by: greatim --- diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessInformation.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessInformation.java index 964b3eb..4774b27 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessInformation.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessInformation.java @@ -35,7 +35,6 @@ import java.util.TreeMap; import java.util.concurrent.atomic.AtomicInteger; import org.tizen.dynamicanalyzer.communicator.DACommunicator; -import org.tizen.dynamicanalyzer.database.DBConstants; import org.tizen.dynamicanalyzer.database.DBTable; import org.tizen.dynamicanalyzer.database.SqlConnectionManager; import org.tizen.dynamicanalyzer.project.data.MemoryMapDBTable; @@ -43,7 +42,7 @@ import org.tizen.dynamicanalyzer.project.data.MemoryMapDBTable; public class ProcessInformation { private static final String QUERY_DISTINCT_TIME = "select distinct " + MemoryMapDBTable.COLUMN.CAPTIME.name + " from %s where " - + DBConstants.DBCOLUMN_PROCESS_ID + "=%d"; + + MemoryMapDBTable.COLUMN.PID.name + "=%d"; private final Object processNameRequestLock = new Object(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessMemoryMap.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessMemoryMap.java index 4bc39ba..99d5d1e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessMemoryMap.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/ProcessMemoryMap.java @@ -32,14 +32,12 @@ import java.util.Map; import java.util.NavigableMap; import java.util.TreeMap; -import org.tizen.dynamicanalyzer.database.DBConstants; import org.tizen.dynamicanalyzer.database.DBTable; import org.tizen.dynamicanalyzer.project.data.MemoryMapDBTable; public class ProcessMemoryMap { - private static final String WHERE_PID_TIME = "where " - + DBConstants.DBCOLUMN_PROCESS_ID + "=%d and " - + MemoryMapDBTable.COLUMN.CAPTIME.name + "=%d"; + private static final String WHERE_PID_TIME = "where " + MemoryMapDBTable.COLUMN.PID.name + + "=%d and " + MemoryMapDBTable.COLUMN.CAPTIME.name + "=%d"; private int pid; @@ -79,8 +77,7 @@ public class ProcessMemoryMap { } public LibraryObject getLibraryByAddress(long address) { - Map.Entry entry = binaryByAddress.floorEntry(Long - .valueOf(address)); + Map.Entry entry = binaryByAddress.floorEntry(Long.valueOf(address)); if (entry == null) { return null; } else { @@ -98,8 +95,7 @@ public class ProcessMemoryMap { } public boolean removeLibrary(long lowaddr, long highaddr) { - LibraryObject libobj = binaryByAddress.floorEntry(Long.valueOf(lowaddr)) - .getValue(); + LibraryObject libobj = binaryByAddress.floorEntry(Long.valueOf(lowaddr)).getValue(); if (libobj != null && highaddr <= libobj.getHighestAddress()) { synchronized (binaryByAddress) { binaryByAddress.remove(Long.valueOf(libobj.getLowestAddress())); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java index 9bd708e..dd8db94 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java @@ -89,7 +89,7 @@ public class Project { private static final String CREATE_TIME = "createTime"; private static final String TOTAL_STOP_TIME = "totalStopTime"; private static final String REPLAY_STOP_TIME = "replayStopTime"; - private static final String PROFILE_STOP_TIME = "profilingStartTime"; + private static final String PROFILE_START_TIME = "profilingStartTime"; private String version = null; private String protocolVersion = null; @@ -543,7 +543,7 @@ public class Project { writer.write(CommonConstants.NEW_LINE); writer.write(REPLAY_STOP_TIME + CommonConstants.EQUAL + getReplayStopTime()); writer.write(CommonConstants.NEW_LINE); - writer.write(PROFILE_STOP_TIME + CommonConstants.EQUAL + getProfilingStartTime()); + writer.write(PROFILE_START_TIME + CommonConstants.EQUAL + getProfilingStartTime()); writer.write(CommonConstants.NEW_LINE); writer.write(CommonConstants.NEW_LINE); @@ -701,7 +701,7 @@ public class Project { setTotalStopTime(Long.parseLong(val)); } else if (infoKey.equals(REPLAY_STOP_TIME)) { setReplayStopTime(Long.parseLong(val)); - } else if (infoKey.equals(PROFILE_STOP_TIME)) { + } else if (infoKey.equals(PROFILE_START_TIME)) { setProfilingStartTime(new DATime(val)); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/BinaryInfoDBTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/BinaryInfoDBTable.java index 7bc10f0..08c2ef8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/BinaryInfoDBTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/BinaryInfoDBTable.java @@ -37,16 +37,16 @@ import org.tizen.dynamicanalyzer.database.DBConstants; import org.tizen.dynamicanalyzer.database.DBTable; public class BinaryInfoDBTable extends DBTable { - public static final String TABLENAME = "BinaryInformation"; + public static final String TABLENAME = "BINARY_INFORMATION"; private static final int MD5SUMSTRLENGTH = 64; public enum COLUMN { - BINARYID(0, "BinaryID"), - BINTYPE(1, "BinaryType"), - TARGETPATH(2, "TargetPath"), - LOCALPATH(3, "LocalPath"), - MD5SUM(4, "md5sum"); + BINARYID(0, "BINARY_ID"), + BINTYPE(1, "BINARY_TYPE"), + TARGETPATH(2, "TARGET_PATH"), + LOCALPATH(3, "LOCAL_PATH"), + MD5SUM(4, "MD5SUM"); public final int index; public final String name; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/FunctionNameDBTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/FunctionNameDBTable.java index 1049f7f..c1e83b0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/FunctionNameDBTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/FunctionNameDBTable.java @@ -38,11 +38,11 @@ import org.tizen.dynamicanalyzer.database.DBConstants; import org.tizen.dynamicanalyzer.database.DBTable; public class FunctionNameDBTable extends DBTable { - private static final String TABLENAME = "FunctionName"; + private static final String TABLENAME = "FUNCTION_NAME"; public enum COLUMN { - FUNCTIONID(0, DBConstants.DBCOLUMN_FUNCTION_ID), - FUNCTIONNAME(1, DBConstants.DBCOLUMN_FUNCTION_NAME); + FUNCTIONID(0, "FUNCTION_ID"), + FUNCTIONNAME(1, "FUNCTION_NAME"); public final int index; public final String name; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/MemoryMapDBTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/MemoryMapDBTable.java index 5787ecd..ed1a281 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/MemoryMapDBTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/MemoryMapDBTable.java @@ -36,15 +36,15 @@ import org.tizen.dynamicanalyzer.database.DBConstants; import org.tizen.dynamicanalyzer.database.DBTable; public class MemoryMapDBTable extends DBTable { - public static final String TABLENAME = "ProcessMemoryMap"; + public static final String TABLENAME = "PROCESS_MEMORY_MAP"; public enum COLUMN { - PID(0, DBConstants.DBCOLUMN_PROCESS_ID), - CAPTIME(1, "CapturedTime"), - LOWADDR(2, "LowestAddress"), - HIGHADDR(3, "HighestAddress"), - BINARYID(4, "BinaryID"), - MAINTAG(5, "MainTag"); + PID(0, "PID"), + CAPTIME(1, "CAPTURED_TIME"), + LOWADDR(2, "LOWEST_ADDRESS"), + HIGHADDR(3, "HIGHEST_ADDRESS"), + BINARYID(4, "BINARY_ID"), + MAINTAG(5, "MAIN_TAG"); public final int index; public final String name; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/ProcessInfoDBTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/ProcessInfoDBTable.java index f9d8d41..aa448bb 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/ProcessInfoDBTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/data/ProcessInfoDBTable.java @@ -37,15 +37,15 @@ import org.tizen.dynamicanalyzer.database.DBConstants; import org.tizen.dynamicanalyzer.database.DBTable; public class ProcessInfoDBTable extends DBTable { - public static final String TABLENAME = "ProcessInformation"; + public static final String TABLENAME = "PROCESS_INFORMATION"; public enum COLUMN { - PID(0, DBConstants.DBCOLUMN_PROCESS_ID), - PPID(1, "Ppid"), - STARTTIME(2, DBConstants.DBCOLUMN_START_TIME), - CALLCOUNT(3, "FunctionCallCount"), - MAINTAG(4, "MainTag"), - PROCNAME(5, "ProcessName"); + PID(0, "PID"), + PPID(1, "PPID"), + STARTTIME(2, "START_TIME"), + CALLCOUNT(3, "FUNCTION_CALL_COUNT"), + MAINTAG(4, "MAIN_TAG"), + PROCNAME(5, "PROCESS_NAME"); public final int index; public final String name; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBTable.java index e249a55..ec4a488 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBTable.java @@ -38,17 +38,17 @@ import org.tizen.dynamicanalyzer.database.DBTable; import org.tizen.dynamicanalyzer.database.IResultSet; public class ContextDataDBTable extends DBTable implements IResultSet { - private static final String TABLENAME = "ContextSwitchData"; + private static final String TABLENAME = "CONTEXT_SWITCH_DATA"; public enum COLUMN { SEQ(0, DBConstants.COMMON_COLUMN_SEQ), PID(1, DBConstants.COMMON_COLUMN_PID), TID(2, DBConstants.COMMON_COLUMN_TID), - CPUNUM(3, "CpuNum"), - STARTTIME(4, "StartTime"), - STARTADDR(5, "StartPcAddr"), - ENDTIME(6, "EndTime"), - ENDADDR(7, "EndPcAddr"); + CPUNUM(3, "CPU_NUM"), + STARTTIME(4, "START_TIME"), + STARTADDR(5, "START_PCADDR"), + ENDTIME(6, "END_TIME"), + ENDADDR(7, "END_PCADDR"); public final int index; public final String name; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBTable.java index 60ec878..6355dcb 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBTable.java @@ -37,20 +37,20 @@ import org.tizen.dynamicanalyzer.database.DBConstants; import org.tizen.dynamicanalyzer.database.DBTable; public class FunctionDataDBTable extends DBTable { - private static final String TABLENAME = "FunctionCallData"; + private static final String TABLENAME = "FUNCTION_CALL_DATA"; public enum COLUMN { SEQ(0, DBConstants.COMMON_COLUMN_SEQ), PID(1, DBConstants.COMMON_COLUMN_PID), TID(2, DBConstants.COMMON_COLUMN_TID), - CPUNUM(3, "CpuNum"), - STARTTIME(4, "StartTime"), - STARTTYPE(5, "StartType"), - STARTADDR(6, "StartPcAddr"), - ENDTIME(7, "EndTime"), - ENDTYPE(8, "EndType"), - ENDADDR(9, "EndPcAddr"), - FUNCID(10, "FunctionId"); + CPUNUM(3, "CPU_NUM"), + STARTTIME(4, "START_TIME"), + STARTTYPE(5, "START_TYPE"), + STARTADDR(6, "START_PCADDR"), + ENDTIME(7, "END_TIME"), + ENDTYPE(8, "END_TYPE"), + ENDADDR(9, "END_PCADDR"), + FUNCID(10, "FUNCTION_ID"); public final int index; public final String name; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java index 766a69a..5f66ab2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java @@ -33,7 +33,6 @@ import java.util.List; import java.util.Map; import java.util.PriorityQueue; -import org.tizen.dynamicanalyzer.database.DBConstants; import org.tizen.dynamicanalyzer.database.DBInsertManager; import org.tizen.dynamicanalyzer.database.DBInserter; import org.tizen.dynamicanalyzer.database.DBTable; @@ -46,11 +45,19 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogDataTimeComparator; public class KernelDataManager extends PageDataManager { - private static final String PIDTID_QUERY = "select distinct " + DBConstants.COMMON_COLUMN_PID - + ", " + DBConstants.COMMON_COLUMN_TID + " from %s"; + private static final String PIDTID_QUERY_CONTEXT = "select distinct " + + ContextDataDBTable.COLUMN.PID.name + ", " + ContextDataDBTable.COLUMN.TID.name + + " from %s"; - private static final String COUNT_QUERY = "select count(*) from %s where " - + DBConstants.COMMON_COLUMN_TID + "=%s"; + private static final String PIDTID_QUERY_FUNCTION = "select distinct " + + FunctionDataDBTable.COLUMN.PID.name + ", " + FunctionDataDBTable.COLUMN.TID.name + + " from %s"; + + private static final String COUNT_QUERY_CONTEXT = "select count(*) from %s where " + + ContextDataDBTable.COLUMN.TID.name + "=%s"; + + private static final String COUNT_QUERY_FUNCTION = "select count(*) from %s where " + + FunctionDataDBTable.COLUMN.TID.name + "=%s"; private static KernelDataManager instance = null; private KernelDataMaker kdataMaker = null; @@ -171,9 +178,9 @@ public class KernelDataManager extends PageDataManager { Map threadMap = new HashMap(); - String query = String.format(PIDTID_QUERY, contextDataTable.getTableName()); + String query = String.format(PIDTID_QUERY_CONTEXT, contextDataTable.getTableName()); List> contextPidTid = SqlConnectionManager.executeQuery(query); - query = String.format(PIDTID_QUERY, functionDataTable.getTableName()); + query = String.format(PIDTID_QUERY_FUNCTION, functionDataTable.getTableName()); List> functionPidTid = SqlConnectionManager.executeQuery(query); if (contextPidTid != null) { @@ -186,7 +193,7 @@ public class KernelDataManager extends PageDataManager { KernelDataPerThread kdata = new KernelDataPerThread(pid, tid); threadMap.put(Integer.valueOf(tid), kdata); - query = String.format(COUNT_QUERY, contextDataTable.getTableName(), + query = String.format(COUNT_QUERY_CONTEXT, contextDataTable.getTableName(), Integer.toString(tid)); List> coreCount = SqlConnectionManager.executeQuery(query); Object count; @@ -201,7 +208,7 @@ public class KernelDataManager extends PageDataManager { kdata.setCoreFragmentCount(((Long) count).intValue()); } - query = String.format(COUNT_QUERY, functionDataTable.getTableName(), + query = String.format(COUNT_QUERY_FUNCTION, functionDataTable.getTableName(), Integer.toString(tid)); List> functionCount = SqlConnectionManager.executeQuery(query); if (functionCount == null) {