Merge pull request #77 from sm-shaw/master

Updates to HammerDB v3.3. This pull request was accepted as a passed motion of the TPC OSS subcommittee on November 5th, 2019
TPC-Council · Nov 5, 2019 · 2602f5d · 2602f5d
2 parents 6b64ca0 + 71a657a
commit 2602f5d
Show file tree

Hide file tree

Showing 35 changed files with 4,785 additions and 382 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -863,14 +863,14 @@ Added Oracle Database Metrics based on Ashmon by Kyle Hailey, used with permissi
 
 ---------------------------------------------------------------------
 
-Version 3.2 2019
+Version 3.2 Jul 2019
 
 Bug fixes 
 
 [#132] Running buildschema in CLI for TPC-H has incorrect VU count
 [#133] Use all warehouses omits warehouse 1 and fails if more VUsers than warehouses
 [#134] Buildschema in CLI errors if 1 virtual user and more than 1 warehouse
-[GH#58] Bug when building TPC-C and TPC-H on Azure
+[TPC-Council#58] Bug when building TPC-C and TPC-H on Azure
 
 Updated time profiler to report percentile values at 10 second intervals
 
@@ -881,3 +881,18 @@ Updated hammerdbcli to enable autostart with script
 Added PostgreSQL v11+ compatible Stored Procedures to use instead of Functions
 
 Added HTTP Web Service interface
+
+---------------------------------------------------------------------
+
+Version 3.3 Oct 2019
+
+Updated Binaries to:
+
+tcl8.6.9, tk8.6.9, thread2.8.4, oratcl4.6, mysqltcl3.052, pgtcl2.1.1, db2tcl2.0.0, redis 0.1
+
+Issues
+
+TPC-Council#44 Event driven virtual user and connection scaling with promise package
+TPC-Council#72 HammerDb crashes in tclodbc - converted SQL Server TPC-C/TPC-H build and driver to tdbc::odbc
+TPC-Council#75 TPC-H cannot be executed for AWS RDS Oracle
+
diff --git a/agent/agent b/agent/agent
@@ -40,7 +40,7 @@ namespace import comm::*
 interp recursionlimit {} 3000
 global agentlist S iswin
 set iswin "false"
-set version 3.2
+set version 3.3
 
 if {$tcl_platform(platform) == "windows"} { 
 	package require twapi 

diff --git a/config/database.xml b/config/database.xml
@@ -13,9 +13,9 @@
 	<name>MSSQLServer</name>
 	<description>SQL Server</description>
 	<prefix>mssqls</prefix>
-	<library>tclodbc 2.5.2</library>
+	<library>tdbc::odbc 1.1.0</library>
 	<workloads>TPC-C TPC-H</workloads>
-	<commands>database odbc</commands>
+	<commands>odbc execute paramtype prepare connection allrows</commands>
 </mssqlserver>
 <db2>
 	<name>Db2</name>

diff --git a/config/db2.xml b/config/db2.xml
@@ -26,6 +26,10 @@
 	    <db2_monreport>0</db2_monreport>
             <db2_allwarehouse>false</db2_allwarehouse>
             <db2_timeprofile>false</db2_timeprofile>
+	    <db2_async_scale>false</db2_async_scale>
+            <db2_async_client>10</db2_async_client>
+            <db2_async_verbose>false</db2_async_verbose>
+            <db2_async_delay>1000</db2_async_delay>
         </driver>
     </tpcc>
     <tpch>

diff --git a/config/mssqlserver.xml b/config/mssqlserver.xml
@@ -32,6 +32,10 @@
             <mssqls_duration>5</mssqls_duration>
             <mssqls_allwarehouse>false</mssqls_allwarehouse>
             <mssqls_timeprofile>false</mssqls_timeprofile>
+	    <mssqls_async_scale>false</mssqls_async_scale>
+            <mssqls_async_client>10</mssqls_async_client>
+            <mssqls_async_verbose>false</mssqls_async_verbose>
+            <mssqls_async_delay>1000</mssqls_async_delay>
         </driver>
     </tpcc>
     <tpch>

diff --git a/config/mysql.xml b/config/mysql.xml
@@ -23,6 +23,10 @@
             <mysql_duration>5</mysql_duration>
             <mysql_allwarehouse>false</mysql_allwarehouse>
             <mysql_timeprofile>false</mysql_timeprofile>
+	    <mysql_async_scale>false</mysql_async_scale>
+            <mysql_async_client>10</mysql_async_client>
+            <mysql_async_verbose>false</mysql_async_verbose>
+            <mysql_async_delay>1000</mysql_async_delay>
         </driver>
     </tpcc>
     <tpch>

diff --git a/config/oracle.xml b/config/oracle.xml
@@ -29,6 +29,10 @@
             <duration>5</duration>
             <allwarehouse>false</allwarehouse>
             <timeprofile>false</timeprofile>
+	    <async_scale>false</async_scale>
+	    <async_client>10</async_client>
+	    <async_verbose>false</async_verbose>
+	    <async_delay>1000</async_delay>
         </driver>
     </tpcc>
     <tpch>

diff --git a/config/postgresql.xml b/config/postgresql.xml
@@ -28,6 +28,10 @@
             <pg_duration>5</pg_duration>
             <pg_allwarehouse>false</pg_allwarehouse>
             <pg_timeprofile>false</pg_timeprofile>
+	    <pg_async_scale>false</pg_async_scale>
+            <pg_async_client>10</pg_async_client>
+            <pg_async_verbose>false</pg_async_verbose>
+            <pg_async_delay>1000</pg_async_delay>
         </driver>
     </tpcc>
     <tpch>

diff --git a/config/redis.xml b/config/redis.xml
@@ -19,6 +19,10 @@
             <redis_duration>5</redis_duration>
             <redis_allwarehouse>false</redis_allwarehouse>
             <redis_timeprofile>false</redis_timeprofile>
+	    <redis_async_scale>false</redis_async_scale>
+            <redis_async_client>10</redis_async_client>
+            <redis_async_verbose>false</redis_async_verbose>
+            <redis_async_delay>1000</redis_async_delay>
         </driver>
     </tpcc>
 </redis>
diff --git a/hammerdb b/hammerdb
@@ -27,7 +27,7 @@ exit
 # License along with this program; If not, see <https://www.gnu.org/licenses/>
 ########################################################################
 global hdb_version
-set hdb_version "v3.2"
+set hdb_version "v3.3"
 set mainGeometry +10+10
 set UserDefaultDir [ file dirname [ info script ] ]
 ::tcl::tm::path add "$UserDefaultDir/modules"

diff --git a/hammerdbcli b/hammerdbcli
@@ -25,7 +25,7 @@ exec ./bin/tclsh8.6 "$0" ${1+"$@"}
 # License along with this program; If not, see <https://www.gnu.org/licenses/>
 ########################################################################
 global hdb_version
-set hdb_version "v3.2"
+set hdb_version "v3.3"
 puts "HammerDB CLI $hdb_version"
 puts "Copyright (C) 2003-2019 Steve Shaw"
 puts "Type \"help\" for a list of commands"

diff --git a/hammerdbws b/hammerdbws
@@ -8,7 +8,7 @@ export PATH=./bin:$PATH
 exec ./bin/tclsh8.6 "$0" ${1+"$@"}
 ########################################################################
 # HammerDB
-# Copyright (C) 2003-2018 Steve Shaw
+# Copyright (C) 2003-2019 Steve Shaw
 # Author contact information at: http://www.hammerdb.com
 #
 # This program is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@ exec ./bin/tclsh8.6 "$0" ${1+"$@"}
 # License along with this program; If not, see <https://www.gnu.org/licenses/>
 ########################################################################
 global hdb_version
-set hdb_version "v3.2"
+set hdb_version "v3.3"
 puts "HammerDB Web Service $hdb_version"
 puts "Copyright (C) 2003-2019 Steve Shaw"
 puts "Type \"help\" for a list of commands"