mysql2-replication 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dae33ecb6c6b2ecfade5316344529e995ef41efefbf22791cef85b07c14253f6
-  data.tar.gz: 9407c34a9d180cb06ee7e22072db0f4727213ef96e5134f6c47c7e2c7aef48d2
+  metadata.gz: 86bbdf34e4db1d1d3379cdb75056fb9df7c4ef011362ac9356ff7bc3ff0113cd
+  data.tar.gz: c7b5dc5ad8fa263375deba6613466a1576fca8bfad288b967e6cbc1101e459c2
 SHA512:
-  metadata.gz: c991529269be9df8fb90d312ff644eb069103dc80538c5c5f0484a04d9bfd12b8218e164e48aff82011646a2bd3a9a1f827050211277d676ff3cb0c8095775c1
-  data.tar.gz: 6c56fc58282cff73dc930f791945bdf23d872df53e70b3b655c0e7dbb78a0c89823d8105438856aee8d642f10b793599932a26b60100fdf19824fffd60d65cf2
+  metadata.gz: 74a50bc506b77572906cb977c9523bd3bcf00fcf038e12b53bb33cd6e409a1e85d680ca66ca3ce7c8d546102a3c4bbce704bce33fbea19aa3a9cb6c8cf4a08c2
+  data.tar.gz: 0a102c99217563a81df6d419ff11e94008bb59ad9bebd1e32bb05187d07033aecb65958ac238d8e6d3574346041523c93a64177d6d30109ab8a1805a757a185a

data/ext/mysql2-replication/mysql2_replication.c

@@ -22,7 +22,9 @@ void Init_mysql2_replication(void);
 
 static VALUE rb_cDate;
 
-static VALUE rb_cMysql2Error;
+static VALUE rb_eMysql2Error;
+
+static VALUE rb_eMysql2ReplicationError;
 
 static VALUE rb_cMysql2ReplicationEvent;
 static VALUE rb_cMysql2ReplicationRotateEvent;
@@ -336,6 +338,37 @@ rbm2_metadata_parse(enum enum_field_types *column_type,
   }
 }
 
+static inline VALUE
+rbm2_column_parse_variable_size_uint(VALUE rb_column,
+                                     const uint8_t **row_data)
+{
+  VALUE rb_size = rb_hash_aref(rb_column, rb_id2sym(rb_intern("size")));
+  uint32_t size = NUM2UINT(rb_size);
+  VALUE rb_value = RUBY_Qnil;
+  switch (size) {
+  case 1:
+    rb_value = USHORT2NUM(rbm2_read_uint8(*row_data));
+    break;
+  case 2:
+    rb_value = USHORT2NUM(rbm2_read_uint16(*row_data));
+    break;
+  case 3:
+    rb_value = UINT2NUM(rbm2_read_uint24(*row_data));
+    break;
+  case 4:
+    rb_value = UINT2NUM(rbm2_read_uint32(*row_data));
+    break;
+  default:
+    rb_raise(rb_eNotImpError,
+             "unsupported size for variable size uint: %u: %+" PRIsVALUE,
+             size,
+             rb_column);
+    break;
+  }
+  (*row_data) += size;
+  return rb_value;
+}
+
 static inline VALUE
 rbm2_column_parse_variable_length_string(VALUE rb_column,
                                          const uint8_t **row_data)
@@ -409,8 +442,9 @@ rbm2_column_parse_blob(VALUE rb_column,
     break;
   default:
     rb_raise(rb_eNotImpError,
-             "unsupported length size for blob: %u",
-             length_size);
+             "unsupported length size for blob: %u: %+" PRIsVALUE,
+             length_size,
+             rb_column);
     break;
   }
   return rb_value;
