swift-db-mysql 0.1.2 → 0.2.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.0 (2012-07-30)
+
+* cleaup & remove rb_gc_mark outside the mark phase.
+
 == 0.1.2 (2012-07-29)
 
 * gc guard bind parameters during execute.

data/ext/swift/db/mysql/adapter.c

@@ -30,8 +30,8 @@ Adapter* db_mysql_adapter_handle_safe(VALUE self) {
 }
 
 void db_mysql_adapter_mark(Adapter *a) {
-    if (a)
-        rb_gc_mark_maybe(a->io);
+    if (a && a->io)
+        rb_gc_mark(a->io);
 }
 
 VALUE db_mysql_adapter_deallocate(Adapter *a) {
@@ -43,26 +43,27 @@ VALUE db_mysql_adapter_deallocate(Adapter *a) {
 
 VALUE db_mysql_adapter_allocate(VALUE klass) {
     Adapter *a = (Adapter*)malloc(sizeof(Adapter));
-
-    a->connection = 0;
-    a->t_nesting  = 0;
-    a->io         = Qnil;
+    memset(a, 0, sizeof(Adapter));
     return Data_Wrap_Struct(klass, db_mysql_adapter_mark, db_mysql_adapter_deallocate, a);
 }
 
 int db_mysql_adapter_infile_init(void **ptr, const char *filename, void *self) {
     Adapter *a = db_mysql_adapter_handle_safe((VALUE)self);
     *ptr = (void *)self;
-    return NIL_P(a->io) ? -1 : 0;
+    return a->io ? 0 : -1;
 }
 
 int db_mysql_adapter_infile_read(void *ptr, char *buffer, unsigned int size) {
     VALUE data;
     Adapter *a = db_mysql_adapter_handle_safe((VALUE)ptr);
 
+    if (!a->io)
+        return 0;
+
     data = rb_funcall(a->io, rb_intern("read"), 1, INT2NUM(size));
 
-    if (NIL_P(data)) return 0;
+    if (NIL_P(data))
+        return 0;
 
     memcpy(buffer, RSTRING_PTR(data), RSTRING_LEN(data));
     return RSTRING_LEN(data);
@@ -70,12 +71,12 @@ int db_mysql_adapter_infile_read(void *ptr, char *buffer, unsigned int size) {
 
 void db_mysql_adapter_infile_end(void *ptr) {
     Adapter *a = db_mysql_adapter_handle_safe((VALUE)ptr);
-    a->io = Qnil;
+    a->io = 0;
 }
 
 int db_mysql_adapter_infile_error(void *ptr, char *error, unsigned int size) {
     Adapter *a = db_mysql_adapter_handle_safe((VALUE)ptr);
-    a->io = Qnil;
+    a->io = 0;
     snprintf(error, size, "error loading data using LOAD INFILE");
     return 0;
 }
@@ -402,10 +403,9 @@ VALUE db_mysql_adapter_write(int argc, VALUE *argv, VALUE self) {
                 CSTRING(table), CSTRING(rb_ary_join(fields, rb_str_new2(", "))));
 
         a->io = rb_respond_to(io, rb_intern("read")) ? io : rb_funcall(cStringIO, rb_intern("new"), 1, TO_S(io));
-        rb_gc_mark(a->io);
         if (mysql_real_query(a->connection, sql, strlen(sql)) != 0) {
             free(sql);
-            a->io = Qnil;
+            a->io = 0;
             rb_raise(eSwiftRuntimeError, "%s", mysql_error(a->connection));
         }
 

data/ext/swift/db/mysql/result.c

@@ -19,7 +19,6 @@ typedef struct Result {
 
     VALUE fields;
     VALUE types;
-    VALUE rows;
     VALUE statement;
 
     size_t cols;
@@ -43,14 +42,12 @@ Result* db_mysql_result_handle(VALUE self) {
 
 void db_mysql_result_mark(Result *r) {
     if (r) {
-        if (!NIL_P(r->fields))
-            rb_gc_mark_maybe(r->fields);
-        if (!NIL_P(r->types))
-            rb_gc_mark_maybe(r->types);
-        if (!NIL_P(r->rows))
-            rb_gc_mark_maybe(r->rows);
-        if (!NIL_P(r->rows))
-            rb_gc_mark_maybe(r->statement);
+        if (r->fields)
+            rb_gc_mark(r->fields);
+        if (r->types)
+            rb_gc_mark(r->types);
+        if (r->statement)
+            rb_gc_mark(r->statement);
     }
 }
 
@@ -86,7 +83,6 @@ VALUE db_mysql_result_load(VALUE self, MYSQL_RES *result, size_t insert_id, size
     Result *r    = db_mysql_result_handle(self);
     r->fields    = rb_ary_new();
     r->types     = rb_ary_new();
-    r->rows      = rb_ary_new();
     r->r         = result;
     r->affected  = affected;
     r->insert_id = insert_id;

data/ext/swift/db/mysql/statement.c

@@ -33,7 +33,7 @@ Statement* db_mysql_statement_handle_safe(VALUE self) {
 
 void db_mysql_statement_mark(Statement *s) {
     if (s && s->adapter)
-        rb_gc_mark_maybe(s->adapter);
+        rb_gc_mark(s->adapter);
 }
 
 VALUE db_mysql_statement_deallocate(Statement *s) {
@@ -54,9 +54,7 @@ VALUE db_mysql_statement_initialize(VALUE self, VALUE adapter, VALUE sql) {
     MYSQL *connection;
     Statement *s = db_mysql_statement_handle(self);
 
-    s->adapter = adapter;
-    rb_gc_mark(s->adapter);
-
+    s->adapter   = adapter;
     connection   = db_mysql_adapter_handle_safe(adapter)->connection;
     s->statement = mysql_stmt_init(connection);
     sql          = TO_S(sql);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-mysql
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -37,11 +37,11 @@ extra_rdoc_files: []
 files:
 - ext/swift/db/mysql/datetime.c
 - ext/swift/db/mysql/main.c
-- ext/swift/db/mysql/adapter.c
 - ext/swift/db/mysql/result.c
 - ext/swift/db/mysql/typecast.c
 - ext/swift/db/mysql/statement.c
 - ext/swift/db/mysql/common.c
+- ext/swift/db/mysql/adapter.c
 - ext/swift/db/mysql/typecast.h
 - ext/swift/db/mysql/datetime.h
 - ext/swift/db/mysql/adapter.h