ruby-binlog 0.1.1 → 0.1.2

data/README

@@ -24,6 +24,7 @@ gem install ruby-binlog
       puts event.query
     when Binlog::RowEvent
       puts event.event_type
+      p event.columns
       p event.rows
     else
       puts "(#{event.event_type})"

data/ext/Makefile

@@ -9,33 +9,33 @@ hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
 prefix = $(DESTDIR)/usr
 exec_prefix = $(DESTDIR)/usr
-mandir = $(DESTDIR)/usr/share/man
-localedir = $(datarootdir)/locale
-vendordir = $(DESTDIR)/usr/lib/ruby
-datadir = $(DESTDIR)/usr/share
-sitearchdir = $(libdir)/ruby/site_ruby/$(ruby_version)/$(sitearch)
-libexecdir = $(DESTDIR)/usr/libexec
-psdir = $(docdir)
+localstatedir = $(DESTDIR)/var
 sysconfdir = $(DESTDIR)/etc
-bindir = $(DESTDIR)/usr/bin
 includedir = $(DESTDIR)/usr/include
-vendorarchdir = $(libdir)/ruby/$(ruby_version)/$(sitearch)
+sbindir = $(DESTDIR)/usr/sbin
+mandir = $(DESTDIR)/usr/share/man
+rubylibdir = $(vendordir)/$(ruby_version)
 sitedir = $(DESTDIR)/usr/lib/ruby/site_ruby
-libdir = $(DESTDIR)/usr/lib64
+localedir = $(datarootdir)/locale
+dvidir = $(docdir)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+vendorarchdir = $(libdir)/ruby/$(ruby_version)/$(sitearch)
 sitelibdir = $(sitedir)/$(ruby_version)
-rubylibdir = $(vendordir)/$(ruby_version)
-localstatedir = $(DESTDIR)/var
+vendordir = $(DESTDIR)/usr/lib/ruby
 infodir = $(DESTDIR)/usr/share/info
-docdir = $(datarootdir)/doc/$(PACKAGE)
+htmldir = $(docdir)
+pdfdir = $(docdir)
+psdir = $(docdir)
+sitearchdir = $(libdir)/ruby/site_ruby/$(ruby_version)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
 datarootdir = $(prefix)/share
-archdir = $(libdir)/ruby/$(ruby_version)/$(sitearch)
 oldincludedir = $(DESTDIR)/usr/include
+bindir = $(DESTDIR)/usr/bin
+libdir = $(DESTDIR)/usr/lib64
 sharedstatedir = $(DESTDIR)/var/lib
-htmldir = $(docdir)
-dvidir = $(docdir)
-vendorlibdir = $(vendordir)/$(ruby_version)
-pdfdir = $(docdir)
-sbindir = $(DESTDIR)/usr/sbin
+archdir = $(libdir)/ruby/$(ruby_version)/$(sitearch)
+datadir = $(DESTDIR)/usr/share
+libexecdir = $(DESTDIR)/usr/libexec
 
 CC = gcc
 LIBRUBY = $(LIBRUBY_SO)
@@ -87,8 +87,8 @@ extout_prefix =
 target_prefix = 
 LOCAL_LIBS = 
 LIBS = $(LIBRUBYARG_SHARED) -lreplication -lstdc++  -lpthread -lrt -ldl -lcrypt -lm   -lc
