ruby-binlog 0.1.4 → 0.1.5

data/README

@@ -14,19 +14,32 @@ gem install ruby-binlog
 
   require "binlog"
   
-  client = Binlog::Client.new("mysql://repl:repl@nyarlathotep")
-  client.connect
-  client.position = 4
+  master_log_file = "mysql-bin.000001"
+  master_log_pos = 4
   
-  while event = client.wait_for_next_event
-    case event
-    when Binlog::QueryEvent
-      puts event.query
-    when Binlog::RowEvent
-      puts event.event_type
-      p event.columns
-      p event.rows
-    else
-      puts "(#{event.event_type})"
+  begin
+    client = Binlog::Client.new("mysql://repl:repl@example.com")
+    sleep 0.3 until client.connect
+    client.set_position(master_log_file, master_log_pos)
+  
+    while event = client.wait_for_next_event
+      master_log_pos = event.next_position
+  
+      case event
+      when Binlog::QueryEvent
+        puts event.query
+      when Binlog::RowEvent
+        puts event.event_type
+        p event.columns
+        p event.rows
+      when Binlog::RotateEvent
+        master_log_file = event.binlog_file
+      else
+        puts "(#{event.event_type})"
+      end
     end
+  rescue Binlog::Error => e
+    puts e
+    retry if client.closed?
+    raise e
   end

data/ext/ruby_binlog.cpp

@@ -58,22 +58,116 @@ struct Client {
     int result;
 
     Data_Get_Struct(self, Client, p);
+    TRAP_BEG;
     result = p->m_binlog->connect();
+    TRAP_END;
 
     return (result == 0) ? Qtrue : Qfalse;
   }
 
