Merge pull request #2 from Percona-Lab/extracheck

Extracheck

Author: vadimtk

tpcc.lua

@@ -27,6 +27,7 @@ function thread_init()
    con = drv:connect()
 
    set_isolation_level(drv,con) 
+   con:query("SET autocommit=0")
 
 end
 
@@ -51,7 +52,9 @@ function event()
   end
 
 -- Repeat transaction execution until success
-  while not pcall(function () trx() end ) do end
+  while not pcall(function () trx() end ) do 
+    con:query("ROLLBACK")
+  end
 
 end
 
@@ -60,4 +63,5 @@ function sysbench.hooks.report_intermediate(stat)
    sysbench.report_csv(stat)
 end
 
+
 -- vim:ts=4 ss=4 sw=4 expandtab

tpcc_check.lua

@@ -192,6 +192,46 @@ function check_tables(drv, con, warehouse_num)
     else
         print(string.format("Check 9, warehouse: %d FAILED!!!", warehouse_num))
     end
+
+    local pass10 = 1
+    for table_num = 1, sysbench.opt.tables do 
+        -- print(string.format("Checking  tables: %d for warehouse: %d\n", table_num, warehouse_num))
+        rs  = con:query(string.format("SELECT count(*) FROM (  SELECT  c.c_id, c.c_d_id, c.c_w_id, c.c_balance c1, (SELECT sum(ol_amount) FROM orders%d STRAIGHT_JOIN order_line%d WHERE OL_W_ID=O_W_ID AND OL_D_ID = O_D_ID AND OL_O_ID = O_ID AND OL_DELIVERY_D IS NOT NULL AND O_W_ID=c.c_w_id AND O_D_ID=c.C_D_ID AND O_C_ID=c.C_ID) sm, (SELECT  sum(h_amount)  from  history%d WHERE H_C_W_ID=c.C_W_ID AND H_C_D_ID=c.C_D_ID AND H_C_ID=c.C_ID) smh FROM customer%d c WHERE  c.c_w_id=%d ) t where c1<>sm-smh",table_num, table_num, table_num, table_num, warehouse_num))
+        
+        for i = 1, rs.nrows do
+            row = rs:fetch_row()
+            local d1 = tonumber(row[1])
+            if d1 ~= 0 then
+                pass10=0
+            end
+        end
+    end
+    
+    if pass10 == 1 then
+        print(string.format("Check 10, warehouse: %d PASSED", warehouse_num))
+    else
+        print(string.format("Check 10, warehouse: %d FAILED!!!", warehouse_num))
+    end
+
+    local pass12 = 1
+    for table_num = 1, sysbench.opt.tables do 
+        -- print(string.format("Checking  tables: %d for warehouse: %d\n", table_num, warehouse_num))
+        rs  = con:query(string.format("SELECT count(*) FROM (SELECT  c.c_id, c.c_d_id, c.c_balance c1, c_ytd_payment, (SELECT sum(ol_amount) FROM orders%d STRAIGHT_JOIN order_line%d WHERE OL_W_ID=O_W_ID AND OL_D_ID = O_D_ID AND OL_O_ID = O_ID AND OL_DELIVERY_D IS NOT NULL AND O_W_ID=c.c_w_id AND O_D_ID=c.C_D_ID AND O_C_ID=c.C_ID) sm FROM customer%d c WHERE  c.c_w_id=%d) t1 WHERE c1+c_ytd_payment <> sm " ,table_num, table_num, table_num, warehouse_num))
+        
+        for i = 1, rs.nrows do
+            row = rs:fetch_row()
+            local d1 = tonumber(row[1])
+            if d1 ~= 0 then
+                pass12=0
+            end
+        end
+    end
+    
+    if pass12 == 1 then
+        print(string.format("Check 12, warehouse: %d PASSED", warehouse_num))
+    else
+        print(string.format("Check 12, warehouse: %d FAILED!!!", warehouse_num))
+    end
 end
 
 

tpcc_common.lua

@@ -469,9 +469,9 @@ function load_tables(drv, con, warehouse_num)
 -- 3,000 rows in the ORDER table with
    a_counts[warehouse_num][d_id][o_id] = sysbench.rand.uniform(5,15)
 