@@ -426,8 +460,9 @@ rbm2_column_parse(VALUE rb_column, const uint8_t **row_data)
   switch (type) {
   case MYSQL_TYPE_DECIMAL:
     rb_raise(rb_eNotImpError,
-             "decimal type isn't implemented yet: %+" PRIsVALUE,
-             rb_type);
+             "decimal type isn't implemented yet: %+" PRIsVALUE ": %+" PRIsVALUE,
+             rb_type,
+             rb_column);
     break;
   case MYSQL_TYPE_TINY:
     rb_value = RB_CHR2FIX(*(*row_data));
@@ -476,12 +511,21 @@ rbm2_column_parse(VALUE rb_column, const uint8_t **row_data)
         M: 4bit
         D: 5bit
       */
-      rb_value = rb_funcall(rb_cDate,
-                            rb_intern("new"),
-                            3,
-                            RB_UINT2NUM((raw_date >> 9)),
-                            RB_UINT2NUM((raw_date >> 5) & ((1 << 4) - 1)),
-                            RB_UINT2NUM((raw_date & ((1 << 5) - 1))));
+      if (raw_date == 0) {
+        rb_value = rb_funcall(rb_cDate,
+                              rb_intern("new"),
+                              3,
+                              RB_UINT2NUM(0),
+                              RB_UINT2NUM(1),
+                              RB_UINT2NUM(1));
+      } else {
+        rb_value = rb_funcall(rb_cDate,
+                              rb_intern("new"),
+                              3,
+                              RB_UINT2NUM((raw_date >> 9)),
+                              RB_UINT2NUM((raw_date >> 5) & ((1 << 4) - 1)),
+                              RB_UINT2NUM((raw_date & ((1 << 5) - 1))));
+      }
       (*row_data) += 3;
     }
     break;
@@ -502,15 +546,22 @@ rbm2_column_parse(VALUE rb_column, const uint8_t **row_data)
       /* https://mariadb.com/kb/en/rows_event_v1/#mysql_type_datetime */
       uint64_t raw_time = rbm2_read_uint64(*row_data);
       /* YYYYMMDDHHMMSS */
-      rb_value = rb_funcall(rb_cTime,
-                            rb_intern("utc"),
-                            6,
-                            RB_UINT2NUM((raw_time / 10000000000)),
-                            RB_UINT2NUM((raw_time % 10000000000) / 100000000),
-                            RB_UINT2NUM((raw_time %   100000000) /   1000000),
-                            RB_UINT2NUM((raw_time %     1000000) /     10000),
-                            RB_UINT2NUM((raw_time %       10000) /       100),
-                            RB_UINT2NUM((raw_time %         100)));
+      if (raw_time == 0) {
+        rb_value = rb_funcall(rb_cTime,
+                              rb_intern("utc"),
+                              1,
+                              RB_UINT2NUM(0));
+      } else {
+        rb_value = rb_funcall(rb_cTime,
+                              rb_intern("utc"),
+                              6,
+                              RB_UINT2NUM((raw_time / 10000000000)),
+                              RB_UINT2NUM((raw_time % 10000000000) / 100000000),
+                              RB_UINT2NUM((raw_time %   100000000) /   1000000),
+                              RB_UINT2NUM((raw_time %     1000000) /     10000),
+                              RB_UINT2NUM((raw_time %       10000) /       100),
+                              RB_UINT2NUM((raw_time %         100)));
+      }
       (*row_data) += 8;
     }
     break;
@@ -520,8 +571,9 @@ rbm2_column_parse(VALUE rb_column, const uint8_t **row_data)
     break;
   case MYSQL_TYPE_NEWDATE:
     rb_raise(rb_eNotImpError,
-             "newdate type isn't implemented yet: %+" PRIsVALUE,
-             rb_type);
+             "newdate type isn't implemented yet: %+" PRIsVALUE ": %+" PRIsVALUE,
+             rb_type,
+             rb_column);
     break;
   case MYSQL_TYPE_VARCHAR:
     rb_value = rbm2_column_parse_variable_length_string(rb_column, row_data);
