Menu
▾
▴
[Hyperic-hq-discuss] hq r14324 - in trunk/plugins/db2jdbc: . src/org/hyperic/hq/plugin/db2jdbc
|
From: <gla...@hy...> - 2010-02-25 23:58:24
|
Author: glaullon Date: 2010-02-25 15:58:13 -0800 (Thu, 25 Feb 2010) New Revision: 14324 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14324 Modified: trunk/plugins/db2jdbc/ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/CachedJDBCMeasurement.java trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DBManagerMeasurement.java trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBase8ServerDetector.java trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseMeasurement.java trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseServerDetector.java trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DefaultServerDetector.java trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/Measurement.java trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/MemoryPoolMeasurement.java trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/TableMeasurement.java trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/TableSpaceMeasurement.java Log: Remove 1.5 annotations. Property changes on: trunk/plugins/db2jdbc ___________________________________________________________________ Name: svn:ignore - manifest.mf nbproject build.xml test + build-lib manifest.mf build db2-jdbc-plugin.jar bin nbproject build.xml hq.properties test Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/CachedJDBCMeasurement.java =================================================================== --- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/CachedJDBCMeasurement.java 2010-02-25 21:50:12 UTC (rev 14323) +++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/CachedJDBCMeasurement.java 2010-02-25 23:58:13 UTC (rev 14324) @@ -27,11 +27,9 @@ private static final String EXEC_TIME_ATTR = "QueryExecTime"; private static final Hashtable cache = new Hashtable(); - @Override protected void initQueries() { } - @Override protected String getDefaultURL() { return ""; } Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DBManagerMeasurement.java =================================================================== --- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DBManagerMeasurement.java 2010-02-25 21:50:12 UTC (rev 14323) +++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DBManagerMeasurement.java 2010-02-25 23:58:13 UTC (rev 14324) @@ -12,7 +12,6 @@ */ public class DBManagerMeasurement extends Measurement { - @Override protected String getQuery(Metric metric) { if (getLog().isDebugEnabled()) { getLog().debug("*******************"); Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBase8ServerDetector.java =================================================================== --- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBase8ServerDetector.java 2010-02-25 21:50:12 UTC (rev 14323) +++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBase8ServerDetector.java 2010-02-25 23:58:13 UTC (rev 14324) @@ -6,6 +6,7 @@ package org.hyperic.hq.plugin.db2jdbc; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import org.hyperic.hq.product.AutoServerDetector; import org.hyperic.hq.product.PluginException; @@ -20,7 +21,6 @@ */ public class DataBase8ServerDetector extends DataBaseServerDetector { - @Override protected List discoverServices(ConfigResponse config) throws PluginException { List res = new ArrayList(); String type = getTypeInfo().getName(); @@ -30,30 +30,32 @@ * Table */ String schema = config.getValue("db2.jdbc.user").toUpperCase(); - List<String> tbl = getList(config, "select TABLE_NAME from table (SNAPSHOT_TABLE('sample', -2)) as T"); // XXX revisar si se pueden sacar de otro sitio WHERE TABSCHEMA='" + schema + "'"); - for (String tbName : tbl) { + Iterator tbl = getList(config, "select TABLE_NAME from table (SNAPSHOT_TABLE('sample', -2)) as T").iterator(); // XXX revisar si se pueden sacar de otro sitio WHERE TABSCHEMA='" + schema + "'"); + while (tbl.hasNext()) { + String tbName = (String) tbl.next(); // if (!tbName.toUpperCase().startsWith("SYS")) { - ServiceResource tb = new ServiceResource(); - tb.setType(type + " Table"); - tb.setServiceName("Table " + schema + "." + tbName); + ServiceResource tb = new ServiceResource(); + tb.setType(type + " Table"); + tb.setServiceName("Table " + schema + "." + tbName); - ConfigResponse conf = new ConfigResponse(); - conf.setValue("table", tbName); - conf.setValue("schema", schema); - setProductConfig(tb, conf); - tb.setMeasurementConfig(); - tb.setResponseTimeConfig(new ConfigResponse()); - tb.setControlConfig(); + ConfigResponse conf = new ConfigResponse(); + conf.setValue("table", tbName); + conf.setValue("schema", schema); + setProductConfig(tb, conf); + tb.setMeasurementConfig(); + tb.setResponseTimeConfig(new ConfigResponse()); + tb.setControlConfig(); - res.add(tb); + res.add(tb); // } } /** * Table Space */ - List<String> tbspl = getList(config, "select TABLESPACE_NAME from table (SNAPSHOT_TBS('sample', -2)) as T"); - for (String tbspName : tbspl) { + Iterator tbspl = getList(config, "select TABLESPACE_NAME from table (SNAPSHOT_TBS('sample', -2)) as T").iterator(); + while (tbspl.hasNext()) { + String tbspName = (String) tbspl.next(); ServiceResource bpS = new ServiceResource(); bpS.setType(type + " Table Space"); bpS.setServiceName("Table Space " + tbspName); @@ -71,8 +73,9 @@ /** * Buffer Pool */ - List<String> bpl = getList(config, "select BP_NAME from table (SNAPSHOT_BP('sample', -2)) as T"); - for (String bpName : bpl) { + Iterator bpl = getList(config, "select BP_NAME from table (SNAPSHOT_BP('sample', -2)) as T").iterator(); + while (bpl.hasNext()) { + String bpName = (String) bpl.next(); ServiceResource bpS = new ServiceResource(); bpS.setType(type + " Buffer Pool"); bpS.setServiceName("Buffer Pool " + bpName); @@ -92,24 +95,24 @@ */ /*List<String> mpl = getList(config, "SELECT concat(concat(POOL_ID, '|'), COALESCE(POOL_SECONDARY_ID,'')) as name FROM SYSIBMADM.SNAPDB_MEMORY_POOL where POOL_SECONDARY_ID is NULL or POOL_ID='BP'"); for (String mpN : mpl) { - String[] names = mpN.split("\\|"); - String mpId=names[0].trim(); - String mpSId=(names.length==2)?names[1].trim():""; - String mpName=(mpId+" "+mpSId).trim(); + String[] names = mpN.split("\\|"); + String mpId=names[0].trim(); + String mpSId=(names.length==2)?names[1].trim():""; + String mpName=(mpId+" "+mpSId).trim(); - ServiceResource mpS = new ServiceResource(); - mpS.setType(type + " Memory Pool"); - mpS.setServiceName("Memory Pool " + mpName); + ServiceResource mpS = new ServiceResource(); + mpS.setType(type + " Memory Pool"); + mpS.setServiceName("Memory Pool " + mpName); - ConfigResponse conf = new ConfigResponse(); - conf.setValue("pool_id", mpId); - conf.setValue("sec_pool_id", mpSId); - setProductConfig(mpS, conf); - mpS.setMeasurementConfig(); - mpS.setResponseTimeConfig(new ConfigResponse()); - mpS.setControlConfig(); + ConfigResponse conf = new ConfigResponse(); + conf.setValue("pool_id", mpId); + conf.setValue("sec_pool_id", mpSId); + setProductConfig(mpS, conf); + mpS.setMeasurementConfig(); + mpS.setResponseTimeConfig(new ConfigResponse()); + mpS.setControlConfig(); - res.add(mpS); + res.add(mpS); }*/ return res; Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseMeasurement.java =================================================================== --- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseMeasurement.java 2010-02-25 21:50:12 UTC (rev 14323) +++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseMeasurement.java 2010-02-25 23:58:13 UTC (rev 14324) @@ -13,7 +13,6 @@ */ public class DataBaseMeasurement extends PoolMeasurement { - @Override protected void postProcessResults(Map results) { super.postProcessResults(results); results.put("LOCK_LIST_IN_USE", new MetricValue(((MetricValue) results.get("LOCK_LIST_IN_USE")).getValue() * 4)); Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseServerDetector.java =================================================================== --- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseServerDetector.java 2010-02-25 21:50:12 UTC (rev 14323) +++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DataBaseServerDetector.java 2010-02-25 23:58:13 UTC (rev 14324) @@ -10,6 +10,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.regex.Matcher; @@ -28,7 +29,6 @@ private Pattern regExpDataBases = Pattern.compile("Database (\\d*) entry:"); //private Pattern regExpDataBases = Pattern.compile("Database name[^=]*= (\\S*)[^L]*Local database directory[^=]*= (\\S*)"); - @Override protected List discoverServices(ConfigResponse config) throws PluginException { getLog().debug("discoverServices config=" + config); List res = new ArrayList(); @@ -45,8 +45,9 @@ * Table Space */ String schema = user; - List<String> tbl = getList(config, "SELECT TABNAME FROM SYSIBMADM.ADMINTABINFO WHERE TABSCHEMA='" + schema + "'"); - for (String tbName : tbl) { + Iterator tbl = getList(config, "SELECT TABNAME FROM SYSIBMADM.ADMINTABINFO WHERE TABSCHEMA='" + schema + "'").iterator(); + while (tbl.hasNext()) { + String tbName = (String) tbl.next(); if (!tbName.toUpperCase().startsWith("SYS")) { ServiceResource tb = new ServiceResource(); tb.setType(type + " Table"); @@ -67,8 +68,9 @@ /** * Table Space */ - List<String> tbspl = getList(config, "SELECT TBSP_NAME FROM SYSIBMADM.TBSP_UTILIZATION where TBSP_TYPE='DMS'"); - for (String tbspName : tbspl) { + Iterator tbspl = getList(config, "SELECT TBSP_NAME FROM SYSIBMADM.TBSP_UTILIZATION where TBSP_TYPE='DMS'").iterator(); + while (tbspl.hasNext()) { + String tbspName =(String) tbspl.next(); ServiceResource bpS = new ServiceResource(); bpS.setType(type + " Table Space"); bpS.setServiceName("Table Space " + tbspName); @@ -86,8 +88,9 @@ /** * Buffer Pool */ - List<String> bpl = getList(config, "SELECT BP_NAME FROM SYSIBMADM.BP_HITRATIO"); - for (String bpName : bpl) { + Iterator bpl = getList(config, "SELECT BP_NAME FROM SYSIBMADM.BP_HITRATIO").iterator(); + while (bpl.hasNext()) { + String bpName = (String) bpl.next(); ServiceResource bpS = new ServiceResource(); bpS.setType(type + " Buffer Pool"); bpS.setServiceName("Buffer Pool " + bpName); @@ -105,8 +108,9 @@ /** * Mempory Pool */ - List<String> mpl = getList(config, "SELECT concat(concat(POOL_ID, '|'), COALESCE(POOL_SECONDARY_ID,'')) as name FROM SYSIBMADM.SNAPDB_MEMORY_POOL where POOL_SECONDARY_ID is NULL or POOL_ID='BP'"); - for (String mpN : mpl) { + Iterator mpl = getList(config, "SELECT concat(concat(POOL_ID, '|'), COALESCE(POOL_SECONDARY_ID,'')) as name FROM SYSIBMADM.SNAPDB_MEMORY_POOL where POOL_SECONDARY_ID is NULL or POOL_ID='BP'").iterator(); + while (mpl.hasNext()) { + String mpN = (String) mpl.next(); String[] names = mpN.split("\\|"); String mpId = names[0].trim(); String mpSId = (names.length == 2) ? names[1].trim() : ""; Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DefaultServerDetector.java =================================================================== --- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DefaultServerDetector.java 2010-02-25 21:50:12 UTC (rev 14323) +++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/DefaultServerDetector.java 2010-02-25 23:58:13 UTC (rev 14324) @@ -35,7 +35,7 @@ private Pattern regExpInstall = Pattern.compile("([^ ]*) *(\\d*\\.\\d*\\.\\d*\\.\\d*) *([^ ]*)"); private boolean ISWin = false; private String db2ls; - private List<String> entry_types; + private List entry_types; private String list_database; public List getServerResources(ConfigResponse conf) throws PluginException { @@ -50,18 +50,18 @@ RegistryKey key = RegistryKey.LocalMachine.openSubKey("SOFTWARE\\IBM\\DB2\\InstalledCopies"); String instances[] = key.getSubKeyNames(); key.close(); - for (String instance : instances) { - key = RegistryKey.LocalMachine.openSubKey("SOFTWARE\\IBM\\DB2\\InstalledCopies\\" + instance + "\\CurrentVersion"); + for (int n=0;n<instances.length;n++) { + key = RegistryKey.LocalMachine.openSubKey("SOFTWARE\\IBM\\DB2\\InstalledCopies\\" + instances[n] + "\\CurrentVersion"); String version = key.getStringValue("Version") + "." + key.getStringValue("Release") + "." + key.getStringValue("Modification") + "." + key.getStringValue("Fix Level"); key.close(); - getLog().debug(instance + "-->" + version); + getLog().debug(instances[n] + "-->" + version); if (regExpVersion.matcher(version).find()) { - key = RegistryKey.LocalMachine.openSubKey("SOFTWARE\\IBM\\DB2\\InstalledCopies\\" + instance); + key = RegistryKey.LocalMachine.openSubKey("SOFTWARE\\IBM\\DB2\\InstalledCopies\\" + instances[n]); String path = key.getStringValue("DB2 Path Name"); key.close(); res.addAll(createServers(path.trim())); } else { - getLog().debug("[getServerResources] bad version: '" + instance + " " + version + "'"); + getLog().debug("[getServerResources] bad version: '" + instances[n] + " " + version + "'"); } } } catch (Win32Exception ex) { @@ -74,8 +74,8 @@ String sal = inputStreamAsString(cmd.getInputStream()); getLog().debug("[getServerResources] sal=" + sal); String[] installs = sal.split("\n"); - for (String install : installs) { - Matcher m = regExpInstall.matcher(install); + for (int n=0;n<installs.length;n++) { + Matcher m = regExpInstall.matcher(installs[n]); if (m.find()) { if (regExpVersion.matcher(m.group(2)).find()) { getLog().debug("[getServerResources] found: '" + m.group() + "'"); @@ -94,7 +94,6 @@ return res; } - @Override public void init(PluginManager manager) throws PluginException { db2ls = manager.getProperties().getProperty("db2.jdbc.db2ls", "db2ls"); Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/Measurement.java =================================================================== --- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/Measurement.java 2010-02-25 21:50:12 UTC (rev 14323) +++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/Measurement.java 2010-02-25 23:58:13 UTC (rev 14324) @@ -28,7 +28,6 @@ private static final String EXEC_TIME_ATTR = "QueryExecTime"; private static final Hashtable cache = new Hashtable(); - @Override protected String getQuery(Metric metric) { if (getLog().isDebugEnabled()) { getLog().debug("*******************"); @@ -49,7 +48,6 @@ return sql; } - @Override protected void getDriver() throws ClassNotFoundException { try { Class.forName("com.ibm.db2.jcc.DB2Driver"); @@ -59,13 +57,11 @@ } } - @Override protected Connection getConnection(String url, String user, String pass) throws SQLException { getLog().debug("[getConnection] url='" + url + "' user='" + user + "' pass='******'"); return DriverManager.getConnection(url, user, pass); } - @Override Map processResulSet(ResultSet rs, Metric metric) throws MetricNotFoundException { Map res = new HashMap(); String prefix = ""; Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/MemoryPoolMeasurement.java =================================================================== --- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/MemoryPoolMeasurement.java 2010-02-25 21:50:12 UTC (rev 14323) +++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/MemoryPoolMeasurement.java 2010-02-25 23:58:13 UTC (rev 14324) @@ -14,14 +14,12 @@ */ public class MemoryPoolMeasurement extends Measurement { - @Override protected String getQuery(Metric metric) { String query = super.getQuery(metric); query = query.replaceAll("POOL_SECONDARY_ID=''", "POOL_SECONDARY_ID is NULL"); return query; } - @Override protected void postProcessResults(Map results) { results.put("POOL_CUR_SIZE_USED", new MetricValue(((MetricValue) results.get("POOL_CUR_SIZE")).getValue() / ((MetricValue) results.get("POOL_CONFIG_SIZE")).getValue())); results.put("POOL_WATERMARK_USED", new MetricValue(((MetricValue) results.get("POOL_WATERMARK")).getValue() / ((MetricValue) results.get("POOL_CONFIG_SIZE")).getValue())); Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/TableMeasurement.java =================================================================== --- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/TableMeasurement.java 2010-02-25 21:50:12 UTC (rev 14323) +++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/TableMeasurement.java 2010-02-25 23:58:13 UTC (rev 14324) @@ -16,7 +16,6 @@ */ public class TableMeasurement extends Measurement { - @Override public MetricValue getValue(Metric metric) throws MetricUnreachableException, MetricNotFoundException { MetricValue res; try { @@ -31,7 +30,6 @@ return res; } - @Override protected void postProcessResults(Map results) { if (results.get("DATA_OBJECT_P_SIZE") != null) { results.put("TOTAL_SIZE", new MetricValue(((MetricValue) results.get("DATA_OBJECT_P_SIZE")).getValue() + Modified: trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/TableSpaceMeasurement.java =================================================================== --- trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/TableSpaceMeasurement.java 2010-02-25 21:50:12 UTC (rev 14323) +++ trunk/plugins/db2jdbc/src/org/hyperic/hq/plugin/db2jdbc/TableSpaceMeasurement.java 2010-02-25 23:58:13 UTC (rev 14324) @@ -13,7 +13,6 @@ */ public class TableSpaceMeasurement extends PoolMeasurement { - @Override protected void postProcessResults(Map results) { super.postProcessResults(results); if (results.get("TBSP_UTILIZATION_PERCENT") != null) { |