+  // XXX: Don't use
+  /*
+  static VALUE disconnect(VALUE self) {
+    Client *p;
+    mysql::system::Binlog_tcp_driver *driver;
+
+    Data_Get_Struct(self, Client, p);
+    driver = cast_to_tcp_driver(p->m_binlog->m_driver);
+
+    if (driver) {
+      driver->disconnect();
+    }
+
+    return Qnil;
+  }
+   */
+
+  // XXX: Don't use
+  /*
+  static VALUE reconnect(VALUE self) {
+    Client *p;
+    mysql::system::Binlog_tcp_driver *driver;
+
+    Data_Get_Struct(self, Client, p);
+    driver = cast_to_tcp_driver(p->m_binlog->m_driver);
+
+    if (driver) {
+      driver->reconnect();
+    }
+
+    return Qnil;
+  }
+   */
+
+  static VALUE is_closed(VALUE self) {
+    Client *p;
+    mysql::system::Binlog_tcp_driver *driver;
+
+    Data_Get_Struct(self, Client, p);
+    driver = cast_to_tcp_driver(p->m_binlog->m_driver);
+
+    if (!driver) {
+      return Qfalse;
+    }
+
+    if (driver->m_socket) {
+      bool socket_is_open;
+
+      TRAP_BEG;
+      socket_is_open = driver->m_socket->is_open();
+      TRAP_END;
+
+      return socket_is_open ? Qfalse : Qtrue;
+    } else {
+      return Qtrue;
+    }
+  }
+
   static VALUE wait_for_next_event(VALUE self) {
     Client *p;
     Binary_log_event *event;
-    int result;
+    int result = ERR_EOF;
     VALUE retval = Qnil;
+    mysql::system::Binlog_tcp_driver *driver;
 
     Data_Get_Struct(self, Client, p);
+    driver = cast_to_tcp_driver(p->m_binlog->m_driver);
+
+    if (driver) {
+      int closed = 0;
+      timeval interval = { 0, WAIT_INTERVAL };
+
+      TRAP_BEG;
+      while (1) {
+        if (driver->m_event_queue->is_not_empty()) {
+          result = p->m_binlog->wait_for_next_event(&event);
+          break;
+        } else {
+          if (driver->m_socket && driver->m_socket->is_open()) {
+            rb_thread_wait_for(interval);
+          } else {
+            closed = 1;
+            driver->shutdown();
+            rb_thread_wait_for(interval);
+            break;
+          }
+        }
+      }
+      TRAP_END;
+
+      if (closed) {
+        TRAP_BEG;
+        driver->disconnect();
+        TRAP_END;
+
+        rb_raise(rb_eBinlogError, "MySQL server has gone away");
+      }
+    } else {
+      TRAP_BEG;
+      result = p->m_binlog->wait_for_next_event(&event);
+      TRAP_END;
+    }
 
-    TRAP_BEG;
-    result = p->m_binlog->wait_for_next_event(&event);
-    TRAP_END;
 
     if (result == ERR_EOF) {
       return Qfalse;
@@ -152,13 +246,17 @@ struct Client {
     if (NIL_P(position)) {
       unsigned long i_position;
       i_position = NUM2ULONG(filename);
+      TRAP_BEG;
       result = p->m_binlog->set_position(i_position);
+      TRAP_END;
     } else {
       unsigned long i_position;
       Check_Type(filename, T_STRING);
       i_position = NUM2ULONG(position);
       std::string s_filename(StringValuePtr(filename));
+      TRAP_BEG;
       result = p->m_binlog->set_position(s_filename, i_position);
+      TRAP_END;
     }
 
     switch (result) {
@@ -168,7 +266,7 @@ struct Client {
     case ERR_EOF:
       retval = Qfalse;
     default:
-      rb_raise(rb_eRuntimeError, "An unspecified error occurred (%d)", result);
+      rb_raise(rb_eBinlogError, "An unspecified error occurred (%d)", result);
       break;
     }
 
@@ -181,7 +279,9 @@ struct Client {
     int result;
 
     Data_Get_Struct(self, Client, p);
+    TRAP_BEG;
     result = p->m_binlog->set_position(NUM2ULONG(position));
+    TRAP_END;
 
     switch (result) {
     case ERR_OK:
@@ -190,7 +290,7 @@ struct Client {
     case ERR_EOF:
       retval = Qfalse;
     default:
-      rb_raise(rb_eRuntimeError, "An unspecified error occurred (%d)", result);
+      rb_raise(rb_eBinlogError, "An unspecified error occurred (%d)", result);
       break;
     }
 
@@ -210,7 +310,9 @@ struct Client {
     } else {
       Check_Type(filename, T_STRING);
       std::string s_filename(StringValuePtr(filename));
+      TRAP_BEG;
       position = p->m_binlog->get_position(s_filename);
+      TRAP_END;
     }
 
     return ULONG2NUM(position);
@@ -219,7 +321,13 @@ struct Client {
   static VALUE get_position2(VALUE self) {
     Client *p;
     Data_Get_Struct(self, Client, p);
-    return ULONG2NUM(p->m_binlog->get_position());
+    unsigned long position;
+
+    TRAP_BEG;
+    position = p->m_binlog->get_position();
+    TRAP_END;
+
+    return ULONG2NUM(position);
   }
 
   static void init() {
@@ -227,6 +335,10 @@ struct Client {
     rb_define_alloc_func(rb_cBinlogClient, &alloc);
     rb_define_private_method(rb_cBinlogClient, "initialize", __F(&initialize), 1);
     rb_define_method(rb_cBinlogClient, "connect", __F(&connect), 0);
+    // XXX: Don't use
+    //rb_define_method(rb_cBinlogClient, "disconnect", __F(&disconnect), 0);
+    //rb_define_method(rb_cBinlogClient, "reconnect", __F(&reconnect), 0);
+    rb_define_method(rb_cBinlogClient, "closed?", __F(&is_closed), 0);
     rb_define_method(rb_cBinlogClient, "wait_for_next_event", __F(&wait_for_next_event), 0);
     rb_define_method(rb_cBinlogClient, "set_position", __F(&set_position), -1);
     rb_define_method(rb_cBinlogClient, "position=", __F(&set_position2), 1);
@@ -240,10 +352,12 @@ struct Client {
 
 VALUE rb_mBinlog;
 VALUE rb_cBinlogEvent;
+VALUE rb_eBinlogError;
 
 void Init_binlog() {
   rb_mBinlog = rb_define_module("Binlog");
   rb_cBinlogEvent = rb_define_class_under(rb_mBinlog, "Event", rb_cObject);
+  rb_eBinlogError = rb_define_class_under(rb_mBinlog, "Error", rb_eRuntimeError);
 
   rb_define_const(rb_cBinlogEvent, "UNKNOWN_EVENT",            INT2NUM(0));
   rb_define_const(rb_cBinlogEvent, "START_EVENT_V3",           INT2NUM(1));

data/ext/ruby_binlog.h

@@ -1,6 +1,9 @@
 #ifndef __RUBY_BINLOG_H__
 #define __RUBY_BINLOG_H__
 
+// XXX:
+#define private public
+
 #include <string>
 #include <binlog_api.h>
 #include <ruby.h>
@@ -21,11 +24,15 @@
 #define __F(f) (reinterpret_cast<VALUE (*)(...)>(f))
 #endif
 
+#define WAIT_INTERVAL 300
+
 extern VALUE rb_mBinlog;
+extern VALUE rb_eBinlogError;
 
 namespace ruby {
 namespace binlog {
 const char* get_field_type_str(mysql::system::enum_field_types type);
+mysql::system::Binlog_tcp_driver *cast_to_tcp_driver(mysql::system::Binary_log_driver *driver);
 } // namespace binlog
 } // namespace ruby
 

data/ext/ruby_binlog_cast_to_tcp_driver.cpp

@@ -0,0 +1,18 @@
+#include "ruby_binlog.h"
+
+namespace ruby {
+namespace binlog {
+
+mysql::system::Binlog_tcp_driver *cast_to_tcp_driver(mysql::system::Binary_log_driver *driver) {
+  const char *cname = typeid(*driver).name();
+  std::string name = cname;
+
+  if(name.find("tcp_driver") == std::string::npos) {
+    return 0;
+  }
+
+  return static_cast<mysql::system::Binlog_tcp_driver *>(driver);
+}
+
+} // namespace binlog
+} // namespace ruby

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-binlog
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-26 00:00:00 Z
+date: 2012-08-28 00:00:00 Z
 dependencies: []
 
 description: Ruby binding for MySQL Binary log API.
@@ -30,6 +30,7 @@ files:
 - ext/ruby_binlog_xid_event.cpp
 - ext/ruby_binlog_rotate_event.cpp
 - ext/ruby_binlog_format_event.cpp
+- ext/ruby_binlog_cast_to_tcp_driver.cpp
 - ext/ruby_binlog_user_var_event.cpp
 - ext/ruby_binlog.cpp
 - ext/ruby_binlog_table_map_event.cpp