@@ -550,9 +602,11 @@ rbm2_column_parse(VALUE rb_column, const uint8_t **row_data)
         break;
       default :
         rb_raise(rb_eNotImpError,
-                 "%d bit type isn't implemented yet: %+" PRIsVALUE,
+                 "%d bit type isn't implemented yet: %+" PRIsVALUE
+                 ": %+" PRIsVALUE,
                  bits,
-                 rb_type);
+                 rb_type,
+                 rb_column);
         break;
       }
     }
@@ -646,8 +700,9 @@ rbm2_column_parse(VALUE rb_column, const uint8_t **row_data)
     break;
   case MYSQL_TYPE_TIME2:
     rb_raise(rb_eNotImpError,
-             "time2 type isn't implemented yet: %+" PRIsVALUE,
-             rb_type);
+             "time2 type isn't implemented yet: %+" PRIsVALUE ": %+" PRIsVALUE,
+             rb_type,
+             rb_column);
     break;
   case MYSQL_TYPE_JSON:
     rb_value = rbm2_column_parse_blob(rb_column, row_data);
@@ -683,16 +738,15 @@ rbm2_column_parse(VALUE rb_column, const uint8_t **row_data)
     break;
   case MYSQL_TYPE_ENUM:
   case MYSQL_TYPE_SET:
-    rb_raise(rb_eNotImpError,
-             "enum/set types aren't implemented yet: %+" PRIsVALUE,
-             rb_type);
+    rb_value = rbm2_column_parse_variable_size_uint(rb_column, row_data);
     break;
   case MYSQL_TYPE_TINY_BLOB:
   case MYSQL_TYPE_MEDIUM_BLOB:
   case MYSQL_TYPE_LONG_BLOB:
     rb_raise(rb_eNotImpError,
-             "blob types aren't implemented yet: %+" PRIsVALUE,
-             rb_type);
+             "blob types aren't implemented yet: %+" PRIsVALUE ": %+" PRIsVALUE,
+             rb_type,
+             rb_column);
     break;
   case MYSQL_TYPE_BLOB:
     rb_value = rbm2_column_parse_blob(rb_column, row_data);
@@ -705,13 +759,17 @@ rbm2_column_parse(VALUE rb_column, const uint8_t **row_data)
     break;
   case MYSQL_TYPE_GEOMETRY:
     rb_raise(rb_eNotImpError,
-             "geometry type isn't implemented yet: %+" PRIsVALUE,
-             rb_type);
+             "geometry type isn't implemented yet: %+" PRIsVALUE
+             ": %+" PRIsVALUE,
+             rb_type,
+             rb_column);
     break;
   default:
     rb_raise(rb_eNotImpError,
-             "unknown type isn't implemented yet: %+" PRIsVALUE,
-             rb_type);
+             "unknown type isn't implemented yet: %+" PRIsVALUE
+             ": %+" PRIsVALUE,
+             rb_type,
+             rb_column);
     break;
   }
   return rb_value;
@@ -730,6 +788,7 @@ typedef struct
   VALUE rb_client;
   VALUE rb_table_maps;
   bool force_disable_use_checksum;
+  bool format_description_processed;
 } rbm2_replication_client_wrapper;
 
 static void
@@ -820,7 +879,7 @@ rbm2_replication_client_raise(VALUE self)
                         rb_usascii_encoding());
   ID new_with_args;
   CONST_ID(new_with_args, "new_with_args");
-  VALUE rb_error = rb_funcall(rb_cMysql2Error,
+  VALUE rb_error = rb_funcall(rb_eMysql2Error,
                               new_with_args,
                               4,
                               rb_error_message,
@@ -877,6 +936,7 @@ rbm2_replication_client_initialize(int argc, VALUE *argv, VALUE self)
   } else {
     wrapper->force_disable_use_checksum = false;
   }
+  wrapper->format_description_processed = false;
 
   return RUBY_Qnil;
 }
