temp commit: last_insert_id

Author: ahiguti

handlersocket/database.cpp

@@ -672,9 +672,14 @@ dbcontext::cmd_insert_internal(dbcallback_i& cb, const prep_stmt& pst,
     }
   }
   table->next_number_field = table->found_next_number_field;
+    /* FIXME: test */
   const int r = hnd->ha_write_row(buf);
+  const ulonglong insert_id = table->file->insert_id_for_cur_row;
   table->next_number_field = 0;
   table_vec[pst.get_table_id()].modified = true;
+  if (r == 0 && table->found_next_number_field != 0) {
+    return cb.dbcb_resp_short_num64(0, insert_id);
+  }
   return cb.dbcb_resp_short(r != 0 ? 1 : 0, "");
 }
 

handlersocket/database.hpp

@@ -62,6 +62,7 @@ struct dbcallback_i {
   virtual const prep_stmt *dbcb_get_prep_stmt(size_t pst_id) const = 0;
   virtual void dbcb_resp_short(uint32_t code, const char *msg) = 0;
   virtual void dbcb_resp_short_num(uint32_t code, uint32_t value) = 0;
+  virtual void dbcb_resp_short_num64(uint32_t code, uint64_t value) = 0;
   virtual void dbcb_resp_begin(size_t num_flds) = 0;
   virtual void dbcb_resp_entry(const char *fld, size_t fldlen) = 0;
   virtual void dbcb_resp_end() = 0;

handlersocket/hstcpsvr_worker.cpp

@@ -78,6 +78,7 @@ struct hstcpsvr_conn : public dbcallback_i {
   virtual const prep_stmt *dbcb_get_prep_stmt(size_t pst_id) const;
   virtual void dbcb_resp_short(uint32_t code, const char *msg);
   virtual void dbcb_resp_short_num(uint32_t code, uint32_t value);
+  virtual void dbcb_resp_short_num64(uint32_t code, uint64_t value);
   virtual void dbcb_resp_begin(size_t num_flds);
   virtual void dbcb_resp_entry(const char *fld, size_t fldlen);
   virtual void dbcb_resp_end();
@@ -205,6 +206,15 @@ hstcpsvr_conn::dbcb_resp_short_num(uint32_t code, uint32_t value)
   cstate.writebuf.append_literal("\n");
 }
 
+void
+hstcpsvr_conn::dbcb_resp_short_num64(uint32_t code, uint64_t value)
+{
+  write_ui32(cstate.writebuf, code);
+  cstate.writebuf.append_literal("\t1\t");
+  write_ui64(cstate.writebuf, value);
+  cstate.writebuf.append_literal("\n");
+}
+
 void
 hstcpsvr_conn::dbcb_resp_begin(size_t num_flds)
 {

libhsclient/escape.cpp

@@ -106,8 +106,18 @@ read_ui32(char *& start, char *finish)
 void
 write_ui32(string_buffer& buf, uint32_t v)
 {
-  char *wp = buf.make_space(32);
-  int len = snprintf(wp, 32, "%u", v);
+  char *wp = buf.make_space(12);
+  int len = snprintf(wp, 12, "%u", v);
+  if (len > 0) {
+    buf.space_wrote(len);
+  }
+}
+
+void
+write_ui64(string_buffer& buf, uint64_t v)
+{
+  char *wp = buf.make_space(22);
+  int len = snprintf(wp, 22, "%llu", static_cast<unsigned long long>(v));
   if (len > 0) {
     buf.space_wrote(len);
   }

libhsclient/escape.hpp

@@ -25,6 +25,7 @@ bool unescape_string(string_buffer& ar, const char *start, const char *finish);
 
 uint32_t read_ui32(char *& start, char *finish);
 void write_ui32(string_buffer& buf, uint32_t v);
+void write_ui64(string_buffer& buf, uint64_t v);
 
 inline bool
 is_null_expression(const char *start, const char *finish)

regtest/test_01_lib/test13.expected

@@ -1,4 +1,44 @@
 HSINSERT
+11 v1hs_0
+12 v1hs_1
+13 v1hs_2
+14 v1hs_3
+15 v1hs_4
+16 v1hs_5
+17 v1hs_6
+18 v1hs_7
+19 v1hs_8
+20 v1hs_9
+21 v1hs3_0
+22 v1hs3_0
+23 v1hs3_0
+24 v1hs3_1
+25 v1hs3_1
+26 v1hs3_1
+27 v1hs3_2
+28 v1hs3_2
+29 v1hs3_2
+30 v1hs3_3
+31 v1hs3_3
+32 v1hs3_3
+33 v1hs3_4
+34 v1hs3_4
+35 v1hs3_4
+36 v1hs3_5
+37 v1hs3_5
+38 v1hs3_5
+39 v1hs3_6
+40 v1hs3_6
+41 v1hs3_6
+42 v1hs3_7
+43 v1hs3_7
+44 v1hs3_7
+45 v1hs3_8
+46 v1hs3_8
+47 v1hs3_8
+48 v1hs3_9
+49 v1hs3_9
+50 v1hs3_9
 DUMP_TABLE
 1 v1sql_0 v2sql_0
 2 v1sql_1 v2sql_1

regtest/test_01_lib/test13.pl

@@ -47,6 +47,9 @@ BEGIN
   if ($err != 0) {
     my $err_str = $r->[1];
     print "$err $err_str\n";
+  } else {
+    my $id = $r->[1];
+    print "$id $v1\n";
   }
 }
 # make sure that it works even when inserts are pipelined. these requests
@@ -63,8 +66,11 @@ BEGIN
   for (my $i = 0; $i < 3; ++$i) {
     my $err = $r->[$i]->[0];
     if ($err != 0) {
-      my $err_str = $r->[1];
+      my $err_str = $r->[$i]->[1];
       print "$err $err_str\n";
+    } else {
+      my $id = $r->[$i]->[1];
+      print "$id $v1\n";
     }
   }
 }

regtest/test_01_lib/test18.expected

@@ -1,4 +1,14 @@
 HSINSERT
+1 v1hs_0
+2 v1hs_1
+3 v1hs_2
+4 v1hs_3
+5 v1hs_4
+6 v1hs_5
+7 v1hs_6
+8 v1hs_7
+9 v1hs_8
+10 v1hs_9
 DUMP_TABLE
 1 v1hs_0 
 2 v1hs_1 

regtest/test_01_lib/test18.pl

@@ -39,6 +39,9 @@ BEGIN
   if ($err != 0) {
     my $err_str = $r->[1];
     print "$err $err_str\n";
+  } else {
+    my $id = $r->[1];
+    print "$id $v1\n";
   }
 }