-SRCS = ruby_binlog_xid_event.cpp ruby_binlog_rotate_event.cpp ruby_binlog_format_event.cpp ruby_binlog_user_var_event.cpp ruby_binlog.cpp ruby_binlog_table_map_event.cpp ruby_binlog_row_event.cpp ruby_binlog_event.cpp ruby_binlog_query_event.cpp ruby_binlog_unimplemented_event.cpp ruby_binlog_int_var_event.cpp ruby_binlog_incident_event.cpp
-OBJS = ruby_binlog_xid_event.o ruby_binlog_rotate_event.o ruby_binlog_format_event.o ruby_binlog_user_var_event.o ruby_binlog.o ruby_binlog_table_map_event.o ruby_binlog_row_event.o ruby_binlog_event.o ruby_binlog_query_event.o ruby_binlog_unimplemented_event.o ruby_binlog_int_var_event.o ruby_binlog_incident_event.o
+SRCS = ruby_binlog_xid_event.cpp ruby_binlog_rotate_event.cpp ruby_binlog_format_event.cpp ruby_binlog_user_var_event.cpp ruby_binlog.cpp ruby_binlog_table_map_event.cpp ruby_binlog_get_field_type_str.cpp ruby_binlog_row_event.cpp ruby_binlog_event.cpp ruby_binlog_query_event.cpp ruby_binlog_unimplemented_event.cpp ruby_binlog_int_var_event.cpp ruby_binlog_incident_event.cpp
+OBJS = ruby_binlog_xid_event.o ruby_binlog_rotate_event.o ruby_binlog_format_event.o ruby_binlog_user_var_event.o ruby_binlog.o ruby_binlog_table_map_event.o ruby_binlog_get_field_type_str.o ruby_binlog_row_event.o ruby_binlog_event.o ruby_binlog_query_event.o ruby_binlog_unimplemented_event.o ruby_binlog_int_var_event.o ruby_binlog_incident_event.o
 TARGET = binlog
 DLLIB = $(TARGET).so
 EXTSTATIC = 

data/ext/ruby_binlog.h

@@ -23,6 +23,12 @@
 
 extern VALUE rb_mBinlog;
 
