diff --git a/DocBook/docs.xml b/DocBook/docs.xml index b8896d93..5742d39a 100644 --- a/DocBook/docs.xml +++ b/DocBook/docs.xml @@ -22,7 +22,7 @@
Release Notes - The following are the release notes for HammerDB v4.10. + The following are the release notes for HammerDB v4.11.
Nomenclature Change @@ -72,8 +72,11 @@
Storing, Retrieval and Visualization of Results - From v4.8 the HammerDB Web Service has been enhanced to provide - a read only interface to the jobs output from both the GUI and CLI + From v4.11 the option to build a Performance Profile by grouping + multiple TPROC-C jobs under a profile id has been added to the storage + and retrieval of results as well as storing CPU metrics as prt of a + job. From v4.8 the HammerDB Web Service has been enhanced to provide a + read only interface to the jobs output from both the GUI and CLI stored in a SQLite database using a web browser. This enables the viewing of workload configuration as well as automatically generated charts from the job output. These charts use Apache e-charts and @@ -87,55 +90,33 @@
Schema and Consistency Checks - From v4.10 HammerDB has added schema and data consistency checks - for all databases. These checks can be run after a schema build and - after running the workload to verify that the schema and data has - remained consistent. + From v4.11 the schema checks have been added to the example + scripts for all databases. From v4.10 HammerDB has added schema and + data consistency checks for all databases. These checks can be run + after a schema build and after running the workload to verify that the + schema and data has remained consistent.
- Docker CloudTK GUI + Persist VU Settings - HammerDB has added an additional Docker image to enable running - the GUI through a web browser. + From v4.11 the option has been added to persist VU settings + across HammerDB restarts.
- Quotemeta to escape special characters in passwords + GUI SVG and Theme updates - From v4.10 HammerDB has added an optional quotemeta function to - escape special characters in passwords. By default this functionality - is enabled and can be controlled with the quote_passwords setting in - the configuration. - - <code_highlight> - <highlight>true</highlight> - <quote_passwords>true</quote_passwords> - </code_highlight> -
- -
- Microsoft SQL Server 2022 Entra Authentication - - From v4.10 HammerDB has been enhanced to permit Microsoft Entra - authentication where configured for SQL Server 2022 with the ODBC - driver version 18. -
- -
- MariaDB TPROC-C purge and write back option - - From v4.10 HammerDB has added an option to the TPROC-C workload - for MariaDB to enable accelerated purge and writeback between runs. - This option is compatible with MariaDB versions 10.7.0 upwards. + From v4.11 the SVG and theme packages used by HammerDB have been + updated, the themes unified between Windows and Linux and the + properties dialogs moved to a tabbed configuration.
- Giset command to dynamically set generic dictionary - settings + Oceanbase for MySQL TPROC-H - From v4.10 HammerDB has added a giset command that can be used - to modify generic dictionary settings such as timeouts. + From v4.11 Oceanbase has been added as a option to the MySQL + TPROC-H workload.
@@ -252,46 +233,43 @@ DIAG_DDE_ENABLED=FALSE
- HammerDB v4.10 New Features + HammerDB v4.11 New Features - HammerDB v4.10 New Features are all referenced to HammerDB v4.11 New Features are all referenced to GitHub Pull Requests, where more details for each new feature and related pull requests can be found here: - [TPC-Council#668] Increase default CLI timeouts + [TPC-Council#709] Added example scripts for checkschema for all + databases - [TPC-Council#665] Add support for Microsoft Entra authentication - for SQL Server + [TPC-Council#707] Adds Performance Profile for TPROC-C Jobs - [TPC-Council#664] Add schema and consistency checks for all - databases for TPROC-C and TPROC-H + [TPC-Council#706] Add Schema Existence Check for + MySQL/MariaDB - [TPC-Council#658] Add quotemeta function to escape special - characters in passwords + [TPC-Council#705] Add CPU metrics to CLI, Jobs and automate + start - [TPC-Council#653] Add bcp -u option for SQL Server to trust the - server certificate + [TPC-Council#701] Fix incorrect value for SQLite database - [TPC-Council#652] MSSQL TPCH Create Advanced Statistics + [TPC-Council#696] Persist VU settings across restarts - [TPC-Council#647] MSSQLS TPCH Add Flag to Partition Orders and - Lineitems + [TPC-Council#690] Add Database version to TPROC-C timed + test - [TPC-Council#646] Add giset command to set generic dictionary - settings + [TPC-Council#688] Fix RETURNING d_next_o_id in NEWORD bug - [TPC-Council#644] Add check to vurun for pre-existing - threads + [TPC-Council#682] Fix missing close-brace in PostgreSQL XML + Connect Pool option - [TPC-Council#642] Add optional purge and write back for MariaDB - TPROC-C database[TPC-Council#641] Docker cloudtk docker gui + [TPC-Council#680] Update SVG and themes packages, Unify themes on + Windows and Linux - [TPC-Council#638] Fix call ash_fetch,error on Windows client - running PostgreSQL metrics + [TPC-Council#678] Change GUI properties dailogs to tabbed - [TPC-Council#634] Alter MSSQLS TPCH Schema to use Decimal not - Money + [TPC-Council#670] Add Support for oceanbase tpch + enhancement
@@ -419,12 +397,12 @@ DIAG_DDE_ENABLED=FALSE which can be downloaded at no cost from Microsoft and run as follows: - fciv -both HammerDB-4.10-Win-x86-64-Setup.exe + fciv -both HammerDB-4.11-Win-x86-64-Setup.exe and on Linux with md5sum and sha1sum as shown: - md5sum HammerDB-4.10-Linux.tar.gz -sha1sum HammerDB-4.10-Linux.tar.gz + md5sum HammerDB-4.11-Linux.tar.gz +sha1sum HammerDB-4.11-Linux.tar.gz
@@ -646,7 +624,7 @@ sha1sum HammerDB-4.10-Linux.tar.gz To install from the tar.gz run the command - tar -zxvf HammerDB-4.10.tar.gz + tar -zxvf HammerDB-4.11.tar.gz This will extract HammerDB into a directory named HammerDB-4.10. @@ -676,7 +654,7 @@ sha1sum HammerDB-4.10-Linux.tar.gz HammerDB Docker Container Build & Run Containers are lightweight prebuilt environments that are easy to - distribute and deploy. Version 4.10 includes both a pre-built Docker + distribute and deploy. Version 4.11 includes both a pre-built Docker Image and a Dockerfile that can be used to create a HammerDB Docker containers. This container is based on an Ubuntu 20.04 base image and provides a ready to use environment to run HammerDB. HammerDB has a @@ -703,10 +681,10 @@ docker pull tpcorg/hammerdb:mssqls The official HammerDB Docker images are hosted by the - TPC-Council and recognised by the Docker Sponsored OSS program. + TPC-Council.
- Docker Sponsored OSS + HammerDB Docker Hub @@ -736,14 +714,14 @@ Running with default file descriptor limit httpd started on port 8081 secure httpd started on SSL port 8082 - Otherwise you can only expose the ports as needed. + Otherwise you can only expose the ports as needed. docker run -p 8081:8081 -p 8082:8082 -p 8080:8080 --name hammerdb-cloudtk hammerdb:cloudtk You can connect to port 8081 for an unencrypted connection. Alternatively you can use an encrypted connection on port 8082. By default sample self-signed certificates are installed and these should - be replaced by your own. + be replaced by your own.
CloudTK Launcher @@ -826,7 +804,7 @@ secure httpd started on SSL port 8082 To create an image: Go to the folder containing the Dockerfile and run the docker build command. - docker build -t hammerdb-v4.10 . + docker build -t hammerdb-v4.11 .
docker build @@ -857,7 +835,7 @@ secure httpd started on SSL port 8082 build is successful but the client libraries for IBM are not installed. - docker run -it --name hammerdb hammerdb-v4.10 bash + docker run -it --name hammerdb hammerdb-v4.11 bash
docker run @@ -899,7 +877,7 @@ secure httpd started on SSL port 8082 communicate with remote databases. The following is an example of adding host network to the container. - docker run --network=host -it --name hammerdb hammerdb-v4.10 bash + docker run --network=host -it --name hammerdb hammerdb-v4.11 bash
@@ -931,7 +909,7 @@ secure httpd started on SSL port 8082 and type librarycheck. - HammerDB CLI v4.10 + HammerDB CLI v4.11 Copyright (C) 2003-2024 Steve Shaw Type "help" for a list of commands The xml is well-formed, applying configuration @@ -1078,9 +1056,9 @@ Success ... loaded library mysqltcl for MySQL The following table shows the libraries that are required for each database version. All libraries are 64-bit. Note that some databases are - considerably more flexible in library versions and therefore the - following section is important to ensure that you install the correct - library for your needs. + considerably more flexible than others in library versions and therefore + the following section is important to ensure that you install the + correct library for your needs. 3rd party libraries @@ -1234,7 +1212,7 @@ Driver=/opt/microsoft/msodbcsql/lib64/libmsodbcsql-17.0.so.1.1 UsageCount=1}}