-      query = string.format([[(%d, %d, %d, %d, NOW(), %d, %d, 1 )]],
+      query = string.format([[(%d, %d, %d, %d, NOW(), %s, %d, 1 )]],
 	o_id, d_id, warehouse_num, tab[o_id], 
-        sysbench.rand.uniform(1,10),
+        o_id < 2101 and sysbench.rand.uniform(1,10) or "NULL",
         a_counts[warehouse_num][d_id][o_id]
         )
       con:bulk_insert_next(query)
@@ -492,9 +492,10 @@ function load_tables(drv, con, warehouse_num)
    for o_id = 1 , 3000 do
    for ol_id = 1, a_counts[warehouse_num][d_id][o_id] do 
 
-      query = string.format([[(%d, %d, %d, %d, %d, %d, NOW(), 5, %f, '%s' )]],
-	o_id, d_id, warehouse_num, ol_id, sysbench.rand.uniform(1, MAXITEMS), warehouse_num,
-        sysbench.rand.uniform_double()*9999.99,
+      query = string.format([[(%d, %d, %d, %d, %d, %d, %s, 5, %f, '%s' )]],
+	    o_id, d_id, warehouse_num, ol_id, sysbench.rand.uniform(1, MAXITEMS), warehouse_num,
+        o_id < 2101 and "NOW()" or "NULL", 
+        o_id < 2101 and 0 or sysbench.rand.uniform_double()*9999.99,
 	string.rep(sysbench.rand.string("@"),24)
         )
       con:bulk_insert_next(query)

tpcc_run.lua

@@ -379,7 +379,7 @@ function payment()
 
 	rs = con:query([[SELECT c_first, c_middle, c_last, c_street_1,
                          c_street_2, c_city, c_state, c_zip, c_phone,
-                         c_credit, c_credit_lim, c_discount, c_balance, c_since
+                         c_credit, c_credit_lim, c_discount, c_balance, c_ytd_payment, c_since
 			   FROM customer]]..table_num..
 			 " WHERE c_w_id = ".. w_id.. " AND c_d_id="..c_d_id ..
 			 " AND c_id="..c_id.." FOR UPDATE")
@@ -396,6 +396,7 @@ function payment()
   local c_credit_lim
   local c_discount
   local c_balance
+  local c_ytd_payment
   local c_since
   for i = 1, rs.nrows do
 	row = rs:fetch_row()
@@ -412,11 +413,13 @@ function payment()
 	c_credit_lim = row[11]
 	c_discount = row[12]
 	c_balance = row[13]
-	c_since = row[14]
+	c_ytd_payment = row[14]
+	c_since = row[15]
     -- print(row[1], row[2], row[3], row[4])
   end
 
   c_balance = tonumber(c_balance) - h_amount
+  c_ytd_payment = tonumber(c_ytd_payment) + h_amount
 
     if c_credit == "BC" then
 -- SELECT c_data 
@@ -445,12 +448,12 @@ function payment()
     --			AND c_d_id = :c_d_id 
     --			AND c_id = :c_id
         con:query("UPDATE customer"..table_num..
-                 " SET c_balance="..c_balance..", c_data='"..c_new_data.."'"..
+                 " SET c_balance="..c_balance..", c_ytd_payment="..c_ytd_payment..",c_data='"..c_new_data.."'"..
                  " WHERE c_w_id = ".. w_id.. " AND c_d_id="..c_d_id ..
                              " AND c_id="..c_id)
     else
         con:query("UPDATE customer"..table_num..
-                 " SET c_balance="..c_balance..
+                 " SET c_balance="..c_balance..", c_ytd_payment="..c_ytd_payment..
                  " WHERE c_w_id = ".. w_id.. " AND c_d_id="..c_d_id ..
                              " AND c_id="..c_id)
 
@@ -596,8 +599,9 @@ function delivery()
 --		                WHERE no_d_id = :d_id AND no_w_id = :w_id;*/
 
         rs = con:query(string.format([[SELECT COALESCE(MIN(no_o_id),0) no_o_id
-                FROM new_orders%d WHERE no_d_id = %d AND no_w_id = %d]],
+                 FROM new_orders%d WHERE no_d_id = %d AND no_w_id = %d FOR UPDATE]],
                       table_num, d_id, w_id))
+                 -- FROM new_orders%d WHERE no_d_id = %d AND no_w_id = %d]],
         local no_o_id
         for i = 1,  rs.nrows do
             row = rs:fetch_row()
@@ -662,7 +666,8 @@ function delivery()
 --		                             c_delivery_cnt = c_delivery_cnt + 1
 --		                WHERE c_id = :c_id AND c_d_id = :d_id AND
 --				c_w_id = :w_id;*/
-        con:query(string.format([[UPDATE customer%d SET c_balance = c_balance + %d,
+--        print(string.format("update customer table %d, cid %d, did %d, wid %d balance %f",table_num, o_c_id, d_id, w_id, sm_ol_amount))  				
+        con:query(string.format([[UPDATE customer%d SET c_balance = c_balance + %f,
                 c_delivery_cnt = c_delivery_cnt + 1
                 WHERE c_id = %d AND c_d_id = %d AND  c_w_id = %d]],
                       table_num, sm_ol_amount, o_c_id, d_id, w_id))