From de528a3817c49ecb594deff00aae665b0d902515 Mon Sep 17 00:00:00 2001 From: Steve Shaw Date: Fri, 12 Jul 2024 11:54:27 +0100 Subject: [PATCH 1/4] Fix bad text index in MySQL connect pool and asynch --- src/mysql/mysqloltp.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mysql/mysqloltp.tcl b/src/mysql/mysqloltp.tcl index 6c9fb7ed..3c52e703 100755 --- a/src/mysql/mysqloltp.tcl +++ b/src/mysql/mysqloltp.tcl @@ -1324,7 +1324,7 @@ mysqlclose $mmysql_handler set syncdrvi(7b) [.ed_mainFrame.mainwin.textFrame.left.text search -backwards {set mmysql_handler [ ConnectToMySQL $host $port $socket $ssl_options $user $password $db ]} end ] .ed_mainFrame.mainwin.textFrame.left.text fastdelete $syncdrvi(7a) $syncdrvi(7b)+1l #Replace individual lines for Asynch - foreach line {{set mysql_handler [ ConnectToMySQLAsynch $host $port $socket $ssl_options $user $password $db $clientname $async_verbose ]} {dict set connlist $id [ set mysql_handler$id [ ConnectToMySQL $1 $2 $3 $4 $5 $6 ] ]} {#puts "sproc_cur:$st connections:[ set $cslist ] cursors:[set $cursor_list] number of cursors:[set $len] execs:[set $cnt]"}} asynchline {{set mmysql_handler [ ConnectToMySQLAsynch $host $port $socket $user $password $db $clientname $async_verbose ]} {dict set connlist $id [ set mysql_handler$id [ ConnectToMySQLAsynch $1 $2 $3 $4 $5 $6 $clientname $async_verbose ] ]} {#puts "$clientname:sproc_cur:$st connections:[ set $cslist ] cursors:[set $cursor_list] number of cursors:[set $len] execs:[set $cnt]"}} { + foreach line {{set mysql_handler [ ConnectToMySQLAsynch $host $port $socket $ssl_options $user $password $db $clientname $async_verbose ]} {dict set connlist $id [ set mysql_handler$id [ ConnectToMySQL $1 $2 $3 $4 $5 $6 $7 ] ]} {#puts "sproc_cur:$st connections:[ set $cslist ] cursors:[set $cursor_list] number of cursors:[set $len] execs:[set $cnt]"}} asynchline {{set mmysql_handler [ ConnectToMySQLAsynch $host $port $socket $user $password $db $clientname $async_verbose ]} {dict set connlist $id [ set mysql_handler$id [ ConnectToMySQLAsynch $1 $2 $3 $4 $5 $6 $clientname $async_verbose ] ]} {#puts "$clientname:sproc_cur:$st connections:[ set $cslist ] cursors:[set $cursor_list] number of cursors:[set $len] execs:[set $cnt]"}} { set index [.ed_mainFrame.mainwin.textFrame.left.text search -backwards $line end ] .ed_mainFrame.mainwin.textFrame.left.text fastdelete $index "$index lineend + 1 char" .ed_mainFrame.mainwin.textFrame.left.text fastinsert $index "$asynchline \n" From da5bfd1b79fe1bd259e15869103f1d4a9c557503 Mon Sep 17 00:00:00 2001 From: Steve Shaw Date: Fri, 12 Jul 2024 11:59:43 +0100 Subject: [PATCH 2/4] Fix searched backwards for string not found in MySQL connect pool and asnych --- src/mariadb/mariaoltp.tcl | 6 ++++++ src/mysql/mysqloltp.tcl | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/mariadb/mariaoltp.tcl b/src/mariadb/mariaoltp.tcl index e8e36dd0..ee10f761 100755 --- a/src/mariadb/mariaoltp.tcl +++ b/src/mariadb/mariaoltp.tcl @@ -1338,7 +1338,13 @@ mariaclose $mmaria_handler #End of run loop is previous line set syncdrvi(3b) [ expr $syncdrvi(3b) - 1 ] #Delete run loop + if { [ string is entier $syncdrvi(3b) ] } { + #CLI + .ed_mainFrame.mainwin.textFrame.left.text fastdelete $syncdrvi(3a) $syncdrvi(3b) + } else { + #GUI .ed_mainFrame.mainwin.textFrame.left.text fastdelete $syncdrvi(3a) $syncdrvi(3b)+1l + } #Replace with asynchronous connect pool version .ed_mainFrame.mainwin.textFrame.left.text fastinsert $syncdrvi(3a) $syncdrvt(3) #Remove extra async connection diff --git a/src/mysql/mysqloltp.tcl b/src/mysql/mysqloltp.tcl index 3c52e703..5da2a7fb 100755 --- a/src/mysql/mysqloltp.tcl +++ b/src/mysql/mysqloltp.tcl @@ -1316,7 +1316,13 @@ mysqlclose $mmysql_handler #End of run loop is previous line set syncdrvi(3b) [ expr $syncdrvi(3b) - 1 ] #Delete run loop + if { [ string is entier $syncdrvi(3b) ] } { + #CLI + .ed_mainFrame.mainwin.textFrame.left.text fastdelete $syncdrvi(3a) $syncdrvi(3b) + } else { + #GUI .ed_mainFrame.mainwin.textFrame.left.text fastdelete $syncdrvi(3a) $syncdrvi(3b)+1l + } #Replace with asynchronous connect pool version .ed_mainFrame.mainwin.textFrame.left.text fastinsert $syncdrvi(3a) $syncdrvt(3) #Remove extra async connection From ec14610f8a5dde0bb96679176b11fb262a0be26a Mon Sep 17 00:00:00 2001 From: Steve Shaw Date: Fri, 12 Jul 2024 12:11:33 +0100 Subject: [PATCH 3/4] Fix searched backwards for string not found in Oracle connect pool an asynch --- src/oracle/oraoltp.tcl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/oracle/oraoltp.tcl b/src/oracle/oraoltp.tcl index 423856bc..94f924b3 100755 --- a/src/oracle/oraoltp.tcl +++ b/src/oracle/oraoltp.tcl @@ -2092,7 +2092,13 @@ proc insert_oraconnectpool_drivescript { testtype timedtype } { #End of run loop is previous line set syncdrvi(3b) [ expr $syncdrvi(3b) - 1 ] #Delete run loop + if { [ string is entier $syncdrvi(3b) ] } { + #CLI + .ed_mainFrame.mainwin.textFrame.left.text fastdelete $syncdrvi(3a) $syncdrvi(3b) + } else { + #GUI .ed_mainFrame.mainwin.textFrame.left.text fastdelete $syncdrvi(3a) $syncdrvi(3b)+1l + } #Replace with asynchronous connect pool version .ed_mainFrame.mainwin.textFrame.left.text fastinsert $syncdrvi(3a) $syncdrvt(3) #Remove extra async connection From 680f6bfeeb2146b206369ae1aa2db3026d1e1125 Mon Sep 17 00:00:00 2001 From: Steve Shaw Date: Fri, 12 Jul 2024 12:15:50 +0100 Subject: [PATCH 4/4] Fix searched backwards for string not found in Db2 connect pool and asynch --- src/db2/db2oltp.tcl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/db2/db2oltp.tcl b/src/db2/db2oltp.tcl index 74af5c68..7dac6056 100755 --- a/src/db2/db2oltp.tcl +++ b/src/db2/db2oltp.tcl @@ -1210,7 +1210,13 @@ proc insert_db2connectpool_drivescript { testtype timedtype } { #End of run loop is previous line set syncdrvi(3b) [ expr $syncdrvi(3b) - 1 ] #Delete run loop + if { [ string is entier $syncdrvi(3b) ] } { + #CLI + .ed_mainFrame.mainwin.textFrame.left.text fastdelete $syncdrvi(3a) $syncdrvi(3b) + } else { + #GUI .ed_mainFrame.mainwin.textFrame.left.text fastdelete $syncdrvi(3a) $syncdrvi(3b)+1l + } #Replace with asynchronous connect pool version .ed_mainFrame.mainwin.textFrame.left.text fastinsert $syncdrvi(3a) $syncdrvt(3) #Remove extra async connection