MySQL - HammerDB version 4.9 (4.X and version 3.3) has been built and + HammerDB version 4.11 (4.X and version 3.3) has been built and tested against a MySQL 8.0 client installation, hammerDB version 3.0-3.2 has been built against MySQL 5.7. On Linux this means that HammerDB will require a MySQL client library called @@ -1248,8 +1226,8 @@ Driver=/opt/microsoft/msodbcsql/lib64/libmsodbcsql-17.0.so.1.1 UsageCount=1}}

MariaDB - HammerDB version 4.9 has been built and tested against MariaDB - 10.6 client installation. On Linux this means that HammerDB will + HammerDB version 4.11 has been built and tested against MariaDB + 10.8 client installation. On Linux this means that HammerDB will require a MariaDB client library called libmariadb.so.3. This client library needs to be referenced in the LD_LIBRARY_PATH as shown previously in this section. On Windows the client library is called @@ -1346,7 +1324,7 @@ Driver=/opt/microsoft/msodbcsql/lib64/libmsodbcsql-17.0.so.1.1 UsageCount=1}}

- The existing SQLite DBs are from version v4.9. SQLite DBs will be reset to v4.10. + The existing SQLite DBs are from version v4.10. SQLite DBs will be reset to v4.11. For this reason before running another version any existing configuration that is wished to be saved should be exported using @@ -1396,11 +1374,11 @@ Driver=/opt/microsoft/msodbcsql/lib64/libmsodbcsql-17.0.so.1.1 UsageCount=1}}

The scaletheme value will accept settings of "auto", "awlight", - "arc" or "breeze". If set to the default of "auto", "awlight" will be - used on Linux. + "arc" or "breeze". If set to the default of "auto", from v4.11 "breeze" + will be used on both Linux and Windows.
- Linux Theme Awlight + Linux Breeze Theme @@ -1409,8 +1387,6 @@ Driver=/opt/microsoft/msodbcsql/lib64/libmsodbcsql-17.0.so.1.1 UsageCount=1}}

