Merge lp:~stewart/drizzle/embedded-innodb-select-for-update into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

SELECT FOR UPDATE for embedded_innodb.

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-embedded-innodb-param/43/

=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.cc'
--- plugin/embedded_innodb/embedded_innodb_engine.cc	2010-08-12 06:37:45 +0000
+++ plugin/embedded_innodb/embedded_innodb_engine.cc	2010-08-12 06:37:46 +0000
@@ -231,6 +231,90 @@
   return (ib_trx_t*) session->getEngineData(embedded_innodb_engine);
 }
 
+/* This is a superset of the map from innobase plugin.
+   Unlike innobase plugin we don't act on errors here, we just
+   map error codes. */
+static int ib_err_t_to_drizzle_error(ib_err_t err)
+{
+  switch (err)
+  {
+  case DB_SUCCESS:
+    return 0;
+
+  case DB_ERROR:
+  default:
+    return -1;
+
+  case DB_INTERRUPTED:
+    return ER_QUERY_INTERRUPTED; // FIXME: is this correct?
+
+  case DB_OUT_OF_MEMORY:
+    return HA_ERR_OUT_OF_MEM;
+
+  case DB_DUPLICATE_KEY:
+    return HA_ERR_FOUND_DUPP_KEY;
+
+  case DB_FOREIGN_DUPLICATE_KEY:
+    return HA_ERR_FOREIGN_DUPLICATE_KEY;
+
+  case DB_MISSING_HISTORY:
+    return HA_ERR_TABLE_DEF_CHANGED;
+
+  case DB_RECORD_NOT_FOUND:
+    return HA_ERR_NO_ACTIVE_RECORD;
+
+  case DB_DEADLOCK:
+    return HA_ERR_LOCK_DEADLOCK;
+
+  case DB_LOCK_WAIT_TIMEOUT:
+    return HA_ERR_LOCK_WAIT_TIMEOUT;
+
+  case DB_NO_REFERENCED_ROW:
+    return HA_ERR_NO_REFERENCED_ROW;
+
+  case DB_ROW_IS_REFERENCED:
+    return HA_ERR_ROW_IS_REFERENCED;
+
+  case DB_CANNOT_ADD_CONSTRAINT:
+    return HA_ERR_CANNOT_ADD_FOREIGN;
+
+  case DB_CANNOT_DROP_CONSTRAINT:
+    return HA_ERR_ROW_IS_REFERENCED; /* misleading. should have new err code */
+
+  case DB_COL_APPEARS_TWICE_IN_INDEX:
+  case DB_CORRUPTION:
+    return HA_ERR_CRASHED;
+
+  case DB_MUST_GET_MORE_FILE_SPACE:
+  case DB_OUT_OF_FILE_SPACE:
+    return HA_ERR_RECORD_FILE_FULL;
+
+  case DB_TABLE_IS_BEING_USED:
+    return HA_ERR_WRONG_COMMAND;
+
+  case DB_TABLE_NOT_FOUND:
+    return HA_ERR_NO_SUCH_TABLE;
+
+  case DB_TOO_BIG_RECORD:
+    return HA_ERR_TO_BIG_ROW;
+
+  case DB_NO_SAVEPOINT:
+    return HA_ERR_NO_SAVEPOINT;
+
+  case DB_LOCK_TABLE_FULL:
+    return HA_ERR_LOCK_TABLE_FULL;
+
+  case DB_PRIMARY_KEY_IS_NULL:
+    return ER_PRIMARY_CANT_HAVE_NULL;
+
+  case DB_TOO_MANY_CONCURRENT_TRXS:
+    return HA_ERR_RECORD_FILE_FULL; /* need better error code */
+
+  case DB_UNSUPPORTED:
+    return HA_ERR_UNSUPPORTED;
+  }
+}
+
 static ib_trx_level_t tx_isolation_to_ib_trx_level(enum_tx_isolation level)
 {
   switch(level)
@@ -630,6 +714,7 @@
 EmbeddedInnoDBCursor::EmbeddedInnoDBCursor(drizzled::plugin::StorageEngine &engine_arg,
                            TableShare &table_arg)
   :Cursor(engine_arg, table_arg),
+   ib_lock_mode(IB_LOCK_NONE),
    write_can_replace(false),
    blobroot(NULL)
 { }
@@ -684,7 +769,14 @@
   ib_cursor_stmt_begin(cursor);
 
   (void)session;
-  (void)lock_type;
+
+  if (lock_type == F_WRLCK)
+  {
+    /* SELECT ... FOR UPDATE or UPDATE TABLE */
+    ib_lock_mode= IB_LOCK_X;
+  }
+  else
+    ib_lock_mode= IB_LOCK_NONE;
 
   return 0;
 }
@@ -1881,6 +1973,7 @@
 
 int EmbeddedInnoDBCursor::doStartTableScan(bool)
 {
+  ib_err_t err;
   ib_trx_t transaction;
 
   if (in_table_scan)
@@ -1893,14 +1986,21 @@
 
   ib_cursor_attach_trx(cursor, transaction);
 
+  err= ib_cursor_set_lock_mode(cursor, ib_lock_mode);
+  assert(err == DB_SUCCESS); // FIXME
+
   tuple= ib_clust_read_tuple_create(cursor);
 
-  ib_err_t err= ib_cursor_first(cursor);
+  err= ib_cursor_first(cursor);
   if (err != DB_SUCCESS && err != DB_END_OF_INDEX)
-    return -1; // FIXME
+  {
+    previous_error= ib_err_t_to_drizzle_error(err);
+    return previous_error;
+  }
 
   advance_cursor= false;
 
+  previous_error= 0;
   return(0);
 }
 
