diff --git a/doc/license.txt b/doc/license.txt index 177bda7741..5409d1bdaf 100644 --- a/doc/license.txt +++ b/doc/license.txt @@ -1,4 +1,4 @@ -Copyright 1999-2017 Alibaba Group Holding Ltd. +Copyright 1999-2018 Alibaba Group Holding Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java index 91625369b9..ba7f041085 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidDataSourceTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java index ca15b0af41..1dc18b8db4 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidMultiDataSourceTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/license.txt b/license.txt index 00b845b43b..52d99a66dd 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright 1999-2017 Alibaba Group Holding Ltd. +Copyright 1999-2018 Alibaba Group Holding Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/Bug_for_alibank.java b/src/test/java/com/alibaba/druid/Bug_for_alibank.java index 141b4e0134..94d05853db 100644 --- a/src/test/java/com/alibaba/druid/Bug_for_alibank.java +++ b/src/test/java/com/alibaba/druid/Bug_for_alibank.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/DBCPTest.java b/src/test/java/com/alibaba/druid/DBCPTest.java index 8879a5cd61..749e9333d1 100644 --- a/src/test/java/com/alibaba/druid/DBCPTest.java +++ b/src/test/java/com/alibaba/druid/DBCPTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java b/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java index 64dd6fdd2a..3cca704eff 100644 --- a/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java +++ b/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/LockTest.java b/src/test/java/com/alibaba/druid/LockTest.java index 6bf2efbc22..937b88e955 100644 --- a/src/test/java/com/alibaba/druid/LockTest.java +++ b/src/test/java/com/alibaba/druid/LockTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestForZY.java b/src/test/java/com/alibaba/druid/TestForZY.java index cbab45afb3..39eb087e3d 100644 --- a/src/test/java/com/alibaba/druid/TestForZY.java +++ b/src/test/java/com/alibaba/druid/TestForZY.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestHistogram.java b/src/test/java/com/alibaba/druid/TestHistogram.java index 5b6f8a95f7..9c3af394fa 100644 --- a/src/test/java/com/alibaba/druid/TestHistogram.java +++ b/src/test/java/com/alibaba/druid/TestHistogram.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestIdel3.java b/src/test/java/com/alibaba/druid/TestIdel3.java index 86539d97fe..4d3e3c66fe 100644 --- a/src/test/java/com/alibaba/druid/TestIdel3.java +++ b/src/test/java/com/alibaba/druid/TestIdel3.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestLRU.java b/src/test/java/com/alibaba/druid/TestLRU.java index f4a2a40c42..28b96b0ba9 100644 --- a/src/test/java/com/alibaba/druid/TestLRU.java +++ b/src/test/java/com/alibaba/druid/TestLRU.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestLockCount.java b/src/test/java/com/alibaba/druid/TestLockCount.java index 8559c21f4f..f54d89be6c 100644 --- a/src/test/java/com/alibaba/druid/TestLockCount.java +++ b/src/test/java/com/alibaba/druid/TestLockCount.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestOracle.java b/src/test/java/com/alibaba/druid/TestOracle.java index 67030ca497..1b4b8cdaf5 100644 --- a/src/test/java/com/alibaba/druid/TestOracle.java +++ b/src/test/java/com/alibaba/druid/TestOracle.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestOraclePing.java b/src/test/java/com/alibaba/druid/TestOraclePing.java index aadc155151..8b7466b154 100644 --- a/src/test/java/com/alibaba/druid/TestOraclePing.java +++ b/src/test/java/com/alibaba/druid/TestOraclePing.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestReplaceLicense.java b/src/test/java/com/alibaba/druid/TestReplaceLicense.java index 40371c6db4..675d9c0681 100644 --- a/src/test/java/com/alibaba/druid/TestReplaceLicense.java +++ b/src/test/java/com/alibaba/druid/TestReplaceLicense.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestRollBack.java b/src/test/java/com/alibaba/druid/TestRollBack.java index f8827f1d84..129dbd6605 100644 --- a/src/test/java/com/alibaba/druid/TestRollBack.java +++ b/src/test/java/com/alibaba/druid/TestRollBack.java @@ -19,7 +19,7 @@ import java.sql.SQLException; /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestSqlServer.java b/src/test/java/com/alibaba/druid/TestSqlServer.java index d5124a6fa8..96e997792e 100644 --- a/src/test/java/com/alibaba/druid/TestSqlServer.java +++ b/src/test/java/com/alibaba/druid/TestSqlServer.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestTraceFilter.java b/src/test/java/com/alibaba/druid/TestTraceFilter.java index d520ae6b64..e00c98bf80 100644 --- a/src/test/java/com/alibaba/druid/TestTraceFilter.java +++ b/src/test/java/com/alibaba/druid/TestTraceFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/TestUtil.java b/src/test/java/com/alibaba/druid/TestUtil.java index 5b4fdb2b23..f98e157660 100644 --- a/src/test/java/com/alibaba/druid/TestUtil.java +++ b/src/test/java/com/alibaba/druid/TestUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java index 903aaaeafc..286386dd12 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java index 595fcd13a6..64cc32ad37 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java index 16f5e05bce..5a1ac6576d 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java index dda182ea6a..870db350a9 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case4.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case4.java index a1396e1590..6176a7ddc2 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case4.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case4.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java index ee6de0a197..08321c620e 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java index 9fcbc10c68..ee7f48fdf8 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java index 6ed4d9b652..f61367009f 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java index bbcf117940..c7b8f6c815 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java index 9485ed745e..0a90ab17f1 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java index 8765edebc6..70c5ac5298 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java index ad3cfb1962..6ed7b7769a 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java index c356f35e8d..0f2af3eb23 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java b/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java index f4186e6d8d..357b5b69cc 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkCase.java b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkCase.java index ef64235058..cf069e1310 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkCase.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkCase.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java index d02e374b7f..c1b5e10f7e 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java b/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java index 76b65b6861..f661757d03 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java b/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java index 6fc61bbfcd..9855473876 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/SQLExecutor.java b/src/test/java/com/alibaba/druid/benckmark/proxy/SQLExecutor.java index f0347b3802..465f2c6d30 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/SQLExecutor.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/SQLExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java b/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java index 5892c5294c..21f1e85355 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java index b1f32d5390..51069ff265 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java index dd51f704e8..9e19ac47f6 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java index 20bf1ab15f..789948c501 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java index d7855dd0c6..575e44aefd 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlParameterizedBenchmark.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlParameterizedBenchmark.java index aba4a839d3..6e74ec1425 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlParameterizedBenchmark.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlParameterizedBenchmark.java @@ -7,6 +7,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Lexer; +import com.alibaba.druid.sql.parser.SQLSelectListCache; import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; @@ -26,6 +27,9 @@ import java.util.Set; public class MySqlParameterizedBenchmark extends TestCase { + protected void setUp() throws Exception { + System.out.println("java.runtime.version : " + System.getProperty("java.runtime.version")); + } public void test_perf() throws Exception { String sql = "select id as id, gmt_create as gmtCreate, gmt_modified as gmtModified, name as name, owner as owner, type as type, statement as statement, datasource as datasource, meta as meta, param_file as paramFile, sharable as sharable, data_type as dataType, status as status, config as config, project_id as projectId, plugins as plugins, field_compare as fieldCompare, field_ext as fieldExt, openx as openx from quark_s_dataset where id = 12569434"; @@ -55,7 +59,53 @@ public void test_perf() throws Exception { String sql11 = "select seller_item_sku.item_id,seller_item_sku.gmt_modified,seller_item_sku.gmt_create,seller_item_sku.sku_id,seller_item_sku.seller_id,seller_item_sku.outer_id,seller_item_sku.status,seller_item_sku.sync_version,seller_item_sku.sku_feature from seller_item_sku_2047 seller_item_sku where ((seller_item_sku.item_id = 558182960563) AND (seller_item_sku.seller_id = 673619967) AND (seller_item_sku.sku_id = 3634115286014))"; String sql12 = "/* 0ba9776a15048393743937000d1936/0//7d21f1f2/ */select `auction_relation`.`id`,`auction_relation`.`item_id`,`auction_relation`.`sku_id`,`auction_relation`.`user_id`,`auction_relation`.`target_id`,`auction_relation`.`extra_id`,`auction_relation`.`type`,`auction_relation`.`target_type`,`auction_relation`.`type_attr`,`auction_relation`.`status`,`auction_relation`.`target_user_id`,`auction_relation`.`options`,`auction_relation`.`features`,`auction_relation`.`version`,`auction_relation`.`sub_type`,`auction_relation`.`gmt_create`,`auction_relation`.`gmt_modified` from `auction_relation_1080` `auction_relation` where ((`auction_relation`.`item_id` = 556887226360) AND (`auction_relation`.`target_Type` IN (1,2,3,4)) AND (`auction_relation`.`status` = 0) AND (`auction_relation`.`type` IN (16,17,6,7,8,9,10,11,12,13,14,15)))"; String sql13 = "/* 0b802d4e15048393680475983ea57a/0.1.5.24.1.1113363181//f7972bef/ */SELECT id, dispute_id, buyer_id, seller_id, total_fee, refund_fee, max_apply_goods_fee, apply_goods_fee, apply_carriage_fee, refund_goods_fee, refund_carriage_fee, refund_point, refund_coupon, refund_return_point, refund_cash, real_deduct_refund_point, real_refund_return_point, refund_return_commission, gmt_create, gmt_modified, attributes, attributes_cc FROM dispute_funds_0502 AS dispute_funds WHERE dispute_id = 3079439578090614"; + String sql14 = "SELECT biz_order_id, value_type, key_value, gmt_create, gmt_modified\n" + + "\t, attribute_cc, buyer_id\n" + + "FROM tc_biz_vertical_2533 t\n" + + "WHERE t.biz_order_id = 54848191250268105\n" + + "\tAND value_type = 0"; + String sql15 = "SELECT biz_order_id, value_type, key_value, gmt_create, gmt_modified\n" + + "\t, attribute_cc, buyer_id\n" + + "FROM tc_biz_vertical_2533 t\n" + + "WHERE t.biz_order_id = 54848191250268105\n" + + "\tAND value_type = 0"; + String sql16 = "SELECT sub_logistics_order_id, consign_time, attribute_cc, attributes, out_logistics_id\n" + + "\t, parent_id, gmt_create, gmt_modified, detail_order_id, is_last\n" + + "\t, ship_amount, buyer_id, seller_id, ship_status, step_order_id\n" + + "FROM tc_sub_logistics_2531 tc_sub_logistics\n" + + "WHERE parent_id = 13571580288486317\n" + + "\tAND is_last = 1"; + String sql17 = "/* 0ba9776a15048393743937000d1936/0//7d21f1f2/ */select `auction_relation`.`id`,`auction_relation`.`item_id`,`auction_relation`.`sku_id`,`auction_relation`.`user_id`,`auction_relation`.`target_id`,`auction_relation`.`extra_id`,`auction_relation`.`type`,`auction_relation`.`target_type`,`auction_relation`.`type_attr`,`auction_relation`.`status`,`auction_relation`.`target_user_id`,`auction_relation`.`options`,`auction_relation`.`features`,`auction_relation`.`version`,`auction_relation`.`sub_type`,`auction_relation`.`gmt_create`,`auction_relation`.`gmt_modified` from `auction_relation_1080` `auction_relation` where ((`auction_relation`.`item_id` = 556887226360) AND (`auction_relation`.`target_Type` IN (1,2,3,4)) AND (`auction_relation`.`status` = 0) AND (`auction_relation`.`type` IN (16,17,6,7,8,9,10,11,12,13,14,15)))"; + String sql18 = "insert into SURF_WEA_CHN_HOR_ALL_TAB_INSERT (`D_DATETIME`, `V_ACODE`, `V01300`, `V01301`, `V05001`, `V06001`, `D_DATA_ID`, `D_IYMDHM`, `D_RYMDHM`, `D_UPDATE_TIME`, `V_BBB`,V04001, V04002, V04003, V04004, V07001, V07031, V07032_04, V07032_01, V07032_02, V02001, V02301, V08010, V02183, V10004, V10051, V10061, V10062, V10301, V10301_052, V10302, V10302_052, V12001, V12011, V12011_052, V12012, V12012_052, V12405, V12016, V12017, V12003, V13003, V13007, V13007_052, V13004, V13019, V13020, V13021, V13022, V13023, V04080_04, V13011, V13033, V11290, V11291, V11292, V11293, V11296, V11042, V11042_052, V11201, V11202, V11211, V11046, V11046_052, V11503_06, V11504_06, V11503_12, V11504_12, V12120, V12311, V12311_052, V12121, V12121_052, V12013, V12030_005, V12030_010, V12030_015, V12030_020, V12030_040, V12030_080, V12030_160, V12030_320, V12314, V12315, V12315_052, V12316, V12316_052, V20001_701_01, V20001_701_10, V20059, V20059_052, V20001, V20010, V20051, V20011, V20013, V20350_01, V20350_02, V20350_03, V20350_04, V20350_05, V20350_06, V20350_07, V20350_08, V20350_11, V20350_12, V20350_13, V20003, V04080_05, V20004, V20005, V20062, V13013, V13330, V20330_01, V20331_01, V20330_02, V20331_02, Q10004, Q10051, Q10061, Q10062, Q10301, Q10301_052, Q10302, Q10302_052, Q12001, Q12011, Q12011_052, Q12012, Q12012_052, Q12405, Q12016, Q12017, Q12003, Q13003, Q13007, Q13007_052, Q13004, Q13019, Q13020, Q13021, Q13022, Q13023, Q04080_04, Q13011, Q13033, Q11290, Q11291, Q11292, Q11293, Q11296, Q11042, Q11042_052, Q11201, Q11202, Q11211, Q11046, Q11046_052, Q11503_06, Q11504_06, Q11503_12, Q11504_12, Q12120, Q12311, Q12311_052, Q12121, Q12121_052, Q12013, Q12030_005, Q12030_010, Q12030_015, Q12030_020, Q12030_040, Q12030_080, Q12030_160, Q12030_320, Q12314, Q12315, Q12315_052, Q12316, Q12316_052, Q20001_701_01, Q20001_701_10, Q20059, Q20059_052, Q20001, Q20010, Q20051, Q20011, Q20013, Q20350_01, Q20350_02, Q20350_03, Q20350_04, Q20350_05, Q20350_06, Q20350_07, Q20350_08, Q20350_11, Q20350_12, Q20350_13, Q20003, Q04080_05, Q20004, Q20005, Q20062, Q13013, Q13330, Q20330_01, Q20331_01, Q20330_02, Q20331_02) values('2390-12-1', '190000', 140336, '140336', 74, 27,'A.0012.0001.S001', now(), now(), now(), 'abc', 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999, 9999 )"; + String sql19 = "insert into test(id, name, name2, name3) values(4, '1', '1', '1'), (5, '1', '1', '1'), (6, '1', '1', '1');"; + + String sql20 = "SELECT biz_order_id, out_order_id, seller_nick, buyer_nick, seller_id\n" + + "\t, buyer_id, auction_id, auction_title, auction_price, buy_amount\n" + + "\t, biz_type, sub_biz_type, fail_reason, pay_status, logistics_status\n" + + "\t, out_trade_status, snap_path, gmt_create, status\n" + + "\t, ifnull(buyer_rate_status, 4) AS buyer_rate_status\n" + + "\t, ifnull(seller_rate_status, 4) AS seller_rate_status, auction_pict_url\n" + + "\t, seller_memo, buyer_memo, seller_flag, buyer_flag, buyer_message_path\n" + + "\t, refund_status, attributes, attributes_cc, gmt_modified, ip\n" + + "\t, end_time, pay_time, is_main, is_detail, point_rate\n" + + "\t, parent_id, adjust_fee, discount_fee, refund_fee, confirm_paid_fee\n" + + "\t, cod_status, trade_tag, shop_id, sync_version, options\n" + + "\t, ignore_sold_quantity, from_group, attribute1, attribute2, attribute3\n" + + "\t, attribute4, attribute11\n" + + "FROM tc_biz_order_3212 tc_biz_order\n" + + "WHERE parent_id = 9065896323824229284"; + + String sql21 = "INSERT INTO __test_tc_biz_vertical_2052 (biz_order_id, value_type, key_value, buyer_id, seller_id\n" + + "\t, gmt_create, gmt_modified, attribute_cc)\n" + + "VALUES (9063685435998934059, 1, ';constract_service:DEFAULT#3B7d;promotionShare:shopbonus-9223370001508705690_9223370006796631977-9223370091419060389#3B300;service_tags:TB_CONSIGN_DATE$consignDate@48&;cartid:9223370002239375832;ppf:0;templateSnapshot:calcu_nomal@icKey_900000039254633516_0~price_4000~count_1~size_0~weight_0~tpid_1164540740~uid_9223370014720392256~ver_2~valu_0~freeReason_null~isFree_false~promo_;', 9223370015555935940, 9223370014720392256\n" + + "\t, NOW(), NOW(), 0)"; + + String sql22 = "/* 0b852b3c15094480140194289e3d24/0.1.1.2.1//2e3b9cf7/ */select `member_cart`.`CART_ID`,`member_cart`.`SKU_ID`,`member_cart`.`ITEM_ID`,`member_cart`.`QUANTITY`,`member_cart`.`USER_ID`,`member_cart`.`SELLER_ID`,`member_cart`.`STATUS`,`member_cart`.`EXT_STATUS`,`member_cart`.`TYPE`,`member_cart`.`SUB_TYPE`,`member_cart`.`GMT_CREATE`,`member_cart`.`GMT_MODIFIED`,`member_cart`.`ATTRIBUTE`,`member_cart`.`ATTRIBUTE_CC`,`member_cart`.`EX2` from `member_cart_0304` `member_cart` where ((`member_cart`.`USER_ID` = 2732851504) AND ((`member_cart`.`STATUS` = 1) AND (`member_cart`.`TYPE` IN (0,5,10)))) limit 0,200"; + String sql23 = "/* 0ba8360215094481936224182e74a5/0.1.1.2.28//eb2abb79/ */INSERT INTO tc_biz_order_3912 (biz_order_id, out_order_id, seller_nick, buyer_nick, seller_id, buyer_id, auction_id, auction_title, auction_price, buy_amount, biz_type, sub_biz_type, fail_reason, pay_status, logistics_status, out_trade_status, snap_path, gmt_create, status, buyer_rate_status, seller_rate_status, auction_pict_url, seller_memo, buyer_memo, seller_flag, buyer_flag, buyer_message_path, refund_status, attributes, attributes_cc, gmt_modified, ip, end_time, pay_time, is_main, is_detail, point_rate, parent_id, adjust_fee, discount_fee, refund_fee, confirm_paid_fee, cod_status, trade_tag, shop_id, sync_version, options, ignore_sold_quantity, from_group, attribute1, attribute2, attribute3, attribute4, attribute11) VALUES (81721703845156454, 'b_504714202740', 'suilu2009', 'lily_zys', 893525513, 90155464, 543024929653, '�����߲˺���ɽ���ز���ī����ع� ũ�������л�������ʳ5�����', 2900, 2, 200, 1, null, 7, 8, 0, 'm:81721703845156454_1', '2017-10-31 19:09:53', 0, 5, 5, 'i1/893525513/TB22oPHX4hmpuFjSZFyXXcLdFXa_!!893525513.jpg', null, null, 0, 0, 'm:81721703845156454_4', 9, ';bizCode:taobao.general.foods;shipping:2;newDO:1;productNoList:[7, 26];ctr:1;otf:5800;pro_free_de:1;p_sign:fe1714afc2738ec12aba5c9d0ec263f1;reduceInv:1;addBackInv:1;inv_result:#3A1#3B1#3A;itemTag:587,651,843,1035,1163,1611,2507,2635,4491,4550,4619,4811,5190,6603,7371,7947,8395,11083,11339,11467,16395,25282,36610,48578,165186;anony:1;ptid:8774749370;ttid:201200@taobao_iphone_7.1.0;ppayProt:1;isChecked:false;realRootCat:50050359;fusion:1;fromAdp:1;tmppTraceId:0ba8360215094481936224182e74a5;defaultAddr:1;tp3create:1;m_sign:8a79a1dd98a19a1e9d34f28bdc459e2b;lTime:0;unec:1;virtual:0;orderIdSelf:1;cosys:wap|buynow;buy2create:1;prepayCat:1;subUniqId:b_504714202740_1;joinId:b_504714202740_1;lgType:-4;cvb:1;pSubOutId:fe1714afc2738ec12aba5c9d0ec263f1;unity:1;rootCat:50050720;pOutId:b_504714202740;wkup:1;pxjkc:1;dapFlag:3|3372087912011355|consumerprotect^1^1^15;reduce_suc:1;wap:1;address_city:�Ϻ���;divisionCode:310112107;tf:5800;supDcc:Y#N;shopname:����ũ��Ʒ;unifyInv:1;buyrisk:1;shipname:���;stuff:5;', 0, '2017-10-31 19:09:53', 3031141102, null, null, 1, 1, 0, 81721703845156454, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1|createOutPayOrder|^')"; +// System.out.println(System.getProperties()); + +// System.out.println(sql19); for (int i = 0; i < 5; ++i) { // perf(sql); // 6740 6201 4752 4514 4391 4218 4127 4124 // perf(sql2); // 2948 2928 2869 2780 2502 @@ -64,9 +114,22 @@ public void test_perf() throws Exception { // perf(sql5); // 1917 1882 // perf(sql6); // 4193 // perf(sql8); // 601 585 314 -// perf(sql9); // 2403 2392 2188 2169 +// perf(sql9); // 2403 2392 2188 2169 2083 1983 1956 1941 // perf(sql10); // 3163 2866 - perf(sql13); // +// perf(sql13); // +// perf(sql15); // 1417 +// perf(sql16); // 3464 2518 1981 1625 1511 1490 1448 + //perf(sql21); // 2158 1816 1598 +// perf(sql20); +// perf(sql22); // 3030 2980 2848 2955 2800 2582 +// perf(sql23); + +// perf_hash(sql22); // 2713 + perf_hash(sql23); // 4804 3858 3699 + +// perf_hash2(sql22); // 3333 + +// perf_direct(sql16); // 1531 // perf_parse(sql); // 4643 4377 4345 3801 3627 3228 2961 2959 // perf_parse(sql2); // 1918 1779 1666 1646 @@ -76,20 +139,28 @@ public void test_perf() throws Exception { // perf_parse(sql6); // perf_parse(sql7); // 9831 8581 8552 // perf_parse(sql8); // +// perf_parse(sql9); // // perf_parse(sql10); // 2291 2025 2024 2010 // perf_parse(sql11); // 3209 -// perf_parse(sql12); // 4873 4767 -// perf_parse(sql13); // +// perf_parse(sql12); // 4873 4767 3854 +// perf_parse(sql14); // +// perf_parse(sql15); // 976 970 953 945 921 +// perf_parse(sql16); // 2419 1483 1045 +// perf_parse(sql17); // 3089 3041 +// perf_parse(sql18); // 23913 13408 millis : 13131 +// perf_parse(sql19); // 870 // perf_lexer(sql4); // 2051 1802 // perf_lexer(sql5); // 1125 1054 // perf_lexer(sql6); // millis : 2811 +// perf_lexer(sql20); // perfParameterized(sql6); // 4224 4083 // perfFormat(sql7); // 14865 14132 13812 13714 12917 // perf_hashCode64(sql5); // 181 +// perf_hashCode64(sql20); // 1084 // perf_stat(sql); // 15214 11793 13628 13561 13259 9946 7637 7444 7389 7326 7176 6687 5973 5660 @@ -187,4 +258,43 @@ public void perfFormat(String sql) { long millis = System.currentTimeMillis() - startMillis; System.out.println("millis : " + millis); } + + static SQLSelectListCache selectListCache = SqlHolder.selectListCache; + + public void perf_direct(String sql) { + long startMillis = System.currentTimeMillis(); + for (int i = 0; i < 1000 * 1000; ++i) { + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, selectListCache); + } + long millis = System.currentTimeMillis() - startMillis; + System.out.println("millis : " + millis); + } + + public void perf_hash(String sql) { + long startMillis = System.currentTimeMillis(); + for (int i = 0; i < 1000 * 1000; ++i) { + ParameterizedOutputVisitorUtils.parameterizeHash(sql, JdbcConstants.MYSQL, selectListCache, null); + } + long millis = System.currentTimeMillis() - startMillis; + System.out.println("millis : " + millis); + } + + public void perf_hash2(String sql) { + long startMillis = System.currentTimeMillis(); + for (int i = 0; i < 1000 * 1000; ++i) { + FnvHash.fnv1a_64_lower(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, selectListCache)); + } + long millis = System.currentTimeMillis() - startMillis; + System.out.println("millis : " + millis); + } +// +// static void x(String datas, int currItemOffset, int nextItemOffset) { +//long value = 0; +//for (int i = currItemOffset + 13; i < nextItemOffset; ++i) { +// int digit = datas.charAt(i) - '0'; +// value = value * 10 + digit; +// // power *= 10; +//} +//double doubleValue = ((double)value) * 0.000000000000000000000001D; // 如果定长，使用固定值，如果边长，在for循环中power然后除power +// } } diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java index 1d5768e87e..339bb7d5ce 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java index ef58bf4986..cb87a2c60e 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java index ca1eb39711..c36dc07b1b 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java index 617f745e6f..6e7a47eef4 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java index 00fee5e375..2724da2e4b 100644 --- a/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java +++ b/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java index b9cb47d07a..a6430f66fe 100644 --- a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java +++ b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java index beda88a3c1..688d85e04a 100644 --- a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java +++ b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql.java b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql.java index 27b38add68..a952d38bd1 100644 --- a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql.java +++ b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql_concurrent.java b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql_concurrent.java index e8747cc510..a971959edc 100644 --- a/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql_concurrent.java +++ b/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql_concurrent.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java b/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java index 603a5e3090..76afd0137f 100644 --- a/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java +++ b/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java b/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java index de48221633..b9706b7ad2 100644 --- a/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java +++ b/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/mysql/MySqlInsertTest.java b/src/test/java/com/alibaba/druid/mysql/MySqlInsertTest.java new file mode 100644 index 0000000000..27e6f8fbaf --- /dev/null +++ b/src/test/java/com/alibaba/druid/mysql/MySqlInsertTest.java @@ -0,0 +1,22 @@ +package com.alibaba.druid.mysql; + +import com.alibaba.druid.DbTestCase; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.Statement; + +public class MySqlInsertTest extends DbTestCase { + public MySqlInsertTest() { + super("pool_config/mysql_oracle_info.properties"); + } + public void test_for_mysql() throws Exception { + Connection conn = getConnection(); + Statement stmt = conn.createStatement(); + + stmt.execute("use oracle_info"); + + stmt.close(); + conn.close(); + } +} diff --git a/src/test/java/com/alibaba/druid/mysql/MySql_Connect_test.java b/src/test/java/com/alibaba/druid/mysql/MySql_Connect_test.java new file mode 100644 index 0000000000..76c1692bff --- /dev/null +++ b/src/test/java/com/alibaba/druid/mysql/MySql_Connect_test.java @@ -0,0 +1,77 @@ +package com.alibaba.druid.mysql; + +import com.alibaba.druid.DbTestCase; +import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.MySqlUtils; +import com.alibaba.fastjson.util.TypeUtils; +//import com.mysql.jdbc.ConnectionImpl; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.Statement; + +/** + * Created by wenshao on 23/07/2017. + */ +public class MySql_Connect_test extends DbTestCase { + public MySql_Connect_test() { + super("pool_config/mysql_tddl.properties"); + } + + public void test_oracle_2() throws Exception { + for (int i = 0; i < 10; ++i) { + Connection conn = getConnection(); + + Statement stmt = conn.createStatement(); + int updateCnt = stmt.executeUpdate("update tb1 set fid = '3' where fid = '4'"); + System.out.println("update : " + updateCnt); + + System.out.println( + MySqlUtils.getLastPacketReceivedTimeMs(conn)); + + + stmt.close(); +// rs.close(); + + conn.close(); + } + } + + public void test_oracle() throws Exception { + Connection conn = getConnection(); + + System.out.println( + MySqlUtils.getLastPacketReceivedTimeMs(conn)); + + //String createTableScript = JdbcUtils.getCreateTableScript(conn, JdbcConstants.MYSQL); + //System.out.println(createTableScript); + + Statement stmt = conn.createStatement(); + int updateCnt = stmt.executeUpdate("update tb1 set fid = '3' where fid = '4'"); + System.out.println("update : " + updateCnt); + + System.out.println( + MySqlUtils.getLastPacketReceivedTimeMs(conn)); + + Thread.sleep(500); + + System.out.println( + MySqlUtils.getLastPacketReceivedTimeMs(conn)); + + Class class_connImpl_5 = TypeUtils.loadClass("com.mysql.jdbc.ConnectionImpl"); + if (class_connImpl_5 != null) { + conn.unwrap(class_connImpl_5); + } + dataSource.validateConnection(conn); + + System.out.println( + MySqlUtils.getLastPacketReceivedTimeMs(conn)); + + stmt.close(); +// rs.close(); + + conn.close(); + } +} diff --git a/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java b/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java index 6ab451260d..6e06107a2c 100644 --- a/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java +++ b/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/not_support/sql/postgresql/PGSelectTest59_lateral.java b/src/test/java/com/alibaba/druid/not_support/sql/postgresql/PGSelectTest59_lateral.java index 057b4d84ef..84bf1ea734 100644 --- a/src/test/java/com/alibaba/druid/not_support/sql/postgresql/PGSelectTest59_lateral.java +++ b/src/test/java/com/alibaba/druid/not_support/sql/postgresql/PGSelectTest59_lateral.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/Case0.java b/src/test/java/com/alibaba/druid/pool/Case0.java index 7b60a49b43..9b186ed974 100644 --- a/src/test/java/com/alibaba/druid/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/pool/Case0.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/Case3.java b/src/test/java/com/alibaba/druid/pool/Case3.java index 89b694da2e..500fadd658 100644 --- a/src/test/java/com/alibaba/druid/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/pool/Case3.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/CobarTest.java b/src/test/java/com/alibaba/druid/pool/CobarTest.java index ec21d36cad..c1196bf167 100644 --- a/src/test/java/com/alibaba/druid/pool/CobarTest.java +++ b/src/test/java/com/alibaba/druid/pool/CobarTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java b/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java index e6786e8cdb..88a47fac78 100644 --- a/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java +++ b/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java b/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java index 3d36d86f71..0ac94fd9dc 100644 --- a/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java +++ b/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/DBCPTest.java b/src/test/java/com/alibaba/druid/pool/DBCPTest.java index 4f85280a2f..076459a05c 100644 --- a/src/test/java/com/alibaba/druid/pool/DBCPTest.java +++ b/src/test/java/com/alibaba/druid/pool/DBCPTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/DruidTest.java b/src/test/java/com/alibaba/druid/pool/DruidTest.java index 01dea9c8ad..befac5e10e 100644 --- a/src/test/java/com/alibaba/druid/pool/DruidTest.java +++ b/src/test/java/com/alibaba/druid/pool/DruidTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/ExeptionSorterTest.java b/src/test/java/com/alibaba/druid/pool/ExeptionSorterTest.java new file mode 100644 index 0000000000..0b1dda8105 --- /dev/null +++ b/src/test/java/com/alibaba/druid/pool/ExeptionSorterTest.java @@ -0,0 +1,43 @@ +package com.alibaba.druid.pool; + +import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; +import com.alibaba.druid.util.JdbcUtils; +import com.mysql.jdbc.Driver; +import junit.framework.TestCase; + +import java.lang.reflect.Method; +import java.sql.SQLException; + +public class ExeptionSorterTest extends TestCase { + private DruidDataSource dataSource; + + protected void setUp() throws Exception { + dataSource = new DruidDataSource(); + dataSource.setDriver(new MyDriver()); + } + + protected void tearDown() throws Exception { + JdbcUtils.close(dataSource); + } + + public void test_dataSource() throws Exception { + Method method = DruidDataSource.class.getDeclaredMethod("initExceptionSorter"); + method.setAccessible(true); + method.invoke(dataSource); + + assertEquals(dataSource.getExceptionSorter().getClass(), MySqlExceptionSorter.class); + } + + + + public static class MyDriver extends Driver { + + /** + * Construct a new driver and register it with DriverManager + * + * @throws SQLException if a database error occurs. + */ + public MyDriver() throws SQLException { + } + } +} diff --git a/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java b/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java index a58ba7ff50..083e78efdd 100644 --- a/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java +++ b/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java b/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java index 59d385000e..1609ea72cf 100644 --- a/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java +++ b/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/OracleConnectionPoolDataSourceTest.java b/src/test/java/com/alibaba/druid/pool/OracleConnectionPoolDataSourceTest.java index e00370280d..4fe8cad938 100644 --- a/src/test/java/com/alibaba/druid/pool/OracleConnectionPoolDataSourceTest.java +++ b/src/test/java/com/alibaba/druid/pool/OracleConnectionPoolDataSourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java b/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java index d5b3fc10b8..e3ff1ce955 100644 --- a/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java +++ b/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java index 109c95aae0..c136671537 100644 --- a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java +++ b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java index 46cd579578..517ed6d845 100644 --- a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java +++ b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/TestMockPerf.java b/src/test/java/com/alibaba/druid/pool/TestMockPerf.java index 402ca23a00..aaced28745 100644 --- a/src/test/java/com/alibaba/druid/pool/TestMockPerf.java +++ b/src/test/java/com/alibaba/druid/pool/TestMockPerf.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java b/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java index 69111faea5..f78edd6fd2 100644 --- a/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java +++ b/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java b/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java index 4d6537694f..9ec2db5606 100644 --- a/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java +++ b/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java b/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java index bd89b66248..794debd6a5 100644 --- a/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java +++ b/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java b/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java index 5102e4ec39..0475a8f546 100644 --- a/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java +++ b/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/TestRollBack.java b/src/test/java/com/alibaba/druid/pool/TestRollBack.java index a76acdb5d3..cb8c03e491 100644 --- a/src/test/java/com/alibaba/druid/pool/TestRollBack.java +++ b/src/test/java/com/alibaba/druid/pool/TestRollBack.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/Test_C2.java b/src/test/java/com/alibaba/druid/pool/Test_C2.java index 397ef7d4b3..af00ca23a8 100644 --- a/src/test/java/com/alibaba/druid/pool/Test_C2.java +++ b/src/test/java/com/alibaba/druid/pool/Test_C2.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/Test_kyline.java b/src/test/java/com/alibaba/druid/pool/Test_kyline.java index f7ab641953..982b3cff3e 100644 --- a/src/test/java/com/alibaba/druid/pool/Test_kyline.java +++ b/src/test/java/com/alibaba/druid/pool/Test_kyline.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java b/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java index 8fafcb695f..a744c2dae5 100644 --- a/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java +++ b/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java b/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java index 23b13ada86..7f22bb45e9 100644 --- a/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java +++ b/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java b/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java index 69c2ef6387..c6d22bbdde 100644 --- a/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java +++ b/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java b/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java index c6271d5d38..92dcb2096f 100644 --- a/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java +++ b/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/demo/Demo0.java b/src/test/java/com/alibaba/druid/pool/demo/Demo0.java index 8e01b4f041..0de2ca1da5 100644 --- a/src/test/java/com/alibaba/druid/pool/demo/Demo0.java +++ b/src/test/java/com/alibaba/druid/pool/demo/Demo0.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/oracle/OracleDeprecated.java b/src/test/java/com/alibaba/druid/pool/oracle/OracleDeprecated.java new file mode 100644 index 0000000000..dcdcf849a9 --- /dev/null +++ b/src/test/java/com/alibaba/druid/pool/oracle/OracleDeprecated.java @@ -0,0 +1,12 @@ +package com.alibaba.druid.pool.oracle; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +public class OracleDeprecated extends TestCase { + public void test_deprecated() throws Exception { + DruidDataSource ds = new DruidDataSource(); + ds.setDriverClassName(JdbcConstants.ORACLE_DRIVER2); + } +} diff --git a/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java b/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java index 5fb1012c8c..6d7bfb5104 100644 --- a/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java +++ b/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java b/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java index 25e4483fb8..53d78af587 100644 --- a/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java +++ b/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/proxy/TestOracle.java b/src/test/java/com/alibaba/druid/proxy/TestOracle.java index 08a1767139..8708952c0e 100644 --- a/src/test/java/com/alibaba/druid/proxy/TestOracle.java +++ b/src/test/java/com/alibaba/druid/proxy/TestOracle.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java b/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java index ea78e2b526..1bf7962ac5 100644 --- a/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java +++ b/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java b/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java index 3562dbb4df..02b5faf9cc 100644 --- a/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java +++ b/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java b/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java index a512549d22..655323ffe4 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java b/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java index 1c3ebd404d..a65f02b9a2 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java index 32cf04b7ed..a802f64eec 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java index 1a5d1153c9..749a68547b 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java index c201f1c4ec..4f41e33005 100644 --- a/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java +++ b/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/spring/ISequenceDao.java b/src/test/java/com/alibaba/druid/spring/ISequenceDao.java index 38d48778de..9de5dacee0 100644 --- a/src/test/java/com/alibaba/druid/spring/ISequenceDao.java +++ b/src/test/java/com/alibaba/druid/spring/ISequenceDao.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/spring/ISequenceService.java b/src/test/java/com/alibaba/druid/spring/ISequenceService.java index 0885367ef0..1a257c603c 100644 --- a/src/test/java/com/alibaba/druid/spring/ISequenceService.java +++ b/src/test/java/com/alibaba/druid/spring/ISequenceService.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/spring/IUserDao.java b/src/test/java/com/alibaba/druid/spring/IUserDao.java index 6801fe800c..695d67ea2e 100644 --- a/src/test/java/com/alibaba/druid/spring/IUserDao.java +++ b/src/test/java/com/alibaba/druid/spring/IUserDao.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/spring/IUserService.java b/src/test/java/com/alibaba/druid/spring/IUserService.java index b0a2045839..6f752bad45 100644 --- a/src/test/java/com/alibaba/druid/spring/IUserService.java +++ b/src/test/java/com/alibaba/druid/spring/IUserService.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java b/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java index 5755807559..321fbd841e 100755 --- a/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java +++ b/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/spring/SequenceDao.java b/src/test/java/com/alibaba/druid/spring/SequenceDao.java index bc2e34a6ce..be001060fe 100644 --- a/src/test/java/com/alibaba/druid/spring/SequenceDao.java +++ b/src/test/java/com/alibaba/druid/spring/SequenceDao.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/spring/SequenceService.java b/src/test/java/com/alibaba/druid/spring/SequenceService.java index 269cdddacb..6bdadb8266 100644 --- a/src/test/java/com/alibaba/druid/spring/SequenceService.java +++ b/src/test/java/com/alibaba/druid/spring/SequenceService.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java b/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java index 7ca773f790..36dcd3de80 100644 --- a/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java +++ b/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/spring/User.java b/src/test/java/com/alibaba/druid/spring/User.java index 034539b710..16b1bf5d45 100644 --- a/src/test/java/com/alibaba/druid/spring/User.java +++ b/src/test/java/com/alibaba/druid/spring/User.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/spring/UserDao.java b/src/test/java/com/alibaba/druid/spring/UserDao.java index ca09df7bbd..df6e905d6a 100644 --- a/src/test/java/com/alibaba/druid/spring/UserDao.java +++ b/src/test/java/com/alibaba/druid/spring/UserDao.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/spring/UserService.java b/src/test/java/com/alibaba/druid/spring/UserService.java index 1a3d78f25e..c3f7e4bbbf 100644 --- a/src/test/java/com/alibaba/druid/spring/UserService.java +++ b/src/test/java/com/alibaba/druid/spring/UserService.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/DB2Test.java b/src/test/java/com/alibaba/druid/sql/DB2Test.java index 768b061024..ce5056f0f3 100644 --- a/src/test/java/com/alibaba/druid/sql/DB2Test.java +++ b/src/test/java/com/alibaba/druid/sql/DB2Test.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java b/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java index 572bb7f128..91831351f0 100644 --- a/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java +++ b/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/KeywordsTest.java b/src/test/java/com/alibaba/druid/sql/KeywordsTest.java index 5c7a4f9a06..5dfc01c6e2 100644 --- a/src/test/java/com/alibaba/druid/sql/KeywordsTest.java +++ b/src/test/java/com/alibaba/druid/sql/KeywordsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/MysqlTest.java b/src/test/java/com/alibaba/druid/sql/MysqlTest.java index bb9d166bfd..82fef57faa 100644 --- a/src/test/java/com/alibaba/druid/sql/MysqlTest.java +++ b/src/test/java/com/alibaba/druid/sql/MysqlTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java b/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java index 426264ef1a..98ee868f1e 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java index 32fe676fb3..93a50974b1 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java index 27163a868f..88b4595c09 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/OracleTest.java b/src/test/java/com/alibaba/druid/sql/OracleTest.java index dbcfb3323c..a01d27c58b 100644 --- a/src/test/java/com/alibaba/druid/sql/OracleTest.java +++ b/src/test/java/com/alibaba/druid/sql/OracleTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/PGTest.java b/src/test/java/com/alibaba/druid/sql/PGTest.java index 73c3b138d8..d715e5dba8 100644 --- a/src/test/java/com/alibaba/druid/sql/PGTest.java +++ b/src/test/java/com/alibaba/druid/sql/PGTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java b/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java index dd7e09b3bd..d47ceb6e4e 100644 --- a/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java +++ b/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/TestMigrate.java b/src/test/java/com/alibaba/druid/sql/TestMigrate.java index 76039b8305..43242f8310 100644 --- a/src/test/java/com/alibaba/druid/sql/TestMigrate.java +++ b/src/test/java/com/alibaba/druid/sql/TestMigrate.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java b/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java index 7ec3871ca9..5c20fcbdc9 100644 --- a/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java +++ b/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/TestTransform.java b/src/test/java/com/alibaba/druid/sql/TestTransform.java index ffe096fe4a..66f49e1a53 100644 --- a/src/test/java/com/alibaba/druid/sql/TestTransform.java +++ b/src/test/java/com/alibaba/druid/sql/TestTransform.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java b/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java index d094a3eb37..3e2a73b996 100644 --- a/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java +++ b/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/odps/Issue2102.java b/src/test/java/com/alibaba/druid/sql/odps/Issue2102.java new file mode 100644 index 0000000000..56f0230ab2 --- /dev/null +++ b/src/test/java/com/alibaba/druid/sql/odps/Issue2102.java @@ -0,0 +1,24 @@ +package com.alibaba.druid.sql.odps; + +import com.alibaba.druid.bvt.pool.TestClone; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +public class Issue2102 extends TestCase { + public void test_for_issue() throws Exception { + String sql = "SELECT t1.job_id,t2.lz_id,t1.run_time,t1.submit_time,t1.finish_time,\n" + + " \t\tt2.queue_name,t2.service_level,t2.user_name,\"MAPREDUCE\" as job_type\n" + + " \tFROM \n" + + " \t(SELECT job_id,round((finish_time-submit_time)/1000) as run_time,\n" + + " \t\tfrom_unixtime(round(submit_time/1000),'yyyy-MM-dd HH:mm:ss') as submit_time,\n" + + " \t\tfrom_unixtime(round(finish_time/1000),'yyyy-MM-dd HH:mm:ss') as finish_time,ts FROM ods_base::t_job_mr_hour PARTITION(par_${YYYYMMDDHH})a \n" + + " \t\tWHERE finish_time>submit_time) t1\n" + + " \tJOIN \n" + + " \t(SELECT job_id,split(usp_param,'_')[0] as lz_id,ugi_groupname as queue_name,\n" + + "\t\t servicelevel as service_level,tdw_username as user_name FROM ods_base::t_jobconf_mr_hour PARTITION(par_${YYYYMMDDHH})b)t2 \n" + + " \t ON (t1.job_id = t2.job_id)"; + + SQLUtils.parseStatements(sql, JdbcConstants.HIVE); + } +} diff --git a/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java b/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java index d78b4c973c..93ce3f52e2 100644 --- a/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java +++ b/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java index c43aad1710..daabecdc69 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java index 087b7b87c2..297f6f4810 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java index 4fb02a8673..ecc6fb0b0d 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java index 414c5530ee..c805950cd1 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_casewhen.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_casewhen.java new file mode 100644 index 0000000000..cec44bdc45 --- /dev/null +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_casewhen.java @@ -0,0 +1,44 @@ +/* + * Copyright 1999-2018 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.sql.oracle.demo; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.expr.SQLCaseExpr; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; +import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; + +public class Demo_casewhen extends TestCase { + + public void test_demo_0() throws Exception { + String sql = "select case when a = 20 then b else c end from emp"; + + // parser得到AST + List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + + SQLSelectStatement stmt = (SQLSelectStatement) stmtList.get(0); + + SQLCaseExpr caseExpr = (SQLCaseExpr) stmt.getSelect().getQueryBlock() + .getSelectList().get(0).getExpr(); + System.out.println(caseExpr.getItems()); + } +} diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_getTable.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_getTable.java new file mode 100644 index 0000000000..780e422fd5 --- /dev/null +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_getTable.java @@ -0,0 +1,63 @@ +package com.alibaba.druid.sql.oracle.demo; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.statement.SQLCreateStatement; +import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; + +public class Demo_getTable extends TestCase { + public void test_for_demo() throws Exception { + String sql = " CREATE TABLE \"ZEUS\".\"ACCOUNTS_DEL_20091231\" \n" + + " ( \"ID\" NUMBER NOT NULL ENABLE, \n" + + " \"SITE\" VARCHAR2(96) NOT NULL ENABLE, \n" + + " \"GMT_CREATE\" DATE NOT NULL ENABLE, \n" + + " \"CREATOR\" VARCHAR2(96), \n" + + " \"GMT_MODIFIED\" DATE NOT NULL ENABLE, \n" + + " \"MODIFIER\" VARCHAR2(96), \n" + + " \"IS_DELETED\" CHAR(1), \n" + + " \"CONTRACT_SERIAL\" VARCHAR2(192), \n" + + " \"MEMBER_ID\" VARCHAR2(60), \n" + + " \"CUSTOMER_ID\" NUMBER, \n" + + " \"PRODUCT_ID\" VARCHAR2(48), \n" + + " \"PRODUCT_PIC_NUM\" NUMBER, \n" + + " \"DOMAIN_NAME\" VARCHAR2(96), \n" + + " \"EMAIL\" VARCHAR2(384), \n" + + " \"ALT_EMAIL\" VARCHAR2(384), \n" + + " \"AV_STATUS\" VARCHAR2(48), \n" + + " \"COMPANY_STATUS\" VARCHAR2(48), \n" + + " \"PRODUCT_STATUS\" VARCHAR2(48), \n" + + " \"COLUMN_STATUS\" VARCHAR2(48), \n" + + " \"COL_CONTENT_STATUS\" VARCHAR2(48), \n" + + " \"VOICE_RECORD_STATUS\" VARCHAR2(48), \n" + + " \"CASH_STATUS\" VARCHAR2(48), \n" + + " \"CONFIRM_PRODUCT_NUM\" NUMBER, \n" + + " \"DATUM_IMPORT\" CHAR(1), \n" + + " \"CUSTOMER_CHECK\" CHAR(1), \n" + + " \"AREA_ID_2\" NUMBER, \n" + + " \"OWNER_2\" VARCHAR2(96), \n" + + " \"DISTRIBUTE_DATE\" DATE, \n" + + " \"CUST_CHECK_DATE\" DATE, \n" + + " \"DATUM_IMPORT_DATE\" DATE, \n" + + " \"VALIDATE_DATE\" DATE, \n" + + " \"REMARK_1\" VARCHAR2(4000), \n" + + " \"REMARK_2\" VARCHAR2(768), \n" + + " \"REMARK_3\" VARCHAR2(768), \n" + + " \"PASSWORD\" VARCHAR2(96)\n" + + " ) SEGMENT CREATION IMMEDIATE \n" + + " PCTFREE 10 PCTUSED 40 INITRANS 1 MAXTRANS 255 NOCOMPRESS LOGGING\n" + + " STORAGE(INITIAL 131072 NEXT 131072 MINEXTENTS 1 MAXEXTENTS 2147483645\n" + + " PCTINCREASE 0 FREELISTS 1 FREELIST GROUPS 1 BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)\n" + + " TABLESPACE \"ZEUSDATA\" "; + + List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); + SQLCreateTableStatement stmt = (SQLCreateTableStatement) stmtList.get(0); + SQLName tableName = stmt.getName(); + System.out.println(tableName.toString()); + assertEquals("\"ZEUS\".\"ACCOUNTS_DEL_20091231\"", tableName.toString()); + } +} diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java index e34c8af1d8..a421e41201 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java b/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java index fe876724bb..fc0bbdb412 100644 --- a/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java +++ b/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java b/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java index c03198409e..ccd53087ae 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java b/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java index b9251bec17..9a38e301c1 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java +++ b/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java b/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java index 331b078b40..6b3f88e982 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java b/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java index 3a927936dd..b4c4d16d85 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java +++ b/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java b/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java index d7e806b373..a863e63ac2 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java b/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java index ef73e81eb5..b79351e678 100644 --- a/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java +++ b/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/sql/test/TestUtils.java b/src/test/java/com/alibaba/druid/sql/test/TestUtils.java index 34c14b9005..cf87f7a3d5 100644 --- a/src/test/java/com/alibaba/druid/sql/test/TestUtils.java +++ b/src/test/java/com/alibaba/druid/sql/test/TestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/stat/TestBeidou.java b/src/test/java/com/alibaba/druid/stat/TestBeidou.java index 2dd6aef990..020545cedf 100644 --- a/src/test/java/com/alibaba/druid/stat/TestBeidou.java +++ b/src/test/java/com/alibaba/druid/stat/TestBeidou.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/stat/TestOracle.java b/src/test/java/com/alibaba/druid/stat/TestOracle.java index d4a0913165..0d6014647a 100644 --- a/src/test/java/com/alibaba/druid/stat/TestOracle.java +++ b/src/test/java/com/alibaba/druid/stat/TestOracle.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/test/AlibDriverTest.java b/src/test/java/com/alibaba/druid/test/AlibDriverTest.java new file mode 100644 index 0000000000..43b0166645 --- /dev/null +++ b/src/test/java/com/alibaba/druid/test/AlibDriverTest.java @@ -0,0 +1,22 @@ +package com.alibaba.druid.test; + +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.DriverManager; + +public class AlibDriverTest extends TestCase { + + public void test_for_alib() throws Exception { + String url = "jdbc:mysql://127.0.0.1:8507"; + Connection conn = DriverManager.getConnection(url, "root", "root"); + conn.close(); + } + +// public void test_for_g() throws Exception { +// String url = "jdbc:mysql://100.81.165.195:3306/test"; +// Connection conn = DriverManager.getConnection(url, "test", "test"); +// conn.close(); +// } +} diff --git a/src/test/java/com/alibaba/druid/test/AlibTest.java b/src/test/java/com/alibaba/druid/test/AlibTest.java new file mode 100644 index 0000000000..52781f63f0 --- /dev/null +++ b/src/test/java/com/alibaba/druid/test/AlibTest.java @@ -0,0 +1,29 @@ +package com.alibaba.druid.test; + +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; + +import java.sql.Connection; + +public class AlibTest extends TestCase { + protected DruidDataSource dataSource; + + protected void setUp() throws Exception { + dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:mysql://127.0.0.1:8507"); + dataSource.setUsername("root"); + dataSource.setPassword("root"); + + } + + protected void tearDown() throws Exception { + dataSource.close(); + } + + public void test_for_alib() throws Exception { + Connection conn = dataSource.getConnection(); + conn.close(); + } + + +} diff --git a/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java b/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java index acbe808455..2f15cdba67 100644 --- a/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java +++ b/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/test/ThreadLocalCache.java b/src/test/java/com/alibaba/druid/test/ThreadLocalCache.java new file mode 100644 index 0000000000..972ddc3503 --- /dev/null +++ b/src/test/java/com/alibaba/druid/test/ThreadLocalCache.java @@ -0,0 +1,38 @@ +package com.alibaba.druid.test; + +import java.security.MessageDigest; + +public class ThreadLocalCache { + + public static void main(String[] args) throws Exception { + String str = "\t\n" + + "If I see the codeof getInstance(), it doesn't seem to create new object, rather it calls Security to get the object Object[] objs = Security.getImpl I wrote test case below: MessageDigest messageDigest1 = MessageDigest.getInstance(\"SHA-1\"); MessageDigest messageDigest2 = MessageDigest.getInstance(\"SHA-1\"); // update and digest and saw that both the messageDigest objects are different, as well their inner objects/buffers are also different. So, I guess ThreadLocal should work. And yes, it is a web server with thread pool. I will use ThreadLocal. Thanks, – Anil Padia Jul 10 '13 at 8:58"; + for (int i = 0; i < 5; ++i) { + f(str); // +// f2(str); // 2333 + } + } + + + public static void f(String str) throws Exception { + long start = System.currentTimeMillis(); + for (int i = 0; i < 1000 * 1000; ++i) { + MessageDigest messageDigest = MessageDigest.getInstance("MD5"); + messageDigest.update(str.getBytes()); + messageDigest.digest(); + } + long millis = System.currentTimeMillis() - start; + System.out.println("millis : " + millis); + } + + public static void f2(String str) throws Exception { + MessageDigest messageDigest = MessageDigest.getInstance("MD5"); + long start = System.currentTimeMillis(); + for (int i = 0; i < 1000 * 1000; ++i) { + messageDigest.update(str.getBytes()); + messageDigest.digest(); + } + long millis = System.currentTimeMillis() - start; + System.out.println("f2 millis : " + millis); + } +} diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java b/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java index f41e152540..668003f4cc 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java b/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java index 0f68c329dd..c6fa49f4a6 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java b/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java index c21a50cd6e..0bfa230de9 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java b/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java index 17d583390b..ca13eae3f0 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java b/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java index 6fe182964f..a69119c962 100644 --- a/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java +++ b/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java b/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java index e5bb146e42..e99a656bd4 100644 --- a/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java +++ b/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java b/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java index c7e994dc20..a4865ac433 100644 --- a/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java +++ b/src/test/java/com/alibaba/druid/util/JdbcUtilsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/util/MapComparatorTest.java b/src/test/java/com/alibaba/druid/util/MapComparatorTest.java index c24caa854a..f87d060e1e 100644 --- a/src/test/java/com/alibaba/druid/util/MapComparatorTest.java +++ b/src/test/java/com/alibaba/druid/util/MapComparatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java b/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java index 85391922fa..9b902ba9d1 100644 --- a/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java +++ b/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/resources/License.txt b/src/test/resources/License.txt index ab42329f50..ec1589846e 100644 --- a/src/test/resources/License.txt +++ b/src/test/resources/License.txt @@ -1,5 +1,5 @@ /* - * Copyright 1999-2017 Alibaba Group Holding Ltd. + * Copyright 1999-2018 Alibaba Group Holding Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.