@@ -1098,6 +1158,57 @@ rbm2_row_parse(const uint8_t **row_data,
   return rb_row;
 }
 
+typedef struct
+{
+  struct st_mariadb_rpl_rows_event *rows_event;
+  VALUE rb_klass;
+  VALUE rb_rows;
+  VALUE rb_updated_rows;
+  VALUE rb_table_map;
+} rbm2_replication_rows_event_parse_rows_data;
+
+static VALUE
+rbm2_replication_rows_event_parse_rows_body(VALUE user_data)
+{
+  rbm2_replication_rows_event_parse_rows_data *data =
+    (rbm2_replication_rows_event_parse_rows_data *)user_data;
+
+  const uint8_t *column_bitmap =
+    (const uint8_t *)(data->rows_event->column_bitmap);
+  const uint8_t *column_update_bitmap =
+    (const uint8_t *)(data->rows_event->column_update_bitmap);
+  const uint8_t *row_data = data->rows_event->row_data;
+  const uint8_t *row_data_end = row_data + data->rows_event->row_data_size;
+  VALUE rb_columns = rb_iv_get(data->rb_table_map, "@columns");
+  while (row_data < row_data_end) {
+    VALUE rb_row = rbm2_row_parse(&row_data,
+                                  data->rows_event->column_count,
+                                  column_bitmap,
+                                  rb_columns);
+    rb_ary_push(data->rb_rows, rb_row);
+    if (data->rb_klass == rb_cMysql2ReplicationUpdateRowsEvent) {
+      VALUE rb_updated_row = rbm2_row_parse(&row_data,
+                                            data->rows_event->column_count,
+                                            column_update_bitmap,
+                                            rb_columns);
+      rb_ary_push(data->rb_updated_rows, rb_updated_row);
+    }
+  }
+  return RUBY_Qnil;
+}
+
+static VALUE
+rbm2_replication_rows_event_parse_rows_rescue(VALUE user_data, VALUE error)
+{
+  rbm2_replication_rows_event_parse_rows_data *data =
+    (rbm2_replication_rows_event_parse_rows_data *)user_data;
+  rb_raise(rb_eMysql2ReplicationError,
+           "failed to parse rows: %+" PRIsVALUE ": %+" PRIsVALUE,
+           data->rb_table_map,
+           rb_funcall(error, rb_intern("message"), 0));
+  return RUBY_Qnil;
+}
+
 static VALUE
 rbm2_replication_event_new(rbm2_replication_client_wrapper *wrapper,
                            MARIADB_RPL_EVENT *event)