- and "breeze" on Windows. -
Windows Theme Breeze @@ -1784,11 +1760,11 @@ Success ... loaded library mariatcl for MariaDB and running and be familiar with basic functionality of connecting to your database. After starting HammerDB, firstly you will need to select which benchmark and database you wish to use by choosing Benchmark from under - the Options menu or double on your chosen database in the tree-view. The - initial settings are determined by the values in your xml configuration - file. Select your chosen database and TPROC-C and press OK. This Quick - Start guide uses Microsoft SQL Server, however the process is the same for - all other supported databases. + the Options menu or double click on your chosen database in the tree-view. + The initial settings are determined by the values in your xml + configuration file. Select your chosen database and TPROC-C and press OK. + This Quick Start guide uses Microsoft SQL Server, however the process is + the same for all other supported databases.
Building the Schema @@ -1812,7 +1788,7 @@ Success ... loaded library mariatcl for MariaDB Click OK.
- Build Options + Build Options Connections @@ -1821,7 +1797,17 @@ Success ... loaded library mariatcl for MariaDB
- . + + +
+ Build Options Settings + + + + + + +
Double-click on Build in the tree view and you will receive a prompt on the settings chosen to build the schema. Click Yes. @@ -1861,24 +1847,63 @@ Success ... loaded library mariatcl for MariaDB
+ + +
+ Checking the Schema + + Under the tree menu select the Check Icon and click on OK on the + prompt. HammerDB will then run a number of checks to ensure that the + Schema has been build successfully and the data is consistent. - Within the tree-view Select Driver Script Options. Leave the - settings at Test Driver Script and click OK +
+ Schema Check + + + + + + +
Run a Test Workload + Note that HammerDB stores all output of a workload called Jobs + within a SQLite database for later retrieval. As a test workload prints + a considerable amount of output for performance you can disable the + storage of the Jobs under the Jobs tree view option, clicking Jobs + Disabled and restarting HammerDB. If you leave Jobs enabled it is + expected that the performance of the test workload is slower as all of + the output is stored in SQLite. + +
+ Disable Jobs + + + + + + +
+ + After restrarting, within the tree-view Select Driver Script + Options and Settings. Leave the settings at Test Driver Script and click + OK +
- Driver Options + Driver Connection Options -
Observe that the Driver Script is Loaded. Clicking on Load - will reload the script. + + + Observe that the Driver Script is Loaded. Clicking on Load will + reload the script.
Driver Script Loaded @@ -1901,11 +1926,11 @@ Success ... loaded library mariatcl for MariaDB -
- Click on Create and the Virtual Users will be created and waiting - to run in an idle status. (Clicking run first will run both Create and - Run Immediately). + Click on Create and the Virtual Users will be created and + waiting to run in an idle status. (Clicking run first will run both + Create and Run Immediately). +
Virtual Users Created @@ -1935,12 +1960,23 @@ Success ... loaded library mariatcl for MariaDB
Run a Timed Workload - the Test script is to check connectivity and diagnose performance + The Test script is to check connectivity and diagnose performance and configuration errors. It is the Timed Workload that should be used - to conduct performance tests. Under Driver Options select Timed Driver - Script and click OK, the Timed Driver Script is now loaded. + to conduct performance tests and is suitable for Jobs storage, so under + the Jobs tree view re-enable Jobs. - +
+ Enable Jobs + + + + + + +
+ + Under Driver Options select Timed Driver Script and click OK, the + Timed Driver Script is now loaded.
Driver Options @@ -2034,6 +2070,51 @@ Success ... loaded library mariatcl for MariaDB
+
+ Browsing Results + + When Jobs are enabled, HammerDB stores a repository of Job related + information and charts. To view this data, start the Web Service under + Job Options and then select Browse under the tree view. + +
+ Job Options + + + + + + +
+ + The Home Page shows an index of Jobs. + +
+ Browse Jobs + + + + + + + + Each Job shows details such as the output of the Job and + charts such as the test result. When workload options such as the + transaction counter, metrics or response times are selected + additional data will be added to the Job data. +
+ +
+ Job Result + + + + + + +
+
+
Deleting the Schema @@ -2158,21 +2239,15 @@ Success ... loaded library mariatcl for MariaDB directly as a result of changes you have made to the configuration (or management overhead of your system such as database checkpoints or user/administrator error). Testing has proven that HammerDB tests re-run - multiple times unattended (see the autopilot feature) on the same - reliable configuration produce performance profiles that will overlay - each other almost identically. The Figure below illustrates an example - of this consistency and shows the actual results of 2 sequences of tests - run unattended one after another against one of the supported databases - with the autopilot feature from 1 to 144 virtual users to test - modifications to a WAL (Write Ahead Log File). In other words HammerDB - will give you the same results each time, if your results vary you need - to focus entirely on your database, OS and hardware - configuration. - - + multiple times unattended (see the autopilot feature or CLI scripts) on + the same reliable configuration produce performance profiles that will + overlay each other almost identically. From HammerDB v4.11, HammerDB + includes the functionality to generate performance profiles enabling you + to group jobs and observe performance at different levels of system + utilisation.
- WAL Test + Performance Profile @@ -2705,7 +2780,7 @@ OK (30 msec) Driver 18 for SQL Server” for both Windows and Linux. From v4.10 HammerDB will also permit authentication with Microsoft Entra where available with your configuration and a minimum version of SQL Server - 2022. + 2022.
ODBC Drivers @@ -3072,7 +3147,7 @@ host all all 192.168.1.67/32 md5 Oracle Schema Build Options
- Oracle Build Options + Oracle Build Options Connections @@ -3081,6 +3156,18 @@ host all all 192.168.1.67/32 md5
+ + +
+ Oracle Build Options Settings + + + + + + +
+
Oracle Options @@ -3335,7 +3422,7 @@ GO Build Options
- SQL Server Build Options + SQL Server Build Connection Options @@ -3344,6 +3431,18 @@ GO
+ + +
+ SQL Server Build Settings Options + + + + + + +
+
SQL Server Build Options @@ -3554,15 +3653,25 @@ GO Note that as previously described the host and port are defined externally in the db2dsdriver.cfg file. -
- Db2 Build Options +
+ Db2 Build Connection Options - - - - - -
+ + + + + +
+ +
+ Db2 Build Settings Options + + + + + + +
Db2 Build Options @@ -3670,15 +3779,25 @@ GO
MySQL Schema Build Options -
- MySQL Build Options +
+ MySQL Build Connection Options - - - - - -
+ + + + + +
+ +
+ MySQL Build Settings Options + + + + + + +
MySQL Build Options @@ -3857,15 +3976,25 @@ GO
MariaDB Schema Build Options -
- MariaDB Build Options +
+ MariaDB Build Connection Options - - - - - -
+ + + + + +
+ +
+ MariaDB Build Settings Options + + + + + + +
MariaDB Build Options @@ -4048,18 +4177,26 @@ GO
PostgreSQL Schema Build Options +
+ PostgreSQL Build Connection Options + + + + + + +
+
- PostgreSQL Build Options + PostgreSQL Build Settings Options - +
- -
PostgreSQL Build Options @@ -4294,10 +4431,10 @@ GO completed successfully and also after running the workload to ensure that the data in your database remained consistent. This can also be useful for example when testing clustered, distributed or replicated - database environments. + database environments.To check the schema choose the Check option from the treeview or - the top level menu. + the top level menu.
Check TPROC-C Schema @@ -4311,7 +4448,7 @@ GO If the check completes without error it will report a message that the check has been successful meaning that the schema is valid and the - data is consistent. + data is consistent.
TPROC-C Schema Check Complete @@ -4353,7 +4490,7 @@ GO - Consistency Checks. + Consistency Checks. @@ -6801,6 +6938,14 @@ edb=# enabled on the main window. + + Performance Profile ID + + Set to a positive integer to group the Jobs for a + sequence together to be viewed as a performance profile in the + Job viewer. + + Minutes per Test in Virtual User Sequence @@ -6886,7 +7031,8 @@ edb=#
When the sequence is complete you will see the message Autopilot - Sequence ended. You can now gather all of your test results. + Sequence ended. You can now view all of your test results in the Job + Viewer.
Autopilot Complete @@ -6896,7 +7042,33 @@ edb=# -
+
If you set a performance profile ID you will see your Jobs in + the Job viewer and a Performance Profile summary identifying the top + performing job, with the NOPM, TPM and Maximum Active Virtual Users + (AVU). + +
+ Autopilot Performance Profile + + + + + + +
+ + Clicking on the profile id shows a graph of the NOPM and TPM for + all of the jobs in the autopilot sequence. + +
+ Performance Profile + + + + + + +
@@ -7226,10 +7398,12 @@ done
Logging Transaction Counter Output - HammerDB also provides the option to log the output of the - transaction counter to a separate logfile. This enables the recording of - transactions throughout the test that can be used to verify the - transaction rate across time. To enable transaction counter logging + When you run the transaction counter during a Benchmark Run with + Jobs enabled, HammerDB will automatically record the transaction count + as part of the Job. HammerDB also provides the option to log the output + of the transaction counter to a separate logfile. This enables the + recording of transactions throughout the test that can be used to verify + the transaction rate across time. To enable transaction counter logging select Log Output to Temp. There are also options to use a unique log name and to generate timestamps. With the following options selected. @@ -7312,12 +7486,15 @@ done By default HammerDB metrics displays the CPU utilisation per core across the target system. HammerDB has also introduced a database metrics - display initially for the Oracle Database. HammerDB Metrics uses an agent - and display configuration meaning that the agent must be installed on the - SUT. This can be accomplished by installing HammerDB on the SUT as well as - the server. On Linux the sysstat package must be pre-installed where the - agent is running. An agent on Linux can can communicate with the HammerDB - display running on Windows and vice versa. + display for the Oracle and PostgreSQL Databases based on their Active + Session History feature. HammerDB Metrics uses an agent and display + configuration meaning that the agent must be installed on the SUT. This + can be accomplished by installing HammerDB on the SUT as well as the + server. When HammerDB is run on the SUT HammerDB v4.11 introduces + functionality to start the agent and display at the same time. On Linux + the sysstat package must be pre-installed where the agent is running. An + agent on Linux can can communicate with the HammerDB display running on + Windows and vice versa. $ mpstat -V sysstat version 11.5.7 @@ -7326,10 +7503,11 @@ sysstat version 11.5.7 On Windows a version of mpstat is included with HammerDB.
- Start the Agent + Start the Agent Manually - To start the agent on Linux run the agent program locally in the - agent directory. + Where the agent is installed separately from the SUT. To start the + agent on Linux run the agent program locally in the agent + directory. $./agent Initializing HammerDB Metric Agent 4.1 @@ -7379,7 +7557,7 @@ HammerDB Metric Agent active @ id 20376 hostname CRANE (Ctrl-C to Exit)
- Configure Metrics + Configure Metrics Manually In HammerDB select Metrics Options @@ -7393,8 +7571,8 @@ HammerDB Metric Agent active @ id 20376 hostname CRANE (Ctrl-C to Exit) - Enter the id and canonical hostname of the agent and press - OK. + Enter the id and canonical hostname of the agent, Unclick Start + Display with Local Agent and press OK.
Agent Options @@ -7444,6 +7622,38 @@ HammerDB Metric Agent active @ id 20376 hostname CRANE (Ctrl-C to Exit)
+
+ Configure Metrics Automatically + + When the SUT and host running HammerDB are the same, the Metrics + display can be started automatically from the Metrics Agent Options. + Under the Options ensure Start Display with Local Agent is selected and + click Agent Start. + +
+ Metrics Agent Options + + + + + + +
+ + HammerDB will automatically start the agent and connect to + it. + +
+ Metrics Display + + + + + + +
+
+
Monitor Metrics @@ -7491,6 +7701,37 @@ HammerDB Metric Agent active @ id 20376 hostname CRANE (Ctrl-C to Exit)
+
+ Viewing Job Metrics Data + + From HammerDB v4.11 Metrics Data has been added to the Jobs + Viewer. If Metrics are running during a Job a metrics link will be + shown. + +
+ Metrics Data in Job Menu + + + + + + +
+ + Clicking on the metrics link will show a summary of all CPU + utilisation during the Job. + +
+ Jobs Metrics Data + + + + + + +
+
+
Oracle Database Metrics @@ -8003,7 +8244,7 @@ hammerdb> To learn CLI commands type "help". - HammerDB v4.10 CLI Help Index + HammerDB v4.11 CLI Help Index Type "help command" for more details on specific commands below @@ -8023,6 +8264,10 @@ Type "help command" for more details on specific commands below jobs librarycheck loadscript + metset + metstart + metstatus + metstop print quit steprun @@ -8206,11 +8451,37 @@ hammerdb> jobs (alias job) - Usage: jobs : jobs [jobid|joblist|result|timestamp] : - jobs format [ text | JSON ] : jobs disable [ 0 | 1 ] : jobs - jobid - [bm|db|delete|dict|result|status|tcount|timestamp|timing|vuid] - : jobs jobid timing vuid + hammerdb>help jobs jobs - Usage: jobs list all jobs. + jobs - Usage: jobs [jobid|joblist|result|timestamp] jobid: + list VU output for jobid. joblist: returns text list of jobs + wthout newlines. result: list result for all jobs. timestamp: + list starting timestamp for all jobs. jobs format - Usage: + jobs format [ text | JSON ] text: Format job output as text. + JSON: Format job output as JSON. jobs disable - Usage: jobs + disable [ 0 | 1 ] 0: Enable storage of job output, restart + required. 1: Disable storage of job output, restart required. + jobs profileid - Usage: jobs profileid [ id ] profileid: + returns current performance profile id. profileid id: sets + current performance profile id. jobs profile - Usage: jobs + profile [ id ] profile id: returns the results for the + performance profile id. jobs jobid - Usage: jobs jobid + [bm|db|delete|dict|metrics|result|status|system|tcount|timestamp|timing|vuid] + bm: list benchmark for jobid. db: list database for jobid. + delete: delete jobid. dict: list dict for jobid. metrics: show + system metrics for jobid. result: list result for jobid. + status: list status for jobid. system: show system data for + jobid. tcount: list count for jobid. timestamp: list starting + timestamp for jobid. timing: list xtprof summary timings for + jobid. vuid: list VU output for VU with vuid for jobid. jobs + jobid timing - Usage: jobs jobid timing vuid timing vuid: list + xtprof timings for vuid for jobid. jobs jobid getchart - + Usage: jobs jobid getchart [result | timing | tcount | metrics + | profile ] result: generate html chart for TPROC-C/TPROC-H + result. timing: generate html chart for TPROC-C/TPROC-H + timings. metrics: generate html chart for TPROC-C/TPROC-H + metrics. profile: generate html chart for TPROC-C performance + profile using profileid for jobid argument. tcount: generate + html chart for TPROC-C transaction count. hammerdb> The jobs command can be used to enable or disable jobs functionality. If enabled it records the output, @@ -8240,6 +8511,40 @@ hammerdb> graphical interface. + + metset + + Usage: metset [agent_hostname|agent_id] + + Configure the CPU Metrics options. Equivalent to the + Metrics Options window in the graphical interface. + + + + metstart + + Usage: metstatus + + Checks the status of the CPU Metrics. + + + + metstatus + + Usage: metstart + + Starts the CPU Metrics and agent if configured to the + localhost. + + + + metstop + + Usage: metstop + + Stops the CPU Metrics. + + print @@ -8449,26 +8754,34 @@ hammerdb> string or integer arguments. C:\Program Files\HammerDB-4.6>hammerdbcli py -HammerDB CLI v4.6 -Copyright (C) 2003-2022 Steve Shaw +HammerDB CLI v4.11 +Copyright (C) 2003-2024 Steve Shaw Type "help()" for a list of commands hammerdb>>>help() -HammerDB v4.6 CLI Help Index +HammerDB v4.11 CLI Help Index Type "help command" for more details on specific commands below buildschema + checkschema deleteschema clearscript + savescript customscript + custommonitor datagenrun dbset dgset diset distributescript + giset jobs librarycheck loadscript + metset + metstart + metstatus + metstop print quit steprun @@ -8483,6 +8796,10 @@ Type "help command" for more details on specific commands below vurun vuset vustatus + wsport + wsstart + wsstatus + wsstop hammerdb>>>vuset('vu',10) hammerdb>>> @@ -9859,9 +10176,22 @@ hammerdb> restart. + + jobs profileid [ id ] + + Returns or sets the performance profile id + + + + jobs profile [ id ] + + Returns the results for the performance profile + id + + jobs jobid - [bm|db|delete|dict|result|status|tcount|timestamp|timing|vuid] + [bm|db|delete|dict|metrics|result|status|system|tcount|timestamp|timing|vuid] Query an individual job, showing the full output, benchmark, database, delete the individual job, show the result, @@ -9876,10 +10206,11 @@ hammerdb> - jobs jobid getchart [result | timing | tcount] + jobs jobid getchart [result | timing | tcount | metrics | + profile ] - Generate html chart for TPROC-C/TPROC-H results, timing - and transaction counts + Generate html chart for TPROC-C/TPROC-H results, timing, + transaction counts and performance profile @@ -10388,6 +10719,55 @@ hammerdb>job 637CF9B73C8D03E243636303 timestamp 637CF9B73C8D03E243636303 {2022-11-22 16:32:55} + If you run the metstart command before a CLI job then HammerDB + will also record the CPU metrics for the Job. + + Connecting to Agent to Display CPU Metrics +Metric receive port open @ 11732 on yellowhammer +Connecting to HammerDB Agent @ localhost:10000 +Testing Agent Connectivity...OK +Metrics Connected +Started CPU Metrics for Intel(R) Core(TM) i5-1035G7 CPU @ 1.20GHz:(8 CPUs) +233352 MSSQLServer tpm +CPU all usr%-23.85 sys%-3.03 irq%-0.00 idle%-71.33 +369714 MSSQLServer tpm +CPU all usr%-24.85 sys%-2.36 irq%-0.00 idle%-72.65 +383484 MSSQLServer tpm +CPU all usr%-24.67 sys%-2.31 irq%-0.00 idle%-72.81 +337770 MSSQLServer tpm +CPU all usr%-0.00 sys%-1.97 irq%-0.00 idle%-81.31 +211182 MSSQLServer tpm +CPU all usr%-24.03 sys%-2.21 irq%-0.00 idle%-73.24 +Vuser 1:Rampup 1 minutes complete ... +Vuser 1:Rampup complete, Taking start Transaction Count. +Vuser 1:Timing test period of 2 in minutes +293148 MSSQLServer tpm +CPU all usr%-22.90 sys%-2.65 irq%-0.00 idle%-72.83 +259614 MSSQLServer tpm +CPU all usr%-45.36 sys%-8.97 irq%-0.58 idle%-41.59 +241854 MSSQLServer tpm +CPU all usr%-18.19 sys%-2.73 irq%-0.29 idle%-77.61 +280578 MSSQLServer tpm +CPU all usr%-23.01 sys%-3.04 irq%-0.00 idle%-73.33 +221520 MSSQLServer tpm +CPU all usr%-20.61 sys%-2.75 irq%-0.31 idle%-75.22 +221610 MSSQLServer tpm +CPU all usr%-24.43 sys%-3.30 irq%-0.00 idle%-71.92 +Vuser 1:1 ..., +189894 MSSQLServer tpm +CPU all usr%-4.46 sys%-1.28 irq%-0.00 idle%-86.20 +193962 MSSQLServer tpm +CPU all usr%-20.12 sys%-3.19 irq%-0.44 idle%-76.33 +200604 MSSQLServer tpm +CPU all usr%-18.80 sys%-2.49 irq%-0.00 idle%-76.88 +240342 MSSQLServer tpm +CPU all usr%-16.95 sys%-1.83 irq%-0.11 idle%-80.77 +235584 MSSQLServer tpm +CPU all usr%-18.14 sys%-2.56 irq%-0.00 idle%-78.80 +240912 MSSQLServer tpm +CPU all usr%-19.13 sys%-2.49 irq%-0.00 idle%-77.52 +223194 MSSQLServer tpm + The jobs functionality extends HammerDB functionality as an essential repository for your test configuration and results.
@@ -10614,6 +10994,33 @@ hammerws>jobs + If a performance Profile ID has been set to a positive integer in + both the GUI and the CLI then a related sequence of jobs can be run and + generate a performance profile. + +
+ Performance Profile + + + + + + +
+ + Clicking on the performance profile shows the NOPM and TPM of all + the Jobs in the Performance Profile. + +
+ Performance Profile + + + + + + +
+ Text based data will be reported in JSON format.
@@ -11450,12 +11857,24 @@ infinidb_import_for_batchinsert_delimiter=7
Oracle Schema Build Options + + +
+ Oracle TPROC-H Build Connection Options + + + + + + +
+
- Oracle TPROC-H Build Options + Oracle TPROCH Build Settings Options - +
@@ -11576,16 +11995,28 @@ infinidb_import_for_batchinsert_delimiter=7
SQL Server Schema Build Options +
+ SQL Server TPROCH Build Connection Options + + + + + + +
+
- SQL Server Build Options + SQL Server TPROCH Settings Options - +
+ +
SQL Server Build Options @@ -11793,16 +12224,30 @@ infinidb_import_for_batchinsert_delimiter=7
Db2 Schema Build Options + + +
+ Db2 TRPOCH Build Connection Options + + + + + + +
+
- Db2 Build Options + Db2 TPROCH Build Settings Options - +
+ +
Db2 Build Options @@ -11895,7 +12340,7 @@ infinidb_import_for_batchinsert_delimiter=7MySQL Schema Build Options
- MySQL Build Options + MySQL TPROCH Build Connection Options @@ -11904,6 +12349,18 @@ infinidb_import_for_batchinsert_delimiter=7
+
+ MySQL TPROCH Build Settings Options + + + + + + +
+ + +
MySQL Build Options @@ -11960,6 +12417,25 @@ infinidb_import_for_batchinsert_delimiter=7 created. + + Oceanbase Compatible + + Option for Oceanbase MySQL compatible + database + + + + Oceanbase Tenant Name + + Oceanbase tenant name for connection string + + + + Oceanbase Partitions + + Number of Oceanbase Partitions + + Data Warehouse Storage Engine @@ -12000,7 +12476,7 @@ infinidb_import_for_batchinsert_delimiter=7 MariaDB Schema Build Options
- MariaDB Build Options + MariaDB TPROCH Build Connection Options @@ -12009,6 +12485,16 @@ infinidb_import_for_batchinsert_delimiter=7
+
+ MariaDB TPROCH Settings Connection Options + + + + + + +
+
MySQL Build Options @@ -12104,12 +12590,22 @@ infinidb_import_for_batchinsert_delimiter=7
PostgreSQL Schema Build Options +
+ PostgreSQL TPROCH Build Connection Options + + + + + + +
+
- PostgreSQL Build Options + PostgreSQL TPROCH Build Settings Options - +
@@ -12875,7 +13371,7 @@ SET From v4.10 a schema and data check has been added that can be run after a schema build and also after running a workload with a refresh function to ensure that the data remains consistent. To run the check - select the Check option from the treeview or the main menu. + select the Check option from the treeview or the main menu.
Check TPROC-H Schema @@ -12888,7 +13384,7 @@ SET
When completed a message will be shown if the check was - successful. + successful.
TPROC-H Schema Check Completed @@ -12966,7 +13462,7 @@ SET Options.
- TPROC-H Driver Options + TPROC-H Driver Settings Options diff --git a/DocBook/docs/images/ch1-10.PNG b/DocBook/docs/images/ch1-10.PNG index 9887c9fb..fd5c18cb 100644 Binary files a/DocBook/docs/images/ch1-10.PNG and b/DocBook/docs/images/ch1-10.PNG differ diff --git a/DocBook/docs/images/ch1-11.PNG b/DocBook/docs/images/ch1-11.PNG index 611f92fc..9d17a20a 100644 Binary files a/DocBook/docs/images/ch1-11.PNG and b/DocBook/docs/images/ch1-11.PNG differ diff --git a/DocBook/docs/images/ch1-12.PNG b/DocBook/docs/images/ch1-12.PNG index 30dda1b5..ee5d1ef5 100644 Binary files a/DocBook/docs/images/ch1-12.PNG and b/DocBook/docs/images/ch1-12.PNG differ diff --git a/DocBook/docs/images/ch1-12aa.PNG b/DocBook/docs/images/ch1-12aa.PNG index 0933981e..67649ad2 100644 Binary files a/DocBook/docs/images/ch1-12aa.PNG and b/DocBook/docs/images/ch1-12aa.PNG differ diff --git a/DocBook/docs/images/ch1-12aaa.PNG b/DocBook/docs/images/ch1-12aaa.PNG index 4ef6a498..69a4dcf3 100644 Binary files a/DocBook/docs/images/ch1-12aaa.PNG and b/DocBook/docs/images/ch1-12aaa.PNG differ diff --git a/DocBook/docs/images/ch1-17.PNG b/DocBook/docs/images/ch1-17.PNG index 47619f44..081c3fdd 100644 Binary files a/DocBook/docs/images/ch1-17.PNG and b/DocBook/docs/images/ch1-17.PNG differ diff --git a/DocBook/docs/images/ch1-19.png b/DocBook/docs/images/ch1-19.png index d224b7c4..73bc48b5 100644 Binary files a/DocBook/docs/images/ch1-19.png and b/DocBook/docs/images/ch1-19.png differ diff --git a/DocBook/docs/images/ch1-3.PNG b/DocBook/docs/images/ch1-3.PNG deleted file mode 100644 index 7cce5931..00000000 Binary files a/DocBook/docs/images/ch1-3.PNG and /dev/null differ diff --git a/DocBook/docs/images/ch1-4a.PNG b/DocBook/docs/images/ch1-4a.PNG index 10ee1ecb..39cd0078 100644 Binary files a/DocBook/docs/images/ch1-4a.PNG and b/DocBook/docs/images/ch1-4a.PNG differ diff --git a/DocBook/docs/images/ch1-6.PNG b/DocBook/docs/images/ch1-6.PNG index 09fcdc6c..4548e969 100644 Binary files a/DocBook/docs/images/ch1-6.PNG and b/DocBook/docs/images/ch1-6.PNG differ diff --git a/DocBook/docs/images/ch1-8.PNG b/DocBook/docs/images/ch1-8.PNG index 666170cc..b4ca9ab2 100644 Binary files a/DocBook/docs/images/ch1-8.PNG and b/DocBook/docs/images/ch1-8.PNG differ diff --git a/DocBook/docs/images/ch1-9.PNG b/DocBook/docs/images/ch1-9.PNG index f6d9bdbf..74da5ff8 100644 Binary files a/DocBook/docs/images/ch1-9.PNG and b/DocBook/docs/images/ch1-9.PNG differ diff --git a/DocBook/docs/images/ch10ws-1ee.png b/DocBook/docs/images/ch10ws-1ee.png new file mode 100644 index 00000000..8673736d Binary files /dev/null and b/DocBook/docs/images/ch10ws-1ee.png differ diff --git a/DocBook/docs/images/ch10ws-1eee.png b/DocBook/docs/images/ch10ws-1eee.png new file mode 100644 index 00000000..f52aa1a4 Binary files /dev/null and b/DocBook/docs/images/ch10ws-1eee.png differ diff --git a/DocBook/docs/images/ch13-18.PNG b/DocBook/docs/images/ch13-18.PNG index 38e6d1cc..64351644 100644 Binary files a/DocBook/docs/images/ch13-18.PNG and b/DocBook/docs/images/ch13-18.PNG differ diff --git a/DocBook/docs/images/ch13-4.PNG b/DocBook/docs/images/ch13-4.PNG index b8e7b186..8d7b6937 100644 Binary files a/DocBook/docs/images/ch13-4.PNG and b/DocBook/docs/images/ch13-4.PNG differ diff --git a/DocBook/docs/images/ch13-4a.PNG b/DocBook/docs/images/ch13-4a.PNG new file mode 100644 index 00000000..58a2c706 Binary files /dev/null and b/DocBook/docs/images/ch13-4a.PNG differ diff --git a/DocBook/docs/images/ch13-5.PNG b/DocBook/docs/images/ch13-5.PNG index 98cad5c7..8d659a16 100644 Binary files a/DocBook/docs/images/ch13-5.PNG and b/DocBook/docs/images/ch13-5.PNG differ diff --git a/DocBook/docs/images/ch13-5a.PNG b/DocBook/docs/images/ch13-5a.PNG new file mode 100644 index 00000000..f351b547 Binary files /dev/null and b/DocBook/docs/images/ch13-5a.PNG differ diff --git a/DocBook/docs/images/ch13-6.PNG b/DocBook/docs/images/ch13-6.PNG index d9b0b16e..f2593d84 100644 Binary files a/DocBook/docs/images/ch13-6.PNG and b/DocBook/docs/images/ch13-6.PNG differ diff --git a/DocBook/docs/images/ch13-6a.PNG b/DocBook/docs/images/ch13-6a.PNG new file mode 100644 index 00000000..d6a09554 Binary files /dev/null and b/DocBook/docs/images/ch13-6a.PNG differ diff --git a/DocBook/docs/images/ch13-7.PNG b/DocBook/docs/images/ch13-7.PNG index f7512412..7659067e 100644 Binary files a/DocBook/docs/images/ch13-7.PNG and b/DocBook/docs/images/ch13-7.PNG differ diff --git a/DocBook/docs/images/ch13-7a.PNG b/DocBook/docs/images/ch13-7a.PNG new file mode 100644 index 00000000..7205e9df Binary files /dev/null and b/DocBook/docs/images/ch13-7a.PNG differ diff --git a/DocBook/docs/images/ch13-8.PNG b/DocBook/docs/images/ch13-8.PNG index 276cea40..9d0b34b8 100644 Binary files a/DocBook/docs/images/ch13-8.PNG and b/DocBook/docs/images/ch13-8.PNG differ diff --git a/DocBook/docs/images/ch13-8a.PNG b/DocBook/docs/images/ch13-8a.PNG index 38842a56..f5464b8d 100644 Binary files a/DocBook/docs/images/ch13-8a.PNG and b/DocBook/docs/images/ch13-8a.PNG differ diff --git a/DocBook/docs/images/ch13-8aa.PNG b/DocBook/docs/images/ch13-8aa.PNG new file mode 100644 index 00000000..cec61ea9 Binary files /dev/null and b/DocBook/docs/images/ch13-8aa.PNG differ diff --git a/DocBook/docs/images/ch13-8aaa.PNG b/DocBook/docs/images/ch13-8aaa.PNG new file mode 100644 index 00000000..a51d0eaf Binary files /dev/null and b/DocBook/docs/images/ch13-8aaa.PNG differ diff --git a/DocBook/docs/images/ch2-10.PNG b/DocBook/docs/images/ch2-10.PNG index 61ac6f66..5fc0ff42 100644 Binary files a/DocBook/docs/images/ch2-10.PNG and b/DocBook/docs/images/ch2-10.PNG differ diff --git a/DocBook/docs/images/ch2-10a.PNG b/DocBook/docs/images/ch2-10a.PNG new file mode 100644 index 00000000..6bb484b7 Binary files /dev/null and b/DocBook/docs/images/ch2-10a.PNG differ diff --git a/DocBook/docs/images/ch2-11.PNG b/DocBook/docs/images/ch2-11.PNG index 4c34b532..854baaad 100644 Binary files a/DocBook/docs/images/ch2-11.PNG and b/DocBook/docs/images/ch2-11.PNG differ diff --git a/DocBook/docs/images/ch2-12.PNG b/DocBook/docs/images/ch2-12.PNG index c287b188..ae649607 100644 Binary files a/DocBook/docs/images/ch2-12.PNG and b/DocBook/docs/images/ch2-12.PNG differ diff --git a/DocBook/docs/images/ch2-13.PNG b/DocBook/docs/images/ch2-13.PNG index 46bd543b..84a5e08e 100644 Binary files a/DocBook/docs/images/ch2-13.PNG and b/DocBook/docs/images/ch2-13.PNG differ diff --git a/DocBook/docs/images/ch2-14.PNG b/DocBook/docs/images/ch2-14.PNG index 79d1f113..c178941e 100644 Binary files a/DocBook/docs/images/ch2-14.PNG and b/DocBook/docs/images/ch2-14.PNG differ diff --git a/DocBook/docs/images/ch2-15.PNG b/DocBook/docs/images/ch2-15.PNG index 888f9f3a..2cdf4fd0 100644 Binary files a/DocBook/docs/images/ch2-15.PNG and b/DocBook/docs/images/ch2-15.PNG differ diff --git a/DocBook/docs/images/ch2-16.PNG b/DocBook/docs/images/ch2-16.PNG index 57c53329..90ce3852 100644 Binary files a/DocBook/docs/images/ch2-16.PNG and b/DocBook/docs/images/ch2-16.PNG differ diff --git a/DocBook/docs/images/ch2-16a.PNG b/DocBook/docs/images/ch2-16a.PNG index b9c916c7..5f6a9a55 100644 Binary files a/DocBook/docs/images/ch2-16a.PNG and b/DocBook/docs/images/ch2-16a.PNG differ diff --git a/DocBook/docs/images/ch2-16aa.PNG b/DocBook/docs/images/ch2-16aa.PNG new file mode 100644 index 00000000..48e9ca7c Binary files /dev/null and b/DocBook/docs/images/ch2-16aa.PNG differ diff --git a/DocBook/docs/images/ch2-16aaa.PNG b/DocBook/docs/images/ch2-16aaa.PNG new file mode 100644 index 00000000..321c1516 Binary files /dev/null and b/DocBook/docs/images/ch2-16aaa.PNG differ diff --git a/DocBook/docs/images/ch2-16aaaa.PNG b/DocBook/docs/images/ch2-16aaaa.PNG new file mode 100644 index 00000000..aa12191e Binary files /dev/null and b/DocBook/docs/images/ch2-16aaaa.PNG differ diff --git a/DocBook/docs/images/ch2-16c.PNG b/DocBook/docs/images/ch2-16c.PNG index 0c330456..7dc732a2 100644 Binary files a/DocBook/docs/images/ch2-16c.PNG and b/DocBook/docs/images/ch2-16c.PNG differ diff --git a/DocBook/docs/images/ch2-2.PNG b/DocBook/docs/images/ch2-2.PNG index 275a2c7c..49b0b9a8 100644 Binary files a/DocBook/docs/images/ch2-2.PNG and b/DocBook/docs/images/ch2-2.PNG differ diff --git a/DocBook/docs/images/ch2-2a.PNG b/DocBook/docs/images/ch2-2a.PNG new file mode 100644 index 00000000..3bb10608 Binary files /dev/null and b/DocBook/docs/images/ch2-2a.PNG differ diff --git a/DocBook/docs/images/ch2-2aa.PNG b/DocBook/docs/images/ch2-2aa.PNG new file mode 100644 index 00000000..800835f2 Binary files /dev/null and b/DocBook/docs/images/ch2-2aa.PNG differ diff --git a/DocBook/docs/images/ch2-4.PNG b/DocBook/docs/images/ch2-4.PNG index dc8c071f..9247c6fa 100644 Binary files a/DocBook/docs/images/ch2-4.PNG and b/DocBook/docs/images/ch2-4.PNG differ diff --git a/DocBook/docs/images/ch2-5.PNG b/DocBook/docs/images/ch2-5.PNG index 6e85b503..81a46aa5 100644 Binary files a/DocBook/docs/images/ch2-5.PNG and b/DocBook/docs/images/ch2-5.PNG differ diff --git a/DocBook/docs/images/ch2-6.PNG b/DocBook/docs/images/ch2-6.PNG index 722cf4c7..1a49fd52 100644 Binary files a/DocBook/docs/images/ch2-6.PNG and b/DocBook/docs/images/ch2-6.PNG differ diff --git a/DocBook/docs/images/ch2-7.PNG b/DocBook/docs/images/ch2-7.PNG index 325235da..bd2450f9 100644 Binary files a/DocBook/docs/images/ch2-7.PNG and b/DocBook/docs/images/ch2-7.PNG differ diff --git a/DocBook/docs/images/ch2-8.PNG b/DocBook/docs/images/ch2-8.PNG index f5b49cc2..87fdd850 100644 Binary files a/DocBook/docs/images/ch2-8.PNG and b/DocBook/docs/images/ch2-8.PNG differ diff --git a/DocBook/docs/images/ch2-8a.PNG b/DocBook/docs/images/ch2-8a.PNG new file mode 100644 index 00000000..6677c30e Binary files /dev/null and b/DocBook/docs/images/ch2-8a.PNG differ diff --git a/DocBook/docs/images/ch2-9.PNG b/DocBook/docs/images/ch2-9.PNG index f40bb8d1..2b4736a1 100644 Binary files a/DocBook/docs/images/ch2-9.PNG and b/DocBook/docs/images/ch2-9.PNG differ diff --git a/DocBook/docs/images/ch3-1.PNG b/DocBook/docs/images/ch3-1.PNG index 907313c2..ad946537 100644 Binary files a/DocBook/docs/images/ch3-1.PNG and b/DocBook/docs/images/ch3-1.PNG differ diff --git a/DocBook/docs/images/ch4-15.PNG b/DocBook/docs/images/ch4-15.PNG index 615ef055..d1cc1682 100644 Binary files a/DocBook/docs/images/ch4-15.PNG and b/DocBook/docs/images/ch4-15.PNG differ diff --git a/DocBook/docs/images/ch4-15p.PNG b/DocBook/docs/images/ch4-15p.PNG index a9c037f6..6884648e 100644 Binary files a/DocBook/docs/images/ch4-15p.PNG and b/DocBook/docs/images/ch4-15p.PNG differ diff --git a/DocBook/docs/images/ch4-18.PNG b/DocBook/docs/images/ch4-18.PNG index b6c4f12c..4ca46f5b 100644 Binary files a/DocBook/docs/images/ch4-18.PNG and b/DocBook/docs/images/ch4-18.PNG differ diff --git a/DocBook/docs/images/ch4-4.PNG b/DocBook/docs/images/ch4-4.PNG index 56729318..d6769e6c 100644 Binary files a/DocBook/docs/images/ch4-4.PNG and b/DocBook/docs/images/ch4-4.PNG differ diff --git a/DocBook/docs/images/ch4-4a.PNG b/DocBook/docs/images/ch4-4a.PNG new file mode 100644 index 00000000..071f8dcc Binary files /dev/null and b/DocBook/docs/images/ch4-4a.PNG differ diff --git a/DocBook/docs/images/ch4-5.PNG b/DocBook/docs/images/ch4-5.PNG index 16d2aed5..2ff4c3ef 100644 Binary files a/DocBook/docs/images/ch4-5.PNG and b/DocBook/docs/images/ch4-5.PNG differ diff --git a/DocBook/docs/images/ch4-5a.PNG b/DocBook/docs/images/ch4-5a.PNG new file mode 100644 index 00000000..4cd43633 Binary files /dev/null and b/DocBook/docs/images/ch4-5a.PNG differ diff --git a/DocBook/docs/images/ch4-6.PNG b/DocBook/docs/images/ch4-6.PNG index 92f092cd..e46846f7 100644 Binary files a/DocBook/docs/images/ch4-6.PNG and b/DocBook/docs/images/ch4-6.PNG differ diff --git a/DocBook/docs/images/ch4-6a.PNG b/DocBook/docs/images/ch4-6a.PNG new file mode 100644 index 00000000..bdd7663f Binary files /dev/null and b/DocBook/docs/images/ch4-6a.PNG differ diff --git a/DocBook/docs/images/ch4-7.PNG b/DocBook/docs/images/ch4-7.PNG index 93493930..d2595fcc 100644 Binary files a/DocBook/docs/images/ch4-7.PNG and b/DocBook/docs/images/ch4-7.PNG differ diff --git a/DocBook/docs/images/ch4-7a.PNG b/DocBook/docs/images/ch4-7a.PNG index f4726a47..9d3dab69 100644 Binary files a/DocBook/docs/images/ch4-7a.PNG and b/DocBook/docs/images/ch4-7a.PNG differ diff --git a/DocBook/docs/images/ch4-7aa.PNG b/DocBook/docs/images/ch4-7aa.PNG new file mode 100644 index 00000000..8dafd223 Binary files /dev/null and b/DocBook/docs/images/ch4-7aa.PNG differ diff --git a/DocBook/docs/images/ch4-7aaa.PNG b/DocBook/docs/images/ch4-7aaa.PNG new file mode 100644 index 00000000..f65d7501 Binary files /dev/null and b/DocBook/docs/images/ch4-7aaa.PNG differ diff --git a/DocBook/docs/images/ch4-8.PNG b/DocBook/docs/images/ch4-8.PNG index 00b2e25c..89394521 100644 Binary files a/DocBook/docs/images/ch4-8.PNG and b/DocBook/docs/images/ch4-8.PNG differ diff --git a/DocBook/docs/images/ch4-8a.PNG b/DocBook/docs/images/ch4-8a.PNG new file mode 100644 index 00000000..d442e81e Binary files /dev/null and b/DocBook/docs/images/ch4-8a.PNG differ diff --git a/DocBook/docs/images/ch5-2.PNG b/DocBook/docs/images/ch5-2.PNG index 4c3dfced..faba7236 100644 Binary files a/DocBook/docs/images/ch5-2.PNG and b/DocBook/docs/images/ch5-2.PNG differ diff --git a/DocBook/docs/images/ch5-6a.png b/DocBook/docs/images/ch5-6a.png new file mode 100644 index 00000000..870e9e2d Binary files /dev/null and b/DocBook/docs/images/ch5-6a.png differ diff --git a/DocBook/docs/images/ch5-6aa.png b/DocBook/docs/images/ch5-6aa.png new file mode 100644 index 00000000..9099cb43 Binary files /dev/null and b/DocBook/docs/images/ch5-6aa.png differ diff --git a/DocBook/docs/images/ch5-6aaa.png b/DocBook/docs/images/ch5-6aaa.png new file mode 100644 index 00000000..76c8ad15 Binary files /dev/null and b/DocBook/docs/images/ch5-6aaa.png differ diff --git a/DocBook/docs/images/ch7-10.png b/DocBook/docs/images/ch7-10.png index f1680a84..b310da05 100644 Binary files a/DocBook/docs/images/ch7-10.png and b/DocBook/docs/images/ch7-10.png differ diff --git a/DocBook/docs/images/ch7-10a.png b/DocBook/docs/images/ch7-10a.png new file mode 100644 index 00000000..a13c786d Binary files /dev/null and b/DocBook/docs/images/ch7-10a.png differ diff --git a/DocBook/docs/images/ch7-10aa.png b/DocBook/docs/images/ch7-10aa.png new file mode 100644 index 00000000..558972ca Binary files /dev/null and b/DocBook/docs/images/ch7-10aa.png differ diff --git a/DocBook/docs/images/ch7-3.PNG b/DocBook/docs/images/ch7-3.PNG index 35b4cc48..e3443355 100644 Binary files a/DocBook/docs/images/ch7-3.PNG and b/DocBook/docs/images/ch7-3.PNG differ diff --git a/DocBook/docs/images/ch7-5.PNG b/DocBook/docs/images/ch7-5.PNG index 89afd37b..4d16f0ed 100644 Binary files a/DocBook/docs/images/ch7-5.PNG and b/DocBook/docs/images/ch7-5.PNG differ diff --git a/DocBook/docs/images/ch7-7.PNG b/DocBook/docs/images/ch7-7.PNG index c44c3213..10db3963 100644 Binary files a/DocBook/docs/images/ch7-7.PNG and b/DocBook/docs/images/ch7-7.PNG differ diff --git a/DocBook/docs/images/ch7-9a.PNG b/DocBook/docs/images/ch7-9a.PNG new file mode 100644 index 00000000..4158c226 Binary files /dev/null and b/DocBook/docs/images/ch7-9a.PNG differ diff --git a/DocBook/docs/images/ch7-9aa.PNG b/DocBook/docs/images/ch7-9aa.PNG new file mode 100644 index 00000000..0c4d74da Binary files /dev/null and b/DocBook/docs/images/ch7-9aa.PNG differ