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/12/10 07:40:50 UTC
[incubator-shardingsphere-benchmark] branch master updated: refactor
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 f2c9965 refactor
f2c9965 is described below
commit f2c99651aaec3c8a1ad7d954afbe4c38724710ce
Author: nancyzrh <zh...@126.com>
AuthorDate: Tue Dec 10 15:40:32 2019 +0800
refactor
---
.../service/util/config/SJDataSourceFactory.java | 174 ++++++++-------------
.../SJMasterSlaveDelete.java | 4 +-
.../SJMasterSlaveInsert.java | 4 +-
.../SJMasterSlaveSelect.java | 4 +-
.../SJMasterSlaveUpdate.java | 4 +-
.../SJMsEncryptShardingDelete.java} | 6 +-
.../SJMsEncryptShardingInsert.java} | 6 +-
.../SJMsEncryptShardingSelect.java} | 6 +-
.../SJMsEncryptShardingUpdate.java} | 6 +-
.../{sjsharding => sharding}/SJShardingDelete.java | 4 +-
.../{sjsharding => sharding}/SJShardingInsert.java | 4 +-
.../{sjsharding => sharding}/SJShardingSelect.java | 4 +-
.../{sjsharding => sharding}/SJShardingUpdate.java | 4 +-
13 files changed, 92 insertions(+), 138 deletions(-)
diff --git a/shardingsphere-benchmark/src/main/java/service/util/config/SJDataSourceFactory.java b/shardingsphere-benchmark/src/main/java/service/util/config/SJDataSourceFactory.java
index 716070d..378b3bf 100644
--- a/shardingsphere-benchmark/src/main/java/service/util/config/SJDataSourceFactory.java
+++ b/shardingsphere-benchmark/src/main/java/service/util/config/SJDataSourceFactory.java
@@ -22,6 +22,7 @@ import org.apache.shardingsphere.api.config.encrypt.EncryptColumnRuleConfigurati
import org.apache.shardingsphere.api.config.encrypt.EncryptRuleConfiguration;
import org.apache.shardingsphere.api.config.encrypt.EncryptTableRuleConfiguration;
import org.apache.shardingsphere.api.config.encrypt.EncryptorRuleConfiguration;
+import org.apache.shardingsphere.api.config.masterslave.LoadBalanceStrategyConfiguration;
import org.apache.shardingsphere.api.config.masterslave.MasterSlaveRuleConfiguration;
import org.apache.shardingsphere.api.config.sharding.KeyGeneratorConfiguration;
import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
@@ -34,12 +35,7 @@ import org.apache.shardingsphere.shardingjdbc.api.ShardingDataSourceFactory;
import javax.sql.DataSource;
import java.sql.SQLException;
-import java.util.Map;
-import java.util.List;
-import java.util.Properties;
-import java.util.HashMap;
-import java.util.Collections;
-import java.util.Arrays;
+import java.util.*;
/**
* create datasource operation for sharding jdbc.
@@ -57,78 +53,12 @@ public class SJDataSourceFactory {
dataSourceMap.put("ds_master", SJDataSourceUtil.createDataSource("###", "sharding_db", "####", 3306, "####"));
dataSourceMap.put("ds_slave0", SJDataSourceUtil.createDataSource("###", "sharding_db", "####", 3306, "####"));
MasterSlaveRuleConfiguration masterSlaveRuleConfig = new MasterSlaveRuleConfiguration("ds_master_slave", "ds_master", Arrays.asList("ds_slave0"));
- DataSource dataSource = MasterSlaveDataSourceFactory.createDataSource(dataSourceMap, masterSlaveRuleConfig, new Properties());
+ Properties properties = new Properties();
+ properties.setProperty("max.connections.size.per.query", "200");
+ properties.setProperty("executor.size", "200");
+ DataSource dataSource = MasterSlaveDataSourceFactory.createDataSource(dataSourceMap, masterSlaveRuleConfig, properties);
return dataSource;
}
-
- /**
- * create encrypt datasource.
- * @return encrypt data source
- * @throws SQLException ex
- */
- public static DataSource createEncryptDataSource() throws SQLException {
- Properties props = new Properties();
- props.setProperty("aes.key.value", "123456abc");
- EncryptorRuleConfiguration encryptorConfig = new EncryptorRuleConfiguration("AES", props);
- EncryptColumnRuleConfiguration columnConfig = new EncryptColumnRuleConfiguration("", "c", "", "aes");
- EncryptTableRuleConfiguration tableConfig = new EncryptTableRuleConfiguration(Collections.singletonMap("c", columnConfig));
- EncryptRuleConfiguration encryptRuleConfig = new EncryptRuleConfiguration();
- encryptRuleConfig.getEncryptors().put("aes", encryptorConfig);
- encryptRuleConfig.getTables().put("ssperf", tableConfig);
- DataSource dataSource = SJDataSourceUtil.createDataSource("###", "sharding_db", "####", 3306, "####");
- DataSource encryptDatasource = EncryptDataSourceFactory.createDataSource(dataSource, encryptRuleConfig, new Properties());
- return encryptDatasource;
- }
-
- /**
- * create ms sharding datasource.
- * @return datasource
- * @throws SQLException ex
- */
- public static DataSource createMSShardingDataSource() throws SQLException {
- ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
- TableRuleConfiguration tableRuleConfiguration = new TableRuleConfiguration("ssperf", "ms_ds_${0..1}.ssperf${0..1023}");
- shardingRuleConfig.getTableRuleConfigs().add(tableRuleConfiguration);
- shardingRuleConfig.getBindingTableGroups().add("ssperf");
- shardingRuleConfig.setDefaultKeyGeneratorConfig(getKeyGeneratorConfiguration());
- shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(new InlineShardingStrategyConfiguration("id", "ms_ds_${id % 2}"));
- shardingRuleConfig.setDefaultTableShardingStrategyConfig(new InlineShardingStrategyConfiguration("k", "ssperf${k % 1024}"));
- shardingRuleConfig.setMasterSlaveRuleConfigs(getMasterSlaveRuleConfigurations());
- return ShardingDataSourceFactory.createDataSource(createMSsharingDataSourceMap(), shardingRuleConfig, new Properties());
- }
-
- /**
- * get table rule config for master slave.
- * @return res
- */
- private static TableRuleConfiguration getMSTableRuleConfiguration() {
- TableRuleConfiguration result = new TableRuleConfiguration("ssperf", "ms_ds_${0..1}.ssperf${0..1023}");
- result.setKeyGeneratorConfig(getKeyGeneratorConfiguration());
- return result;
- }
-
- /**
- * get master slave rule config.
- * @return res
- */
- private static List<MasterSlaveRuleConfiguration> getMasterSlaveRuleConfigurations() {
- MasterSlaveRuleConfiguration masterSlaveRuleConfig1 = new MasterSlaveRuleConfiguration("ms_ds_0", "ds_0", Arrays.asList("ds_0_slave_0"));
- MasterSlaveRuleConfiguration masterSlaveRuleConfig2 = new MasterSlaveRuleConfiguration("ms_ds_1", "ds_1", Arrays.asList("ds_1_slave_0"));
- return Lists.newArrayList(masterSlaveRuleConfig1, masterSlaveRuleConfig2);
- }
-
- /**
- * create master slave datasource map.
- * @return datasource map
- */
- private static Map<String, DataSource> createMSsharingDataSourceMap() {
- final Map<String, DataSource> result = new HashMap<>();
- result.put("ds_0", SJDataSourceUtil.createDataSource("###", "sharding_db", "####", 3306, "####"));
- result.put("ds_0_slave_0", SJDataSourceUtil.createDataSource("###", "sharding_db", "####", 3306, "####"));
- result.put("ds_1", SJDataSourceUtil.createDataSource("###", "sharding_db", "####", 3306, "####"));
- result.put("ds_1_slave_0", SJDataSourceUtil.createDataSource("###", "sharding_db", "####", 3306, "####"));
- return result;
- }
/**
* create sharding datasource.
@@ -142,7 +72,10 @@ public class SJDataSourceFactory {
tableRuleConfig.setKeyGeneratorConfig(getKeyGeneratorConfiguration());
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTableRuleConfigs().add(tableRuleConfig);
- return ShardingDataSourceFactory.createDataSource(createShardingDataSourceMap(), shardingRuleConfig, new Properties());
+ Properties properties = new Properties();
+ properties.setProperty("max.connections.size.per.query", "200");
+ properties.setProperty("executor.size", "200");
+ return ShardingDataSourceFactory.createDataSource(createShardingDataSourceMap(), shardingRuleConfig, properties);
}
/**
@@ -159,60 +92,81 @@ public class SJDataSourceFactory {
}
/**
- * create encrypt sharding datasource.
- * @return encrypt datasource
- * @throws SQLException ex
+ * create datasource for master slave & encrypt & sharding scene
+ * @return datasource
+ * @throws SQLException sqlexception
*/
- public static DataSource createEncryptShardingDataSource() throws SQLException {
+ public static DataSource createMSEncShardingDataSource() throws SQLException {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
- shardingRuleConfig.getTableRuleConfigs().add(getTableRuleConfiguration());
- shardingRuleConfig.getBindingTableGroups().add("ssperf");
- shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(new InlineShardingStrategyConfiguration("id", "ds_${id % 2}"));
- shardingRuleConfig.setDefaultTableShardingStrategyConfig(new InlineShardingStrategyConfiguration("k", "ssperf${k % 1024}"));
- shardingRuleConfig.setEncryptRuleConfig(getEncryptRuleConfiguration());
- return ShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, new Properties());
+ TableRuleConfiguration tableRuleConfiguration = new TableRuleConfiguration("test", "ms_ds_${0..3}.test${0..1023}");
+ tableRuleConfiguration.setKeyGeneratorConfig(getKeyGeneratorConfiguration());
+ shardingRuleConfig.getTableRuleConfigs().add(tableRuleConfiguration);
+ shardingRuleConfig.getBindingTableGroups().add("test");
+ shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(new InlineShardingStrategyConfiguration("id", "ms_ds_${id % 2}"));
+ shardingRuleConfig.setDefaultTableShardingStrategyConfig(new InlineShardingStrategyConfiguration("k", "test${k % 1024}"));
+ shardingRuleConfig.setMasterSlaveRuleConfigs(getMSEncRuleConfigurations());
+ shardingRuleConfig.setEncryptRuleConfig(getMsEncRuleConfiguration());
+ Properties properties = new Properties();
+ properties.setProperty("max.connections.size.per.query", "200");
+ properties.setProperty("executor.size", "200");
+ return ShardingDataSourceFactory.createDataSource(createMSEncDataSourceMap(), shardingRuleConfig, properties);
}
/**
- * get table rule config.
- * @return table rule res
+ * get master slave configurations for master slave & encrypt & sharding
+ * @return master slave rule configuration
*/
- private static TableRuleConfiguration getTableRuleConfiguration() {
- TableRuleConfiguration result = new TableRuleConfiguration("ssperf", "ds_${0..1}.ssperf${0..1023}");
- result.setKeyGeneratorConfig(getKeyGeneratorConfiguration());
+ private static List<MasterSlaveRuleConfiguration> getMSEncRuleConfigurations() {
+ LoadBalanceStrategyConfiguration loadBalanceStrategyConfiguration= new LoadBalanceStrategyConfiguration("ROUND_ROBIN");
+ MasterSlaveRuleConfiguration masterSlaveRuleConfig1 = new MasterSlaveRuleConfiguration("ms_ds_0", "master_0", Arrays.asList("master_0_slave_0"),loadBalanceStrategyConfiguration);
+ MasterSlaveRuleConfiguration masterSlaveRuleConfig2 = new MasterSlaveRuleConfiguration("ms_ds_1", "master_1", Arrays.asList("master_1_slave_1"),loadBalanceStrategyConfiguration);
+ MasterSlaveRuleConfiguration masterSlaveRuleConfig3 = new MasterSlaveRuleConfiguration("ms_ds_2", "master_2", Arrays.asList("master_2_slave_2"),loadBalanceStrategyConfiguration);
+ MasterSlaveRuleConfiguration masterSlaveRuleConfig4 = new MasterSlaveRuleConfiguration("ms_ds_3", "master_3", Arrays.asList("master_3_slave_3"),loadBalanceStrategyConfiguration);
+ return Lists.newArrayList(masterSlaveRuleConfig1, masterSlaveRuleConfig2, masterSlaveRuleConfig3, masterSlaveRuleConfig4);
+ }
+
+ /**
+ * create datasourceMap for master slave & encrypt & sharding
+ * @return datasource map
+ */
+ private static Map<String, DataSource> createMSEncDataSourceMap() {
+ final Map<String, DataSource> result = new HashMap<>();
+ result.put("master_0", SJDataSourceUtil.createDataSource("###","sharding_db","####",3306,""));
+ result.put("master_0_slave_0", SJDataSourceUtil.createDataSource("###","sharding_db","####",3306,""));
+ result.put("master_1",SJDataSourceUtil.createDataSource("###","sharding_db","####",3306,""));
+ result.put("master_1_slave_1", SJDataSourceUtil.createDataSource("###","sharding_db","####",3306,""));
+ result.put("master_2", SJDataSourceUtil.createDataSource("###","sharding_db","####",3306,""));
+ result.put("master_2_slave_2", SJDataSourceUtil.createDataSource("###","sharding_db","####",3306,""));
+ result.put("master_3",SJDataSourceUtil.createDataSource("###","sharding_db","####",3306,""));
+ result.put("master_3_slave_3", SJDataSourceUtil.createDataSource("###","sharding_db","####",3306,""));
return result;
}
/**
- * get encrypt rule config.
- * @return res
+ * get encrypt configuration for master slave & encrypt & sharding
+ * @return encryptRuleConfiguration
*/
- private static EncryptRuleConfiguration getEncryptRuleConfiguration() {
+ private static EncryptRuleConfiguration getMsEncRuleConfiguration() {
Properties props = new Properties();
props.setProperty("aes.key.value", "123456abc");
+ Map<String, EncryptColumnRuleConfiguration> columns = new LinkedHashMap<>();
EncryptorRuleConfiguration encryptorConfig = new EncryptorRuleConfiguration("AES", props);
- EncryptColumnRuleConfiguration columnConfig = new EncryptColumnRuleConfiguration("", "c", "", "aes");
- EncryptTableRuleConfiguration tableConfig = new EncryptTableRuleConfiguration(Collections.singletonMap("c", columnConfig));
+ EncryptColumnRuleConfiguration columnConfig = new EncryptColumnRuleConfiguration("c_plain", "c", "", "aes");
+ columns.put("c",columnConfig);
+ EncryptorRuleConfiguration encryptorConfigMd5 = new EncryptorRuleConfiguration("md5",new Properties());
+ EncryptColumnRuleConfiguration columnConfigMd5 = new EncryptColumnRuleConfiguration("", "pad", "", "md5");
+ columns.put("pad",columnConfigMd5);
+ EncryptTableRuleConfiguration tableConfig = new EncryptTableRuleConfiguration(columns);
EncryptRuleConfiguration encryptRuleConfig = new EncryptRuleConfiguration();
encryptRuleConfig.getEncryptors().put("aes", encryptorConfig);
- encryptRuleConfig.getTables().put("ssperf", tableConfig);
+ encryptRuleConfig.getEncryptors().put("md5", encryptorConfigMd5);
+ encryptRuleConfig.getTables().put("test", tableConfig);
return encryptRuleConfig;
}
/**
- * create datasource map.
- * @return res
- */
- private static Map<String, DataSource> createDataSourceMap() {
- Map<String, DataSource> result = new HashMap<>();
- result.put("ds_0", SJDataSourceUtil.createDataSource("###", "sharding_db", "####", 3306, "####"));
- result.put("ds_1", SJDataSourceUtil.createDataSource("###", "sharding_db", "####", 3306, "####"));
- return result;
- }
-
- /**
* get key generator config.
- * @return res
+ * @return keyGeneratorConfiguration
*/
private static KeyGeneratorConfiguration getKeyGeneratorConfiguration() {
return new KeyGeneratorConfiguration("SNOWFLAKE", "id", new Properties());
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveDelete.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveDelete.java
similarity index 95%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveDelete.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveDelete.java
index c6ea2f7..1dc87c4 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveDelete.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveDelete.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjmasterslave;
+package shardingjdbc.perf.masterslave;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -38,7 +38,7 @@ public class SJMasterSlaveDelete extends AbstractJavaSamplerClient {
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveInsert.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveInsert.java
similarity index 95%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveInsert.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveInsert.java
index eeff4a1..586ad2d 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveInsert.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveInsert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjmasterslave;
+package shardingjdbc.perf.masterslave;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -38,7 +38,7 @@ public class SJMasterSlaveInsert extends AbstractJavaSamplerClient {
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveSelect.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveSelect.java
similarity index 95%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveSelect.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveSelect.java
index 6d9951e..2d1d1d5 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveSelect.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveSelect.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjmasterslave;
+package shardingjdbc.perf.masterslave;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -38,7 +38,7 @@ public class SJMasterSlaveSelect extends AbstractJavaSamplerClient {
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveUpdate.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveUpdate.java
similarity index 95%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveUpdate.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveUpdate.java
index 5515861..d3b03f3 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjmasterslave/SJMasterSlaveUpdate.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/masterslave/SJMasterSlaveUpdate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjmasterslave;
+package shardingjdbc.perf.masterslave;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -38,7 +38,7 @@ public class SJMasterSlaveUpdate extends AbstractJavaSamplerClient {
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createMSDataSource();
} catch (final SQLException ignore) {
}
}
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptDelete.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingDelete.java
similarity index 91%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptDelete.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingDelete.java
index 566cb68..87a2eb9 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptDelete.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingDelete.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjencrypt;
+package shardingjdbc.perf.msencryptsharding;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -31,14 +31,14 @@ import java.sql.SQLException;
* for shardingjdbc encrypt delete performance with ss dev branch.
* @author nancyzrh
*/
-public class SJEncryptDelete extends AbstractJavaSamplerClient {
+public class SJMsEncryptShardingDelete extends AbstractJavaSamplerClient {
private static final String DELETE_ENC_STMT = ShardingPerfStmt.DELETE_STMT.getValue();
private static DataSource dataSource;
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createMSEncShardingDataSource();
} catch (final SQLException ignore) {
}
}
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptInsert.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingInsert.java
similarity index 91%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptInsert.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingInsert.java
index 8f7f2d1..d2013fb 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptInsert.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingInsert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjencrypt;
+package shardingjdbc.perf.msencryptsharding;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -30,14 +30,14 @@ import java.sql.SQLException;
/**
* for shardingjdbc encrypt insert performance with ss dev branch.
*/
-public class SJEncryptInsert extends AbstractJavaSamplerClient {
+public class SJMsEncryptShardingInsert extends AbstractJavaSamplerClient {
private static final String INSERT_ENC_STMT = ShardingPerfStmt.INSERT_STMT.getValue();
private static DataSource dataSource;
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createMSEncShardingDataSource();
} catch (final SQLException ignore) {
}
}
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptSelect.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingSelect.java
similarity index 91%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptSelect.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingSelect.java
index a4590ad..6b0f7c8 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptSelect.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingSelect.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjencrypt;
+package shardingjdbc.perf.msencryptsharding;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -31,14 +31,14 @@ import java.sql.SQLException;
* for shardingjdbc encrypt select performance with ss dev branch.
* @author nancyzrh
*/
-public class SJEncryptSelect extends AbstractJavaSamplerClient {
+public class SJMsEncryptShardingSelect extends AbstractJavaSamplerClient {
private static final String SELECT_ENC_STMT = ShardingPerfStmt.SELECT_STMT.getValue();
private static DataSource dataSource;
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createMSEncShardingDataSource();
} catch (final SQLException ignore) {
}
}
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptUpdate.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingUpdate.java
similarity index 91%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptUpdate.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingUpdate.java
index 21c18a6..516a4e9 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjencrypt/SJEncryptUpdate.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/msencryptsharding/SJMsEncryptShardingUpdate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjencrypt;
+package shardingjdbc.perf.msencryptsharding;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -31,14 +31,14 @@ import java.sql.SQLException;
* for shardingjdbc encrypt update performance with ss dev branch.
* @author nancyzrh
*/
-public class SJEncryptUpdate extends AbstractJavaSamplerClient {
+public class SJMsEncryptShardingUpdate extends AbstractJavaSamplerClient {
private static final String UPDATE_ENC_STMT = ShardingPerfStmt.UPDATE_STMT.getValue();
private static DataSource dataSource;
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createMSEncShardingDataSource();
} catch (final SQLException ignore) {
}
}
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingDelete.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingDelete.java
similarity index 95%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingDelete.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingDelete.java
index ce9aa44..8a4f0fc 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingDelete.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingDelete.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjsharding;
+package shardingjdbc.perf.sharding;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -38,7 +38,7 @@ public class SJShardingDelete extends AbstractJavaSamplerClient {
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createShardingDataSource();
} catch (final SQLException ignore) {
}
}
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingInsert.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingInsert.java
similarity index 95%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingInsert.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingInsert.java
index 3afb6e6..a3fbe3a 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingInsert.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingInsert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjsharding;
+package shardingjdbc.perf.sharding;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -38,7 +38,7 @@ public class SJShardingInsert extends AbstractJavaSamplerClient {
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createShardingDataSource();
} catch (final SQLException ignore) {
}
}
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingSelect.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingSelect.java
similarity index 95%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingSelect.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingSelect.java
index 7202b1c..8a96bec 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingSelect.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingSelect.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjsharding;
+package shardingjdbc.perf.sharding;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -38,7 +38,7 @@ public class SJShardingSelect extends AbstractJavaSamplerClient {
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createShardingDataSource();
} catch (final SQLException ignore) {
}
}
diff --git a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingUpdate.java b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingUpdate.java
similarity index 95%
rename from shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingUpdate.java
rename to shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingUpdate.java
index 6b50652..caf643e 100644
--- a/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sjsharding/SJShardingUpdate.java
+++ b/shardingsphere-benchmark/src/main/java/shardingjdbc/perf/sharding/SJShardingUpdate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package shardingjdbc.perf.sjsharding;
+package shardingjdbc.perf.sharding;
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
@@ -38,7 +38,7 @@ public class SJShardingUpdate extends AbstractJavaSamplerClient {
static {
try {
- dataSource = SJDataSourceFactory.createEncryptDataSource();
+ dataSource = SJDataSourceFactory.createShardingDataSource();
} catch (final SQLException ignore) {
}
}