Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add MariaDB as a separate database #54 #234

Merged
merged 10 commits into from
May 4, 2021
Merged

Add MariaDB as a separate database #54 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8034eed
Template for adding MariaDB as separate database
Jiang-Hua Apr 13, 2021
07e42d5
Updates to database name and prefix
sm-shaw Apr 16, 2021
4487e72
Add connectpool config, correct code indentation offsets script in GU…
sm-shaw Apr 16, 2021
fa1a462
Fix inherited bug Issue #216
sm-shaw Apr 16, 2021
f8c3214
Add MariaDB TX Counter Logging
sm-shaw Apr 16, 2021
8008286
Update MariaDB TX Count Colour
sm-shaw Apr 16, 2021
4ae0d8e
Fix xtprof counter fails as insert into incorrect line
sm-shaw Apr 16, 2021
d3c8b75
Fix MySQL and MariaDB default port for connect pool
sm-shaw Apr 16, 2021
84d5c1b
Fix MariaDB connect pool config
sm-shaw Apr 16, 2021
e59579b
Merge pull request #1 from sm-shaw/54MDB
Jiang-Hua Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions config/connectpool/mariacpool.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<connpool>
<connections>
<c1>
<maria_host>host1</maria_host>
<maria_port>3306</maria_port>
<maria_socket>/tmp/mariadb.sock</maria_socket>
<maria_user>root</maria_user>
<maria_pass>maria</maria_pass>
<maria_dbase>tpcc</maria_dbase>
</c1>
<c2>
<maria_host>host2</maria_host>
<maria_port>3306</maria_port>
<maria_socket>/tmp/mariadb.sock</maria_socket>
<maria_user>root</maria_user>
<maria_pass>maria</maria_pass>
<maria_dbase>tpcc</maria_dbase>
</c2>
<c3>
<maria_host>host3</maria_host>
<maria_port>3306</maria_port>
<maria_socket>/tmp/mariadb.sock</maria_socket>
<maria_user>root</maria_user>
<maria_pass>maria</maria_pass>
<maria_dbase>tpcc</maria_dbase>
</c3>
</connections>
<sprocs>
<neworder>
<connections>c1 c2 c3</connections>
<policy>round_robin</policy>
</neworder>
<payment>
<connections>c1 c2 c3</connections>
<policy>round_robin</policy>
</payment>
<delivery>
<connections>c1 c2 c3</connections>
<policy>round_robin</policy>
</delivery>
<stocklevel>
<connections>c1 c2 c3</connections>
<policy>round_robin</policy>
</stocklevel>
<orderstatus>
<connections>c1 c2 c3</connections>
<policy>round_robin</policy>
</orderstatus>
</sprocs>
</connpool>
6 changes: 3 additions & 3 deletions config/connectpool/mysqlcpool.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
<connections>
<c1>
<mysql_host>host1</mysql_host>
<mysql_port>5432</mysql_port>
<mysql_port>3306</mysql_port>
<mysql_socket>/tmp/mysql.sock</mysql_socket>
<mysql_user>root</mysql_user>
<mysql_pass>mysql</mysql_pass>
<mysql_dbase>tpcc</mysql_dbase>
</c1>
<c2>
<mysql_host>host2</mysql_host>
<mysql_port>5432</mysql_port>
<mysql_port>3306</mysql_port>
<mysql_socket>/tmp/mysql.sock</mysql_socket>
<mysql_user>root</mysql_user>
<mysql_pass>mysql</mysql_pass>
<mysql_dbase>tpcc</mysql_dbase>
</c2>
<c3>
<mysql_host>host3</mysql_host>
<mysql_port>5432</mysql_port>
<mysql_port>3306</mysql_port>
<mysql_socket>/tmp/mysql.sock</mysql_socket>
<mysql_user>root</mysql_user>
<mysql_pass>mysql</mysql_pass>
Expand Down
8 changes: 8 additions & 0 deletions config/database.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@
<workloads>TPROC-C TPROC-H</workloads>
<commands>pg_conndefaults pg_connect pg_disconnect pg_exec pg_select pg_result pg_execute pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_lseek pg_lo_creat pg_lo_tell pg_lo_unlink pg_lo_import pg_lo_export pg_listen pg_sendquery pg_sendquery_prepared pg_sendquery_params pg_getresult pg_isbusy pg_blocking pg_cancelrequest pg_on_connection_loss pg_escape_string pg_quote pg_escape_bytea pg_unescape_bytea pg_transaction_status pg_parameter_status pg_exec_prepared pg_exec_params pg_notice_handler pg_result_callback pg_encrypt_password pg_lo_truncate pg_describe_cursor pg_describe_prepared pg_backend_pid pg_server_version</commands>
</postgresql>
<mariadb>
<name>MariaDB</name>
<description>MariaDB</description>
<prefix>maria</prefix>
<library>mariatcl</library>
<workloads>TPROC-C TPROC-H</workloads>
<commands>maria::sel mariause mariaescape mariasel marianext mariaseek mariamap mariaexec mariaclose mariainfo mariaresult mariacol mariastate mariainsertid mariaquery mariaendquery mariabaseinfo mariaping mariachangeuser mariareceive</commands>
</mariadb>
<!--Redis deprecated, uncomment to enable as unsupported
<redis>
<name>Redis</name>
Expand Down
55 changes: 55 additions & 0 deletions config/mariadb.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<mariadb>
<connection>
<maria_host>127.0.0.1</maria_host>
<maria_port>3306</maria_port>
<maria_socket>/tmp/mariadb.sock</maria_socket>
</connection>
<tpcc>
<schema>
<maria_count_ware>1</maria_count_ware>
<maria_num_vu>1</maria_num_vu>
<maria_user>root</maria_user>
<maria_pass>maria</maria_pass>
<maria_dbase>tpcc</maria_dbase>
<maria_storage_engine>innodb</maria_storage_engine>
<maria_partition>false</maria_partition>
<maria_prepared>false</maria_prepared>
</schema>
<driver>
<maria_total_iterations>1000000</maria_total_iterations>
<maria_raiseerror>false</maria_raiseerror>
<maria_keyandthink>false</maria_keyandthink>
<maria_driver>test</maria_driver>
<maria_rampup>2</maria_rampup>
<maria_duration>5</maria_duration>
<maria_allwarehouse>false</maria_allwarehouse>
<maria_timeprofile>false</maria_timeprofile>
<maria_async_scale>false</maria_async_scale>
<maria_async_client>10</maria_async_client>
<maria_async_verbose>false</maria_async_verbose>
<maria_async_delay>1000</maria_async_delay>
<maria_connect_pool>false</maria_connect_pool>
</driver>
</tpcc>
<tpch>
<schema>
<maria_scale_fact>1</maria_scale_fact>
<maria_tpch_user>root</maria_tpch_user>
<maria_tpch_pass>maria</maria_tpch_pass>
<maria_tpch_dbase>tpch</maria_tpch_dbase>
<maria_num_tpch_threads>1</maria_num_tpch_threads>
<maria_tpch_storage_engine>myisam</maria_tpch_storage_engine>
</schema>
<driver>
<maria_total_querysets>1</maria_total_querysets>
<maria_raise_query_error>false</maria_raise_query_error>
<maria_verbose>false</maria_verbose>
<maria_refresh_on>false</maria_refresh_on>
<maria_update_sets>1</maria_update_sets>
<maria_trickle_refresh>1000</maria_trickle_refresh>
<maria_refresh_verbose>false</maria_refresh_verbose>
<maria_cloud_query>false</maria_cloud_query>
</driver>
</tpch>
</mariadb>
1 change: 1 addition & 0 deletions src/mariadb/mariamet.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#database metrics
Loading