Merge pull request #1 from alexey2k/master

Various fixes

Author: vadimtk

tpcc.lua

@@ -26,35 +26,33 @@ function thread_init()
    drv = sysbench.sql.driver()
    con = drv:connect()
 
-   if drv:name() == "mysql"
-   then
-        if sysbench.opt.trx_level == "RR" then
-            con:query("SET SESSION transaction_isolation='REPEATABLE-READ'")
-        elseif sysbench.opt.trx_level == "RC" then
-            con:query("SET SESSION transaction_isolation='READ-COMMITTED'")
-        elseif sysbench.opt.trx_level == "SER" then
-            con:query("SET SESSION transaction_isolation='SERIALIZABLE'")
-        end
-   end
+   set_isolation_level(drv,con) 
+   
 end
 
 function event()
   -- print( NURand (1023,1,3000))
-  local trx = sysbench.rand.uniform(1,23)
-  if trx <= 10 then
-    new_order()
-  elseif trx <= 20 then
-    payment()
-  elseif trx <= 21 then
+  local trx_type = sysbench.rand.uniform(1,23)
+  if trx_type <= 10 then
+--    print("new_order")
+    trx=new_order
+  elseif trx_type <= 20 then
+--   print("payment")
+    trx=payment
+  elseif trx_type <= 21 then
  --   print("order status")
-    orderstatus()
-  elseif trx <= 22 then
- --   print("delivery")
-    delivery()
-  elseif trx <= 23 then
- --   print("delivery")
-    stocklevel()
+    trx=orderstatus
+  elseif trx_type <= 22 then
+--    print("delivery")
+    trx=delivery
+  elseif trx_type <= 23 then
+--    print("stock")
+    trx=stocklevel
   end
+
+-- Repeat transaction execution until success
+  while not pcall(function () trx() end ) do end
+
 end
 
 -- vim:ts=4 ss=4 sw=4 expandtab

tpcc_common.lua

@@ -324,24 +324,33 @@ function create_tables(drv, con, table_num)
 
 end
 
-function load_tables(drv, con, warehouse_num)
-   local id_index_def, id_def
-   local engine_def = ""
-   local extra_table_options = ""
-   local query
 
+function set_isolation_level(drv,con)
    if drv:name() == "mysql"
    then
         if sysbench.opt.trx_level == "RR" then
-            con:query("SET SESSION transaction_isolation='REPEATABLE-READ'")
+            isolation_level="REPEATABLE-READ"
         elseif sysbench.opt.trx_level == "RC" then
-            con:query("SET SESSION transaction_isolation='READ-COMMITTED'")
+            isolation_level="READ-COMMITTED"
         elseif sysbench.opt.trx_level == "SER" then
-            con:query("SET SESSION transaction_isolation='SERIALIZABLE'")
+            isolation_level="SERIALIZABLE"
         end
+
+        con:query("SET SESSION transaction_isolation='".. isolation_level .."'")
+--        con:query("SET SESSION tx_isolation='".. isolation_level .."'")
    end
+end
 
 
+
+function load_tables(drv, con, warehouse_num)
+   local id_index_def, id_def
+   local engine_def = ""
+   local extra_table_options = ""
+   local query
+
+   set_isolation_level(drv,con)
+   
    -- print(string.format("Creating warehouse: %d\n", warehouse_num))
 
    for table_num = 1, sysbench.opt.tables do