@@ -1111,15 +1222,17 @@ rbm2_replication_event_new(rbm2_replication_client_wrapper *wrapper,
     {
       struct st_mariadb_rpl_rotate_event *e = &(event->event.rotate);
       rb_iv_set(rb_event, "@position", ULL2NUM(e->position));
-      size_t filename_size;
+      size_t filename_size = e->filename.length;
       if (event->timestamp == 0) {
         /* Fake ROTATE_EVENT: https://mariadb.com/kb/en/fake-rotate_event/ */
-        filename_size = wrapper->rpl->buffer_size -
-          EVENT_HEADER_OFS -
-          sizeof(uint64_t) - /* position */
-          sizeof(uint32_t); /* checksum */
-      } else {
-        filename_size = e->filename.length;
+        if (!wrapper->format_description_processed) {
+          filename_size = wrapper->rpl->buffer_size -
+            EVENT_HEADER_OFS -
+            sizeof(uint64_t); /* position */
+          if (!wrapper->force_disable_use_checksum) {
+            filename_size -= sizeof(uint32_t); /* checksum */
+          }
+        }
       }
       rb_iv_set(rb_event,
                 "@file_name",
@@ -1140,6 +1253,7 @@ rbm2_replication_event_new(rbm2_replication_client_wrapper *wrapper,
     if (wrapper->force_disable_use_checksum) {
       wrapper->rpl->use_checksum = false;
     }
+    wrapper->format_description_processed = true;
     break;
   case TABLE_MAP_EVENT:
     klass = rb_cMysql2ReplicationTableMapEvent;
@@ -1201,10 +1315,6 @@ rbm2_replication_event_new(rbm2_replication_client_wrapper *wrapper,
       struct st_mariadb_rpl_rows_event *e = &(event->event.rows);
       VALUE rb_table_id = ULONG2NUM(e->table_id);
       VALUE rb_table_map = rb_hash_aref(wrapper->rb_table_maps, rb_table_id);
-      const uint8_t *column_bitmap =
-        (const uint8_t *)(e->column_bitmap);
-      const uint8_t *column_update_bitmap =
-        (const uint8_t *)(e->column_update_bitmap);
       rb_iv_set(rb_event, "@table_id", rb_table_id);
       rb_iv_set(rb_event, "@table_map", rb_table_map);
       rb_iv_set(rb_event, "@rows_flags", USHORT2NUM(e->flags));
@@ -1213,24 +1323,15 @@ rbm2_replication_event_new(rbm2_replication_client_wrapper *wrapper,
       if (klass == rb_cMysql2ReplicationUpdateRowsEvent) {
         rb_updated_rows = rb_ary_new();
       }
-      const uint8_t *row_data = e->row_data;
-      const uint8_t *row_data_end = row_data + e->row_data_size;
       if (!RB_NIL_P(rb_table_map)) {
-        VALUE rb_columns = rb_iv_get(rb_table_map, "@columns");
-        while (row_data < row_data_end) {
-          VALUE rb_row = rbm2_row_parse(&row_data,
-                                        e->column_count,
-                                        column_bitmap,
-                                        rb_columns);
-          rb_ary_push(rb_rows, rb_row);
-          if (klass == rb_cMysql2ReplicationUpdateRowsEvent) {
-            VALUE rb_updated_row = rbm2_row_parse(&row_data,
-                                                  e->column_count,
-                                                  column_update_bitmap,
-                                                  rb_columns);
-            rb_ary_push(rb_updated_rows, rb_updated_row);
-          }
-        }
+        rbm2_replication_rows_event_parse_rows_data data;
+        data.rows_event = e;
+        data.rb_klass = klass;
+        data.rb_rows = rb_rows;
+        data.rb_updated_rows = rb_updated_rows;
+        data.rb_table_map = rb_table_map;
+        rb_rescue(rbm2_replication_rows_event_parse_rows_body, (VALUE)&data,
+                  rbm2_replication_rows_event_parse_rows_rescue, (VALUE)&data);
       }
       rb_iv_set(rb_event, "@rows", rb_rows);
       if (klass == rb_cMysql2ReplicationUpdateRowsEvent) {
@@ -1312,9 +1413,13 @@ Init_mysql2_replication(void)
   rb_cDate = rb_const_get(rb_cObject, rb_intern("Date"));
 
   VALUE rb_mMysql2 = rb_const_get(rb_cObject, rb_intern("Mysql2"));
-  rb_cMysql2Error = rb_const_get(rb_mMysql2, rb_intern("Error"));
+  rb_eMysql2Error = rb_const_get(rb_mMysql2, rb_intern("Error"));
 
   VALUE rb_mMysql2Replication = rb_define_module("Mysql2Replication");
+  rb_eMysql2ReplicationError =
+    rb_define_class_under(rb_mMysql2Replication,
+                          "Error",
+                          rb_eStandardError);
 
   rb_cMysql2ReplicationEvent =
     rb_define_class_under(rb_mMysql2Replication, "Event", rb_cObject);

data/lib/mysql2-replication/version.rb

@@ -1,3 +1,3 @@
 module Mysql2Replication
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql2-replication
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Sutou Kouhei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2