[shardingsphere-benchmark] branch master updated (4552c08 -> 3300811)

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

panjuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-benchmark.git.


    from 4552c08  Merge pull request #61 from wcsoft/master
     new 608f4f2  keep laster excel result with 3 sheets
     new 687814b  update datasource name
     new 3300811  Merge pull request #63 from wcsoft/master

The 580 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 shardingsphere-benchmark/.gitignore                |   1 -
 shardingsphere-benchmark/pom.xml                   |  41 ++--
 .../common/file/excel/BenchmarkExcelWriter.java    |  37 ++++
 .../benchmark/db/jdbc/JDBCDataSourceUtil.java      |   1 +
 .../common/config/JMeterConfigBenchmark.java       |  18 +-
 .../sharding/JMeterJDBCCommonShardingClear.java    |  18 ++
 .../JMeterShardigSphereBenchmarkStatistic.java     |   2 +
 .../main/resources/config/user-config.properties   |   6 +-
 .../encrypt/fullrouting_encrypt_deploy.sh          |   8 +-
 .../masterslave/fullrouting_masterslave_deploy.sh  |   8 +-
 .../sharding/fullrouting_sharding_deploy.sh        |   8 +-
 ...ullrouting_shardingmasterslaveencrypt_deploy.sh |   8 +-
 .../fullrouting_smallshards_sharding_deploy.sh     |   8 +-
 ...mallshards_shardingmasterslaveencrypt_deploy.sh |   8 +-
 .../encrypt/rangerouting_encrypt_deploy.sh         |   8 +-
 .../masterslave/rangerouting_masterslave_deploy.sh |   8 +-
 .../sharding/rangerouting_sharding_deploy.sh       |   8 +-
 ...ngerouting_shardingmasterslaveencrypt_deploy.sh |   8 +-
 .../deploy/shardingproxy/shardingproxy_deploy.sh   |   4 +-
 .../encrypt/singlerouting_encrypt_deploy.sh        |   8 +-
 .../singlerouting_masterslave_deploy.sh            |   8 +-
 .../sharding/singlerouting_sharding_deploy.sh      |   8 +-
 ...glerouting_shardingmasterslaveencrypt_deploy.sh |   8 +-
 ...ing_shardingmasterslaveencrypt_deploy_config.sh |   8 +-
 .../update_benchmark_basedata_amount.sh            |   3 +-
 .../update_benchmark_sharding_dbtable_count.sh     |   1 +
 .../resources/shell/prepare/benchmark_update.sh    |   4 +-
 ...uting-smallshards-sharding-masterslave-enc.yaml |  18 +-
 ...g-smallshards-sharding-masterslave-encrypt.yaml |  18 +-
 .../config-proxy-fullrouting-masterslave.yaml      |   6 +-
 ...onfig-shardingjdbc-fullrouting-masterslave.yaml |   6 +-
 ...proxy-fullrouting-sharding-masterslave-enc.yaml |  23 +-
 ...lrouting-sharding-masterslave-encrypt-test.yaml | 236 ---------------------
 ...c-fullrouting-sharding-masterslave-encrypt.yaml |  62 +-----
 .../proxy/config-proxy-fullrouting-sharding.yaml   |   2 -
 .../config-shardingjdbc-fullrouting-sharding.yaml  |  27 +--
 .../config-proxy-rangerouting-masterslave.yaml     |   6 +-
 ...nfig-shardingjdbc-rangerouting-masterslave.yaml |   6 +-
 ...roxy-rangerouting-sharding-masterslave-enc.yaml |  22 +-
 ...-rangerouting-sharding-masterslave-encrypt.yaml |  60 +-----
 .../proxy/config-proxy-rangerouting-sharding.yaml  |   2 -
 .../config-shardingjdbc-rangerouting-sharding.yaml |  21 --
 .../src/main/resources/yaml/server.yaml            |   1 +
 .../config-proxy-singlerouting-masterslave.yaml    |   6 +-
 ...fig-shardingjdbc-singlerouting-masterslave.yaml |   6 +-
 ...oxy-singlerouting-sharding-masterslave-enc.yaml |  22 +-
 ...singlerouting-sharding-masterslave-encrypt.yaml |  60 +-----
 .../proxy/config-proxy-singlerouting-sharding.yaml |   2 -
 ...config-shardingjdbc-singlerouting-sharding.yaml |  21 --
 49 files changed, 259 insertions(+), 630 deletions(-)
 delete mode 100644 shardingsphere-benchmark/src/main/resources/yaml/fullrouting/sharding-masterslave-encrypt/shardingjdbc/config-shardingjdbc-fullrouting-sharding-masterslave-encrypt-test.yaml