+namespace ruby {
+namespace binlog {
+const char* get_field_type_str(mysql::system::enum_field_types type);
+} // namespace binlog
+} // namespace ruby
+
 extern "C" {
 #ifdef _WIN32
 __declspec(dllexport)

data/ext/ruby_binlog_event.h

@@ -92,6 +92,7 @@ struct TableMapEvent : public Event {
   static VALUE get_db_name(VALUE self);
   static VALUE get_table_name(VALUE self);
   static VALUE get_columns(VALUE self);
+  static VALUE get_column_types(VALUE self);
   static VALUE get_metadata(VALUE self);
   static VALUE get_null_bits(VALUE self);
 };
@@ -109,6 +110,7 @@ struct RowEvent : public Event {
   static VALUE get_table_id(VALUE self);
   static VALUE get_db_name(VALUE self);
   static VALUE get_table_name(VALUE self);
+  static VALUE get_column_types(VALUE self);
   static VALUE get_flags(VALUE self);
   static VALUE get_columns_len(VALUE self);
   static VALUE get_null_bits_len(VALUE self);

data/ext/ruby_binlog_get_field_type_str.cpp

@@ -0,0 +1,41 @@
+#include "ruby_binlog.h"
+
+namespace ruby {
+namespace binlog {
+
+const char* get_field_type_str(mysql::system::enum_field_types type) {
+  switch(type) {
+  case mysql::system::MYSQL_TYPE_DECIMAL:     return "DECIMAL";     break;
+  case mysql::system::MYSQL_TYPE_TINY:        return "TINY";        break;
+  case mysql::system::MYSQL_TYPE_SHORT:       return "SHORT";       break;
+  case mysql::system::MYSQL_TYPE_LONG:        return "LONG";        break;
+  case mysql::system::MYSQL_TYPE_FLOAT:       return "FLOAT";       break;
+  case mysql::system::MYSQL_TYPE_DOUBLE:      return "DOUBLE";      break;
+  case mysql::system::MYSQL_TYPE_NULL:        return "NULL";        break;
+  case mysql::system::MYSQL_TYPE_TIMESTAMP:   return "TIMESTAMP";   break;
+  case mysql::system::MYSQL_TYPE_LONGLONG:    return "LONGLONG";    break;
+  case mysql::system::MYSQL_TYPE_INT24:       return "INT24";       break;
+  case mysql::system::MYSQL_TYPE_DATE:        return "DATE";        break;
+  case mysql::system::MYSQL_TYPE_TIME:        return "TIME";        break;
+  case mysql::system::MYSQL_TYPE_DATETIME:    return "DATETIME";    break;
+  case mysql::system::MYSQL_TYPE_YEAR:        return "YEAR";        break;
+  case mysql::system::MYSQL_TYPE_NEWDATE:     return "NEWDATE";     break;
+  case mysql::system::MYSQL_TYPE_VARCHAR:     return "VARCHAR";     break;
+  case mysql::system::MYSQL_TYPE_BIT:         return "BIT";         break;
+  case mysql::system::MYSQL_TYPE_NEWDECIMAL:  return "NEWDECIMAL";  break;
+  case mysql::system::MYSQL_TYPE_ENUM:        return "ENUM";        break;
+  case mysql::system::MYSQL_TYPE_SET:         return "SET";         break;
+  case mysql::system::MYSQL_TYPE_TINY_BLOB:   return "TINY_BLOB";   break;
+  case mysql::system::MYSQL_TYPE_MEDIUM_BLOB: return "MEDIUM_BLOB"; break;
+  case mysql::system::MYSQL_TYPE_LONG_BLOB:   return "LONG_BLOB";   break;
+  case mysql::system::MYSQL_TYPE_BLOB:        return "BLOB";        break;
+  case mysql::system::MYSQL_TYPE_VAR_STRING:  return "VAR_STRING";  break;
+  case mysql::system::MYSQL_TYPE_STRING:      return "STRING";      break;
+  case mysql::system::MYSQL_TYPE_GEOMETRY:    return "GEOMETRY";    break;
+  }
+
+  return 0;
+}
+
+} // namespace binlog
+} // namespace ruby

data/ext/ruby_binlog_row_event.cpp

@@ -51,6 +51,7 @@ void RowEvent::init() {
   rb_define_method(rb_cBinlogRowEvent, "table_id",                 __F(&get_table_id),             0);
   rb_define_method(rb_cBinlogRowEvent, "db_name",                  __F(&get_db_name),              0);
   rb_define_method(rb_cBinlogRowEvent, "table_name",               __F(&get_table_name),           0);
+  rb_define_method(rb_cBinlogRowEvent, "columns",                  __F(&get_column_types),         0);
   rb_define_method(rb_cBinlogRowEvent, "flags",                    __F(&get_flags),                0);
   rb_define_method(rb_cBinlogRowEvent, "columns_len",              __F(&get_columns_len),          0);
   rb_define_method(rb_cBinlogRowEvent, "null_bits_len",            __F(&get_null_bits_len),        0);
@@ -92,6 +93,27 @@ VALUE RowEvent::get_table_name(VALUE self) {
   }
 }
 
+VALUE RowEvent::get_column_types(VALUE self) {
+  RowEvent *p;
+  Data_Get_Struct(self, RowEvent, p);
+  VALUE retval = Qnil;
+
+  if (p->m_table_map) {
+    TableMapEvent *tme;
+    retval = rb_ary_new();
+
+    Data_Get_Struct(p->m_table_map, TableMapEvent, tme);
+
+    for (std::vector<uint8_t>::iterator itor = tme->m_event->columns.begin();
+         itor != tme->m_event->columns.end(); itor++) {
+      const char *colname = get_field_type_str(static_cast<mysql::system::enum_field_types>(*itor));
+      rb_ary_push(retval, (colname ? rb_str_new2(colname) : Qnil));
+    }
+  }
+
+  return retval;
+}
+
 VALUE RowEvent::get_flags(VALUE self) {
   RowEvent *p;
   Data_Get_Struct(self, RowEvent, p);

data/ext/ruby_binlog_table_map_event.cpp

@@ -39,13 +39,14 @@ void TableMapEvent::init() {
 
   Event::init(rb_cBinlogTableMapEvent);
 
-  rb_define_method(rb_cBinlogTableMapEvent, "table_id",   __F(&get_table_id),   0);
-  rb_define_method(rb_cBinlogTableMapEvent, "flags",      __F(&get_flags),      0);
-  rb_define_method(rb_cBinlogTableMapEvent, "db_name",    __F(&get_db_name),    0);
-  rb_define_method(rb_cBinlogTableMapEvent, "table_name", __F(&get_table_name), 0);
-  rb_define_method(rb_cBinlogTableMapEvent, "columns",    __F(&get_columns),    0);
-  rb_define_method(rb_cBinlogTableMapEvent, "metadata",   __F(&get_metadata),   0);
-  rb_define_method(rb_cBinlogTableMapEvent, "null_bits",  __F(&get_null_bits),  0);
+  rb_define_method(rb_cBinlogTableMapEvent, "table_id",    __F(&get_table_id),     0);
+  rb_define_method(rb_cBinlogTableMapEvent, "flags",       __F(&get_flags),        0);
+  rb_define_method(rb_cBinlogTableMapEvent, "db_name",     __F(&get_db_name),      0);
+  rb_define_method(rb_cBinlogTableMapEvent, "table_name",  __F(&get_table_name),   0);
+  rb_define_method(rb_cBinlogTableMapEvent, "raw_columns", __F(&get_columns),      0);
+  rb_define_method(rb_cBinlogTableMapEvent, "columns",     __F(&get_column_types), 0);
+  rb_define_method(rb_cBinlogTableMapEvent, "metadata",    __F(&get_metadata),     0);
+  rb_define_method(rb_cBinlogTableMapEvent, "null_bits",   __F(&get_null_bits),    0);
 }
 
 VALUE TableMapEvent::get_table_id(VALUE self) {
@@ -86,6 +87,21 @@ VALUE TableMapEvent::get_columns(VALUE self) {
   return retval;
 }
 
+VALUE TableMapEvent::get_column_types(VALUE self) {
+  TableMapEvent *p;
+  VALUE retval = rb_ary_new();
+
+  Data_Get_Struct(self, TableMapEvent, p);
+
+  for (std::vector<uint8_t>::iterator itor = p->m_event->columns.begin();
+       itor != p->m_event->columns.end(); itor++) {
+    const char *colname = get_field_type_str(static_cast<mysql::system::enum_field_types>(*itor));
+    rb_ary_push(retval, (colname ? rb_str_new2(colname) : Qnil));
+  }
+
+  return retval;
+}
+
 VALUE TableMapEvent::get_metadata(VALUE self) {
   TableMapEvent *p;
   VALUE retval = rb_ary_new();

data/ext/test.rb

@@ -11,6 +11,7 @@ while event = client.wait_for_next_event
     puts event.query
   when Binlog::RowEvent
     puts event.event_type
+    p event.columns
     p event.rows
   else
     puts "(#{event.event_type})"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-binlog
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - winebarrel
@@ -34,6 +34,7 @@ files:
 - ext/ruby_binlog_rotate_event.cpp
 - ext/ruby_binlog_format_event.cpp
 - ext/Makefile
+- ext/ruby_binlog_get_field_type_str.o
 - ext/ruby_binlog_format_event.o
 - ext/ruby_binlog_user_var_event.o
 - ext/ruby_binlog_user_var_event.cpp
@@ -43,6 +44,7 @@ files:
 - ext/ruby_binlog.cpp
 - ext/ruby_binlog_table_map_event.cpp
 - ext/ruby_binlog_row_event.o
+- ext/ruby_binlog_get_field_type_str.cpp
 - ext/mkmf.log
 - ext/ruby_binlog_row_event.cpp
 - ext/ruby_binlog_event.cpp