Merge pull request #3 from alexey2k/fixes.n1

Several fixes/improvements for sysbench-tpcc

Author: vadimtk

Diff for: tpcc.lua

@@ -35,24 +35,19 @@ function event()
   -- print( NURand (1023,1,3000))
   local trx_type = sysbench.rand.uniform(1,23)
   if trx_type <= 10 then
---    print("new_order")
-    trx=new_order
+    trx="new_order"
   elseif trx_type <= 20 then
---   print("payment")
-    trx=payment
+    trx="payment"
   elseif trx_type <= 21 then
- --   print("order status")
-    trx=orderstatus
+    trx="orderstatus"
   elseif trx_type <= 22 then
---    print("delivery")
-    trx=delivery
+    trx="delivery"
   elseif trx_type <= 23 then
---    print("stock")
-    trx=stocklevel
+    trx="stocklevel"
   end
 
 -- Repeat transaction execution until success
-  while not pcall(function () trx() end ) do 
+  while not pcall(function () _G[trx]() end ) do 
     con:query("ROLLBACK")
   end
 

Diff for: tpcc_common.lua

@@ -18,6 +18,13 @@
 -- Common code for TPCC benchmarks.
 -- -----------------------------------------------------------------------------
 
+ffi = require("ffi")
+
+ffi.cdef[[
+void sb_counter_inc(int, sb_counter_type);
+]]
+
+
 function init()
    assert(event ~= nil,
           "this script is meant to be included by other TPCC scripts and " ..
@@ -337,14 +344,12 @@ function set_isolation_level(drv,con)
         elseif sysbench.opt.trx_level == "SER" then
             isolation_level="SERIALIZABLE"
         end
-
+       
         rs=con:query("SHOW VARIABLES LIKE 't%_isolation'")
         row = rs:fetch_row()
         isolation_variable = row[1]
 
         con:query("SET SESSION " .. isolation_variable .. "='".. isolation_level .."'")
---        con:query("SET SESSION transaction_isolation='".. isolation_level .."'")
---        con:query("SET SESSION tx_isolation='".. isolation_level .."'")
    end
 end
 

Diff for: tpcc_run.lua

@@ -160,10 +160,11 @@ function new_order()
 	  local i_data
 
 	  if rs.nrows == 0 then
-        --print("ROLLBACK")
-        con:query("ROLLBACK")
+            --print("ROLLBACK")
+            ffi.C.sb_counter_inc(sysbench.tid, ffi.C.SB_CNT_ERROR)
+            con:query("ROLLBACK")
 	    return	
-      end
+          end
 
 	  for i = 1, rs.nrows do
 	    row = rs:fetch_row()