@@ -1991,6 +2091,9 @@
   ib_err_t err;
   int ret;
 
+  if (previous_error)
+    return previous_error;
+
   if (advance_cursor)
     err= ib_cursor_next(cursor);
 
@@ -2011,6 +2114,7 @@
   err= ib_cursor_reset(cursor);
   assert(err == DB_SUCCESS);
   in_table_scan= false;
+  previous_error= 0;
   return 0;
 }
 
@@ -2156,6 +2260,7 @@
       return -1;
 
     err= ib_cursor_close(cursor);
+    assert(err == DB_SUCCESS);
     err= ib_cursor_open_index_using_id(index_id, transaction, &cursor);
 
     if (err != DB_SUCCESS)
@@ -2165,6 +2270,9 @@
     ib_cursor_set_cluster_access(cursor);
   }
 
+  ib_err_t err= ib_cursor_set_lock_mode(cursor, ib_lock_mode);
+  assert(err == DB_SUCCESS);
+
   advance_cursor= false;
   return 0;
 }
@@ -2305,7 +2413,10 @@
     return HA_ERR_KEY_NOT_FOUND;
   }
 
-  assert(err==DB_SUCCESS);
+  if (err != DB_SUCCESS)
+  {
+    return ib_err_t_to_drizzle_error(err);
+  }
 
   tuple= ib_tuple_clear(tuple);
   ret= read_row_from_innodb(buf, cursor, tuple, table,

=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.h'
--- plugin/embedded_innodb/embedded_innodb_engine.h	2010-05-31 06:30:16 +0000
+++ plugin/embedded_innodb/embedded_innodb_engine.h	2010-08-12 06:37:46 +0000
@@ -120,6 +120,8 @@
   ib_crsr_t cursor;
   ib_tpl_t tuple;
   bool advance_cursor;
+  ib_lck_mode_t ib_lock_mode;
+  int previous_error;
 
   bool write_can_replace;
   uint64_t hidden_autoinc_pkey_position;

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/basic_select_for_update.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/basic_select_for_update.result	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/basic_select_for_update.result	2010-08-12 06:37:46 +0000
@@ -0,0 +1,17 @@
+create table t1 (a int);
+insert into t1 values (1);
+begin;
+select a from t1 where a=1 for update;
+a
+1
+update t1 set a=2 where a=1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+commit;
+select * from t1;
+a
+1
+update t1 set a=2 where a=1;
+select * from t1;
+a
+2
+DROP TABLE t1;

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/basic_select_for_update_pk_index.result'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/basic_select_for_update_pk_index.result	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/basic_select_for_update_pk_index.result	2010-08-12 06:37:46 +0000
@@ -0,0 +1,17 @@
+create table t1 (a int primary key);
+insert into t1 values (1);
+begin;
+select a from t1 where a=1 for update;
+a
+1
+update t1 set a=2 where a=1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+commit;
+select * from t1;
+a
+1
+update t1 set a=2 where a=1;
+select * from t1;
+a
+2
+DROP TABLE t1;

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update-master.opt	2010-08-12 06:37:46 +0000
@@ -0,0 +1,1 @@
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb_lock_wait_timeout=1

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update.test	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update.test	2010-08-12 06:37:46 +0000
@@ -0,0 +1,27 @@
+connect (a,localhost,root,,);
+connect (b,localhost,root,,);
+
+connection a;
+create table t1 (a int);
+insert into t1 values (1);
+begin;
+select a from t1 where a=1 for update;
+
+connection b;
+--error ER_LOCK_WAIT_TIMEOUT
+update t1 set a=2 where a=1;
+
+connection a;
+commit;
+
+connection b;
+select * from t1;
+update t1 set a=2 where a=1;
+select * from t1;
+
+disconnect a;
+disconnect b;
+
+connection default;
+
+DROP TABLE t1;

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update_pk_index-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update_pk_index-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update_pk_index-master.opt	2010-08-12 06:37:46 +0000
@@ -0,0 +1,1 @@
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb_lock_wait_timeout=1

=== added file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update_pk_index.test'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update_pk_index.test	1970-01-01 00:00:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_select_for_update_pk_index.test	2010-08-12 06:37:46 +0000
@@ -0,0 +1,27 @@
+connect (a,localhost,root,,);
+connect (b,localhost,root,,);
+
+connection a;
+create table t1 (a int primary key);
+insert into t1 values (1);
+begin;
+select a from t1 where a=1 for update;
+
+connection b;
+--error ER_LOCK_WAIT_TIMEOUT
+update t1 set a=2 where a=1;
+
+connection a;
+commit;
+
+connection b;
+select * from t1;
+update t1 set a=2 where a=1;
+select * from t1;
+
+disconnect a;
+disconnect b;
+
+connection default;
+
+DROP TABLE t1;