Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

support monitor

Browse Source
This commit is contained in:
wenshao
2013-08-14 17:24:40 +08:00
parent 5aa3d51128
commit a72da37909
41 changed files with 701 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/alibaba/druid/TestReplaceLicense.java
+3 -3
View File
@@ -26,7 +26,7 @@ import java.io.Writer;
import junit.framework.TestCase;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
public class TestReplaceLicense extends TestCase {
@@ -36,7 +36,7 @@ public class TestReplaceLicense extends TestCase {
protected void setUp() throws Exception {
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("License.txt");
Reader reader = new InputStreamReader(is);
license = IOUtils.read(reader);
license = Utils.read(reader);
reader.close();
System.out.println(license);
@@ -65,7 +65,7 @@ public class TestReplaceLicense extends TestCase {
public void listJavaFile(File file) throws Exception {
FileInputStream in = new FileInputStream(file);
InputStreamReader reader = new InputStreamReader(in, "utf-8");
String content = IOUtils.read(reader);
String content = Utils.read(reader);
reader.close();
if (!content.startsWith(license)) {
src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java
+2 -2
View File
@@ -22,7 +22,7 @@ import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
import com.alibaba.druid.sql.test.TestUtils;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
public class MySqlPerfMain {
@@ -31,7 +31,7 @@ public class MySqlPerfMain {
List<String> arguments = ManagementFactory.getRuntimeMXBean().getInputArguments();
System.out.println(arguments);
String sql = IOUtils.readFromResource("benchmark/sql/ob_sql.txt");
String sql = Utils.readFromResource("benchmark/sql/ob_sql.txt");
for (int i = 0; i < 10; ++i) {
perfMySql(sql);
src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java
+2 -2
View File
@@ -23,7 +23,7 @@ import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
import com.alibaba.druid.sql.test.TestUtils;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
public class MySqlPerfTest extends TestCase {
@@ -33,7 +33,7 @@ public class MySqlPerfTest extends TestCase {
sql = "SELECT * FROM T";
sql = "SELECT ID, NAME, AGE FROM USER WHERE ID = ?";
sql = IOUtils.readFromResource("benchmark/sql/ob_sql.txt");
sql = Utils.readFromResource("benchmark/sql/ob_sql.txt");
}
public void test_pert() throws Exception {
src/test/java/com/alibaba/druid/bvt/bug/Bug_for_JeffYin.java
+4 -3
View File
@@ -17,18 +17,19 @@ package com.alibaba.druid.bvt.bug;
import java.sql.Driver;
import org.junit.Assert;
import junit.framework.TestCase;
import com.alibaba.druid.util.IOUtils;
import org.junit.Assert;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.util.Utils;
public class Bug_for_JeffYin extends TestCase {
public void test_0() throws Exception {
String url = "jdbc:sqlserver://localhost:1433;";
String driverClassName = JdbcUtils.getDriverClassName(url);
Class<?> driverClass = IOUtils.loadClass(driverClassName);
Class<?> driverClass = Utils.loadClass(driverClassName);
Assert.assertNotNull(driverClass);
Driver driver = (Driver) driverClass.newInstance();
src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest2.java
+13 -13
View File
@@ -39,7 +39,7 @@ import com.alibaba.druid.mock.MockStatementBase;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.pool.DruidPooledConnection;
import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData;
@@ -163,26 +163,26 @@ public class EncodingConvertFilterTest2 extends TestCase {
Assert.assertEquals(param1, raw.getParameters().get(0));
stmt.setObject(2, new StringReader(C_TEXT));
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(1)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(1)));
stmt.setCharacterStream(3, new StringReader(C_TEXT));
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(2)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(2)));
stmt.setCharacterStream(4, new StringReader(C_TEXT), C_TEXT.length());
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(3)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(3)));
stmt.setCharacterStream(5, new StringReader(C_TEXT), (long) C_TEXT.length());
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(4)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(4)));
stmt.setObject(6, C_TEXT, Types.VARCHAR);
Assert.assertEquals(param1, raw.getParameters().get(5));
stmt.setObject(7, new StringReader(C_TEXT), Types.VARCHAR);
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(6)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(6)));
stmt.setObject(8, C_TEXT, Types.VARCHAR, 0);
Assert.assertEquals(param1, raw.getParameters().get(7));
stmt.setObject(9, new StringReader(C_TEXT), Types.VARCHAR, 0);
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(8)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(8)));
stmt.setObject(10, 1, Types.INTEGER);
Assert.assertEquals(1, raw.getParameters().get(9));
@@ -196,12 +196,12 @@ public class EncodingConvertFilterTest2 extends TestCase {
stmt.setObject("13", C_TEXT, Types.VARCHAR);
Assert.assertEquals(param1, raw.getParameters().get(12));
stmt.setObject("14", new StringReader(C_TEXT), Types.VARCHAR);
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(13)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(13)));
stmt.setObject("15", C_TEXT, Types.VARCHAR, 0);
Assert.assertEquals(param1, raw.getParameters().get(14));
stmt.setObject("16", new StringReader(C_TEXT), Types.VARCHAR, 0);
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(15)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(15)));
stmt.setObject("17", 1, Types.INTEGER);
Assert.assertEquals(1, raw.getParameters().get(16));
@@ -213,19 +213,19 @@ public class EncodingConvertFilterTest2 extends TestCase {
Assert.assertEquals(3, raw.getParameters().get(18));
stmt.setCharacterStream("20", new StringReader(C_TEXT));
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(19)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(19)));
stmt.setCharacterStream("21", new StringReader(C_TEXT), C_TEXT.length());
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(20)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(20)));
stmt.setCharacterStream("22", new StringReader(C_TEXT), (long) C_TEXT.length());
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(21)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(21)));
stmt.setObject("23", C_TEXT);
Assert.assertEquals(param1, raw.getParameters().get(22));
stmt.setObject("24", new StringReader(C_TEXT));
Assert.assertEquals(param1, IOUtils.read((Reader) raw.getParameters().get(23)));
Assert.assertEquals(param1, Utils.read((Reader) raw.getParameters().get(23)));
stmt.setObject("25", 1, Types.INTEGER);
Assert.assertEquals(1, raw.getParameters().get(24));
src/test/java/com/alibaba/druid/bvt/log/LoggerTest.java
+2 -2
View File
@@ -13,7 +13,7 @@ import junit.framework.TestCase;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.proxy.DruidDriver;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JdbcUtils;
public class LoggerTest extends TestCase {
@@ -66,7 +66,7 @@ public class LoggerTest extends TestCase {
throw new ClassNotFoundException();
}
try {
byte[] bytes = IOUtils.readByteArray(is);
byte[] bytes = Utils.readByteArray(is);
this.defineClass(name, bytes, 0, bytes.length, DOMAIN);
definedSet.add(name);
} catch (IOException e) {
src/test/java/com/alibaba/druid/bvt/proxy/JdbcUtilsTest.java
+6 -6
View File
@@ -36,7 +36,7 @@ import com.alibaba.druid.mock.MockResultSetMetaData;
import com.alibaba.druid.mock.MockStatement;
import com.alibaba.druid.proxy.DruidDriver;
import com.alibaba.druid.stat.JdbcStatManager;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JdbcUtils;
public class JdbcUtilsTest extends TestCase {
@@ -193,7 +193,7 @@ public class JdbcUtilsTest extends TestCase {
{
Exception error = null;
try {
IOUtils.read(new Reader() {
Utils.read(new Reader() {
@Override
public int read(char[] cbuf, int off, int len) throws IOException {
@@ -214,7 +214,7 @@ public class JdbcUtilsTest extends TestCase {
{
Exception error = null;
try {
IOUtils.read(new Reader() {
Utils.read(new Reader() {
@Override
public int read(char[] cbuf, int off, int len) throws IOException {
@@ -234,7 +234,7 @@ public class JdbcUtilsTest extends TestCase {
}
{
String text = IOUtils.read(new Reader() {
String text = Utils.read(new Reader() {
@Override
public int read(char[] cbuf, int off, int len) throws IOException {
@@ -250,7 +250,7 @@ public class JdbcUtilsTest extends TestCase {
Assert.assertEquals("", text);
}
{
String text = IOUtils.read(new Reader() {
String text = Utils.read(new Reader() {
@Override
public int read(char[] cbuf, int off, int len) throws IOException {
@@ -283,7 +283,7 @@ public class JdbcUtilsTest extends TestCase {
}
};
String text = IOUtils.read(reader, 2);
String text = Utils.read(reader, 2);
Assert.assertEquals("AA", text);
}
}
src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest3.java
+2 -2
View File
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
import org.junit.Assert;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
public class MergeStatFilterTest3 extends TestCase {
private DruidDataSource dataSource;
@@ -41,7 +41,7 @@ public class MergeStatFilterTest3 extends TestCase {
}
public void test_merge() throws Exception {
String sqllist = IOUtils.read(new InputStreamReader(this.getClass().getResourceAsStream("/bvt/parser/postgresql.txt")));
String sqllist = Utils.read(new InputStreamReader(this.getClass().getResourceAsStream("/bvt/parser/postgresql.txt")));
String[] ss = sqllist.split("--");
for(String sql:ss)
{
src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java
+8 -7
View File
@@ -20,13 +20,14 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.junit.Assert;
import junit.framework.TestCase;
import org.junit.Assert;
import com.alibaba.druid.bvt.proxy.DruidDriverTest.PublicJdbcFilterAdapter;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.filter.FilterManager;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
/**
* druidLoader util 测试
@@ -94,12 +95,12 @@ public class DruidLoaderUtilsTest extends TestCase {
}
public void twest_loadClass() throws Exception {
Assert.assertEquals(null, IOUtils.loadClass(null));
Assert.assertEquals(null, IOUtils.loadClass("xxx"));
Assert.assertEquals(null, Utils.loadClass(null));
Assert.assertEquals(null, Utils.loadClass("xxx"));
Assert.assertEquals(PublicJdbcFilterAdapter.class,
IOUtils.loadClass(PublicJdbcFilterAdapter.class.getName()));
Assert.assertNull(IOUtils.loadClass(null));
Assert.assertNull(IOUtils.loadClass(""));
Utils.loadClass(PublicJdbcFilterAdapter.class.getName()));
Assert.assertNull(Utils.loadClass(null));
Assert.assertNull(Utils.loadClass(""));
}
}
src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java
+2 -2
View File
@@ -27,7 +27,7 @@ import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlParameterizedOutputVisitor;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JdbcUtils;
public class MySqlParserResourceTest extends TestCase {
@@ -55,7 +55,7 @@ public class MySqlParserResourceTest extends TestCase {
is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
Reader reader = new InputStreamReader(is, "UTF-8");
String input = IOUtils.read(reader);
String input = Utils.read(reader);
JdbcUtils.close(reader);
String[] items = input.split("---------------------------");
String sql = items[0].trim();
src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java
+2 -2
View File
@@ -28,7 +28,7 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlParameterizedOutputVisitor;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JdbcUtils;
public class MySqlResourceTest extends TestCase {
@@ -57,7 +57,7 @@ public class MySqlResourceTest extends TestCase {
is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
Reader reader = new InputStreamReader(is, "UTF-8");
String input = IOUtils.read(reader);
String input = Utils.read(reader);
JdbcUtils.close(reader);
String[] items = input.split("---------------------------");
String sql = items[0].trim();
src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java
+2 -2
View File
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
import com.alibaba.druid.sql.test.TestUtils;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JdbcUtils;
public class OracleSQLParserResourceTest extends TestCase {
@@ -45,7 +45,7 @@ public class OracleSQLParserResourceTest extends TestCase {
is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
Reader reader = new InputStreamReader(is, "UTF-8");
String input = IOUtils.read(reader);
String input = Utils.read(reader);
JdbcUtils.close(reader);
String[] items = input.split("---------------------------");
String sql = items[0].trim();
src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java
+2 -2
View File
@@ -28,7 +28,7 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlParameterizedOutputVisitor;
import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JdbcUtils;
public class OracleResourceTest extends OracleTest {
@@ -47,7 +47,7 @@ public class OracleResourceTest extends OracleTest {
is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
Reader reader = new InputStreamReader(is, "UTF-8");
String input = IOUtils.read(reader);
String input = Utils.read(reader);
JdbcUtils.close(reader);
String[] items = input.split("---------------------------");
String sql = items[0].trim();
src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java
+2 -2
View File
@@ -27,7 +27,7 @@ import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGOutputVisitor;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JdbcUtils;
public class PostgresqlResourceTest extends PGTest {
@@ -46,7 +46,7 @@ public class PostgresqlResourceTest extends PGTest {
is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
Reader reader = new InputStreamReader(is, "UTF-8");
String input = IOUtils.read(reader);
String input = Utils.read(reader);
JdbcUtils.close(reader);
String[] items = input.split("---------------------------");
String sql = items[0].trim();
src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java
+2 -2
View File
@@ -7,11 +7,11 @@ import org.junit.Assert;
import junit.framework.TestCase;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
public class JSONParserTest2 extends TestCase {
public void test_parse() throws Exception {
String text = IOUtils.readFromResource("bvt/sql.json");
String text = Utils.readFromResource("bvt/sql.json");
Map<String, Object> result = (Map<String, Object>)JSONUtils.parse(text);
List<Map<String, Object>> sqlList = (List<Map<String, Object>>) result.get("Content");
Assert.assertEquals(82, sqlList.size());
src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest3.java
+2 -2
View File
@@ -6,11 +6,11 @@ import java.util.Map;
import junit.framework.TestCase;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
public class JSONParserTest3 extends TestCase {
public void test_parse() throws Exception {
String text = IOUtils.readFromResource("bvt/sonar-sql.json");
String text = Utils.readFromResource("bvt/sonar-sql.json");
Map<String, Object> result = (Map<String, Object>)JSONUtils.parse(text);
LinkedHashMap wallStats = (LinkedHashMap) result.get("Content");
System.out.println(wallStats.get("blackList"));
src/test/java/com/alibaba/druid/bvt/support/monitor/MonitorDaoJdbcImplTest.java
+18
View File
@@ -0,0 +1,18 @@
package com.alibaba.druid.bvt.support.monitor;
import junit.framework.TestCase;
import com.alibaba.druid.stat.JdbcSqlStatValue;
import com.alibaba.druid.support.monitor.dao.MonitorDaoJdbcImpl;
import com.alibaba.druid.support.monitor.dao.MonitorDaoJdbcImpl.BeanInfo;
public class MonitorDaoJdbcImplTest extends TestCase {
public void testBuildSql() throws Exception {
MonitorDaoJdbcImpl dao = new MonitorDaoJdbcImpl();
String sql = dao.buildInsertSql(new BeanInfo(JdbcSqlStatValue.class));
System.out.println(sql);
}
}
src/test/java/com/alibaba/druid/sql/parser/PerfTest.java
+2 -2
View File
@@ -27,7 +27,7 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JdbcUtils;
public class PerfTest extends TestCase {
@@ -44,7 +44,7 @@ public class PerfTest extends TestCase {
String loadSql(String resource) throws Exception {
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
Reader reader = new InputStreamReader(is, "UTF-8");
String input = IOUtils.read(reader);
String input = Utils.read(reader);
JdbcUtils.close(reader);
String[] items = input.split("---------------------------");
String sql = items[1].trim();