You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2019/11/11 10:11:09 UTC
[incubator-shardingsphere-benchmark] branch master updated: optimize
This is an automated email from the ASF dual-hosted git repository.
zhaoyanan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shardingsphere-benchmark.git
The following commit(s) were added to refs/heads/master by this push:
new 6c3ebb6 optimize
6c3ebb6 is described below
commit 6c3ebb6783baf2024ea0c979cca1394dec4e2b44
Author: nancyzrh <zh...@126.com>
AuthorDate: Mon Nov 11 18:10:39 2019 +0800
optimize
---
.../{SJDataSourceOp.java => SJDataSourceFactory.java} | 0
.../{SJDataSourceOp.java => SJDataSourceFactory.java} | 2 +-
.../lastversion/sjmasterslave/SJMasterSlaveDelete.java | 17 +++--------------
.../lastversion/sjmasterslave/SJMasterSlaveInsert.java | 17 +++--------------
.../lastversion/sjmasterslave/SJMasterSlaveSelect.java | 17 +++--------------
.../lastversion/sjmasterslave/SJMasterSlaveUpdate.java | 18 +++---------------
.../perf/lastversion/sjsharding/SJShardingDelete.java | 18 +++---------------
.../perf/lastversion/sjsharding/SJShardingInsert.java | 18 +++---------------
.../perf/lastversion/sjsharding/SJShardingSelect.java | 18 +++---------------
.../perf/lastversion/sjsharding/SJShardingUpdate.java | 18 +++---------------
.../shardingjdbc/perf/sjencrypt/SJEncryptDelete.java | 18 +++---------------
.../shardingjdbc/perf/sjencrypt/SJEncryptInsert.java | 18 +++---------------
.../shardingjdbc/perf/sjencrypt/SJEncryptSelect.java | 18 +++---------------
.../shardingjdbc/perf/sjencrypt/SJEncryptUpdate.java | 18 +++---------------
.../perf/sjmasterslave/SJMasterSlaveDelete.java | 18 +++---------------
.../perf/sjmasterslave/SJMasterSlaveInsert.java | 18 +++---------------
.../perf/sjmasterslave/SJMasterSlaveSelect.java | 18 +++---------------
.../perf/sjmasterslave/SJMasterSlaveUpdate.java | 17 +++--------------
.../shardingjdbc/perf/sjsharding/SJShardingDelete.java | 18 +++---------------
.../shardingjdbc/perf/sjsharding/SJShardingInsert.java | 18 +++---------------
.../shardingjdbc/perf/sjsharding/SJShardingSelect.java | 18 +++---------------
.../shardingjdbc/perf/sjsharding/SJShardingUpdate.java | 17 +++--------------
22 files changed, 61 insertions(+), 296 deletions(-)
diff --git a/shardingsphere-benchmark/src/main/java/service/util/config/SJDataSourceOp.java b/shardingsphere-benchmark/src/main/java/service/util/config/SJDataSourceFactory.java
similarity index 100%
rename from shardingsphere-benchmark/src/main/java/service/util/config/SJDataSourceOp.java
rename to shardingsphere-benchmark/src/main/java/service/util/config/SJDataSourceFactory.java
diff --git a/shardingsphere-benchmark/src/main/java/service/util/config/lastversion/SJDataSourceOp.java b/shardingsphere-benchmark/src/main/java/service/util/config/lastversion/SJDataSourceFactory.java
similarity index 99%
rename from shardingsphere-benchmark/src/main/java/service/util/config/lastversion/SJDataSourceOp.java
rename to shardingsphere-benchmark/src/main/java/service/util/config/lastversion/SJDataSourceFactory.java
index 7e17c54..d33c4bd 100644
--- a/shardingsphere-benchmark/src/main/java/service/util/config/lastversion/SJDataSourceOp.java
+++ b/shardingsphere-benchmark/src/main/java/service/util/config/lastversion/SJDataSourceFactory.java
@@ -40,7 +40,7 @@ import java.util.concurrent.ConcurrentHashMap;
* create datasource for sharding jdbc version 3.1.0.
* @author nancyzrh
*/
-public class SJDataSourceOp {
+public class SJDataSourceFactory {
/**
* create sharding datasource.
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveDelete.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveDelete.java
index 8eda740..66155f1 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveDelete.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveDelete.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.lastversion.SJDataSourceOp;
+import service.util.config.lastversion.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,25 +34,15 @@ import java.sql.SQLException;
public class SJMasterSlaveDelete extends AbstractJavaSamplerClient {
private static final String DELETE_SQL_MASTER_SLAVE = ShardingPerfStmt.DELETE_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createMSDataSource());
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
- /**
- * setup prepare.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
/**
* run test.
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveInsert.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveInsert.java
index cad820b..e686044 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveInsert.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveInsert.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.lastversion.SJDataSourceOp;
+import service.util.config.lastversion.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,25 +34,15 @@ import java.sql.SQLException;
public class SJMasterSlaveInsert extends AbstractJavaSamplerClient {
private static final String INSERT_SQL_MASTER_SLAVE = ShardingPerfStmt.INSERT_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createMSDataSource());
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
- /**
- * prepare for setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
/**
* run test.
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveSelect.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveSelect.java
index 5a3f179..fc44130 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveSelect.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveSelect.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.lastversion.SJDataSourceOp;
+import service.util.config.lastversion.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,25 +34,15 @@ import java.sql.SQLException;
public class SJMasterSlaveSelect extends AbstractJavaSamplerClient {
private static final String SELECT_SQL_MASTER_SLAVE = ShardingPerfStmt.SELECT_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createMSDataSource());
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
- /**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
/**
* run test.
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveUpdate.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveUpdate.java
index 6781dcc..6bdc2db 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveUpdate.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjmasterslave/SJMasterSlaveUpdate.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.lastversion.SJDataSourceOp;
+import service.util.config.lastversion.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJMasterSlaveUpdate extends AbstractJavaSamplerClient {
private static final String UPDATE_SQL_MASTER_SLAVE = ShardingPerfStmt.UPDATE_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createMSDataSource());
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare for setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingDelete.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingDelete.java
index 3cd5790..5ee8705 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingDelete.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingDelete.java
@@ -21,9 +21,8 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
import service.util.config.SJDataSourceUtil;
-import service.util.config.lastversion.SJDataSourceOp;
+import service.util.config.lastversion.SJDataSourceFactory;
import javax.sql.DataSource;
import java.sql.SQLException;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJShardingDelete extends AbstractJavaSamplerClient {
private static final String DELETE_SHARDING_STMT = ShardingPerfStmt.DELETE_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createMSDataSource());
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare for setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingInsert.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingInsert.java
index 6f9c0a8..023795d 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingInsert.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingInsert.java
@@ -21,9 +21,8 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
import service.util.config.SJDataSourceUtil;
-import service.util.config.lastversion.SJDataSourceOp;
+import service.util.config.lastversion.SJDataSourceFactory;
import javax.sql.DataSource;
import java.sql.SQLException;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJShardingInsert extends AbstractJavaSamplerClient {
private static final String INSERT_SHARDING_STMT = ShardingPerfStmt.INSERT_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createMSDataSource());
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare for setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingSelect.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingSelect.java
index 9c3ed97..58d437d 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingSelect.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingSelect.java
@@ -21,9 +21,8 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
import service.util.config.SJDataSourceUtil;
-import service.util.config.lastversion.SJDataSourceOp;
+import service.util.config.lastversion.SJDataSourceFactory;
import javax.sql.DataSource;
import java.sql.SQLException;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJShardingSelect extends AbstractJavaSamplerClient {
private static final String INSERT_STMT = ShardingPerfStmt.INSERT_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createMSDataSource());
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingUpdate.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingUpdate.java
index fa5be25..96ec0fd 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingUpdate.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/lastversion/sjsharding/SJShardingUpdate.java
@@ -21,9 +21,8 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
import service.util.config.SJDataSourceUtil;
-import service.util.config.lastversion.SJDataSourceOp;
+import service.util.config.lastversion.SJDataSourceFactory;
import javax.sql.DataSource;
import java.sql.SQLException;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJShardingUpdate extends AbstractJavaSamplerClient {
private static final String UPDATE_STMT = ShardingPerfStmt.UPDATE_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createMSDataSource());
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptDelete.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptDelete.java
index 04c89a2..566cb68 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptDelete.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptDelete.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJEncryptDelete extends AbstractJavaSamplerClient {
private static final String DELETE_ENC_STMT = ShardingPerfStmt.DELETE_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptInsert.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptInsert.java
index 642db00..8f7f2d1 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptInsert.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptInsert.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -34,27 +33,16 @@ import java.sql.SQLException;
public class SJEncryptInsert extends AbstractJavaSamplerClient {
private static final String INSERT_ENC_STMT = ShardingPerfStmt.INSERT_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptSelect.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptSelect.java
index 8bed9cc..a4590ad 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptSelect.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptSelect.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJEncryptSelect extends AbstractJavaSamplerClient {
private static final String SELECT_ENC_STMT = ShardingPerfStmt.SELECT_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptUpdate.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptUpdate.java
index 72a9948..21c18a6 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptUpdate.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptUpdate.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJEncryptUpdate extends AbstractJavaSamplerClient {
private static final String UPDATE_ENC_STMT = ShardingPerfStmt.UPDATE_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveDelete.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveDelete.java
index 82d8b4a..c6ea2f7 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveDelete.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveDelete.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJMasterSlaveDelete extends AbstractJavaSamplerClient {
private static final String DELETE_SQL_MASTER_SLAVE = ShardingPerfStmt.DELETE_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveInsert.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveInsert.java
index ccab756..eeff4a1 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveInsert.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveInsert.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJMasterSlaveInsert extends AbstractJavaSamplerClient {
private static final String INSERT_SQL_MASTER_SLAVE = ShardingPerfStmt.INSERT_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveSelect.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveSelect.java
index 9b3248a..6d9951e 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveSelect.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveSelect.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJMasterSlaveSelect extends AbstractJavaSamplerClient {
private static final String SELECT_SQL_MASTER_SLAVE = ShardingPerfStmt.SELECT_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext
* @return
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveUpdate.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveUpdate.java
index df94e44..5515861 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveUpdate.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveUpdate.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,25 +34,15 @@ import java.sql.SQLException;
public class SJMasterSlaveUpdate extends AbstractJavaSamplerClient {
private static final String UPDATE_SQL_MASTER_SLAVE = ShardingPerfStmt.UPDATE_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
- /**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
/**
* run test.
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingDelete.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingDelete.java
index bb176ad..ce9aa44 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingDelete.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingDelete.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJShardingDelete extends AbstractJavaSamplerClient {
private static final String DELETE_SHARDING = ShardingPerfStmt.DELETE_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingInsert.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingInsert.java
index 45882a0..3afb6e6 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingInsert.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingInsert.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJShardingInsert extends AbstractJavaSamplerClient {
private static final String INSERT_SHARDING = ShardingPerfStmt.INSERT_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingSelect.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingSelect.java
index 20ca166..7202b1c 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingSelect.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingSelect.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,27 +34,16 @@ import java.sql.SQLException;
public class SJShardingSelect extends AbstractJavaSamplerClient {
private static final String SELECT_SHARDING = ShardingPerfStmt.SELECT_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
/**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
-
- /**
* run test.
* @param javaSamplerContext context
* @return res
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingUpdate.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingUpdate.java
index ceb265d..6b50652 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingUpdate.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingUpdate.java
@@ -21,8 +21,7 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import perfstmt.ShardingPerfStmt;
-import service.api.service.SJPerfService;
-import service.util.config.SJDataSourceOp;
+import service.util.config.SJDataSourceFactory;
import service.util.config.SJDataSourceUtil;
import javax.sql.DataSource;
@@ -35,25 +34,15 @@ import java.sql.SQLException;
public class SJShardingUpdate extends AbstractJavaSamplerClient {
private static final String UPDATE_SHARDING = ShardingPerfStmt.UPDATE_STMT.getValue();
- private static SJPerfService sjPerfService;
-
- private DataSource dataSource;
+ private static DataSource dataSource;
static {
try {
- sjPerfService = new SJPerfService(SJDataSourceOp.createEncryptDataSource());
+ dataSource = SJDataSourceFactory.createEncryptDataSource();
} catch (final SQLException ignore) {
}
}
- /**
- * prepare setup.
- * @param context context
- */
- @Override
- public void setupTest(JavaSamplerContext context) {
- dataSource = sjPerfService.getDataSource();
- }
/**
* run test.