swift-db-postgres 0.2.5 → 0.2.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.2.6 (2012-11-14)
+
+* Ruby 2.x build fixes.
+* Pause GC around execute() with bind values.
+
 == 0.2.5 (2012-09-26)
 
 * allow more than 99 placeholders. contributor: @filterfish

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

@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include "adapter.h"
 #include "typecast.h"
+#include "gvl.h"
 
 /* declaration */
 VALUE cDPA, sUser;
@@ -111,14 +112,15 @@ VALUE db_postgres_adapter_initialize(VALUE self, VALUE options) {
     return self;
 }
 
-VALUE nogvl_pq_exec(void *ptr) {
+GVL_NOLOCK_RETURN_TYPE nogvl_pq_exec(void *ptr) {
     Query *q = (Query *)ptr;
-    return (VALUE)PQexec(q->connection, q->command);
+    return (GVL_NOLOCK_RETURN_TYPE)PQexec(q->connection, q->command);
 }
 
-VALUE nogvl_pq_exec_params(void *ptr) {
+GVL_NOLOCK_RETURN_TYPE nogvl_pq_exec_params(void *ptr) {
     Query *q = (Query *)ptr;
-    return (VALUE)PQexecParams(q->connection, q->command, q->n_args, 0, (const char * const *)q->data, q->size, q->format, 0);
+    PGresult * r = PQexecParams(q->connection, q->command, q->n_args, 0, (const char * const *)q->data, q->size, q->format, 0);
+    return (GVL_NOLOCK_RETURN_TYPE)r;
 }
 
 VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
@@ -132,12 +134,13 @@ VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
     if (!a->native)
         sql = db_postgres_normalized_sql(sql);
 
+    rb_gc_register_address(&sql);
+    rb_gc_register_address(&bind);
     if (RARRAY_LEN(bind) > 0) {
         bind_args_size = (int   *) malloc(sizeof(int)    * RARRAY_LEN(bind));
         bind_args_fmt  = (int   *) malloc(sizeof(int)    * RARRAY_LEN(bind));
         bind_args_data = (char **) malloc(sizeof(char *) * RARRAY_LEN(bind));
 
-        rb_gc_register_address(&bind);
         for (n = 0; n < RARRAY_LEN(bind); n++) {
             data = rb_ary_entry(bind, n);
             if (NIL_P(data)) {
@@ -153,7 +156,7 @@ VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
 
                 data = typecast_to_string(data);
                 bind_args_size[n] = RSTRING_LEN(data);
-                bind_args_data[n] = RSTRING_PTR(data);
+                bind_args_data[n] = CSTRING_PTR(data);
             }
         }
 
@@ -166,17 +169,21 @@ VALUE db_postgres_adapter_execute(int argc, VALUE *argv, VALUE self) {
             .format     = bind_args_fmt
         };
 
-        result = (PGresult *)rb_thread_blocking_region(nogvl_pq_exec_params, &q, RUBY_UBF_IO, 0);
-        rb_gc_unregister_address(&bind);
+        result = (PGresult *)GVL_NOLOCK(nogvl_pq_exec_params, &q, RUBY_UBF_IO, 0);
+        for (n = 0; n < RARRAY_LEN(bind); n++)
+            if (bind_args_data[n])
+                free(bind_args_data[n]);
         free(bind_args_size);
         free(bind_args_data);
         free(bind_args_fmt);
     }
     else {
         Query q = {.connection = a->connection, .command = CSTRING(sql)};
-        result = (PGresult *)rb_thread_blocking_region(nogvl_pq_exec, &q, RUBY_UBF_IO, 0);
+        result = (PGresult *)GVL_NOLOCK(nogvl_pq_exec, &q, RUBY_UBF_IO, 0);
     }
 
+    rb_gc_unregister_address(&sql);
+    rb_gc_unregister_address(&bind);
     db_postgres_check_result(result);
     return db_postgres_result_load(db_postgres_result_allocate(cDPR), result);
 }

data/ext/swift/db/postgres/common.c

@@ -3,8 +3,15 @@
 // (c) Bharanee Rathna 2012
 
 #include "common.h"
+#include <math.h>
 #include <uuid/uuid.h>
 
+char* CSTRING_PTR(VALUE value) {
+    char* result = malloc(RSTRING_LEN(value) + 1);
+    memcpy(result, RSTRING_PTR(value), RSTRING_LEN(value) + 1);
+    return result;
+}
+
 VALUE rb_uuid_string() {
     size_t n;
     uuid_t uuid;
@@ -18,25 +25,21 @@ VALUE rb_uuid_string() {
     return rb_str_new(uuid_hex, sizeof(uuid_t) * 2 + 1);
 }
 
-/* TODO: very naive, a better ragel based replace thingamajigy */
+/* NOTE: very naive, no regex etc. */
 VALUE db_postgres_normalized_sql(VALUE sql) {
     VALUE result;
-    int i = 0, j = 0, n = 1, size;
-    char *normalized, *ptr = RSTRING_PTR(sql);
-
-    size       = RSTRING_LEN(sql) * 2;
-    normalized = (char *)malloc(size);
+    int i = 0, j = 0, n = 1, size = RSTRING_LEN(sql) * 2, digits;
+    char *ptr = RSTRING_PTR(sql), *normalized = malloc(size);
 
     while (i < RSTRING_LEN(sql)) {
         if (*ptr == '?')
-            j += snprintf(normalized + j, 6, "$%d", n++);
+            j += sprintf(normalized + j, "$%d", n++);
         else
             normalized[j++] = *ptr;
 
-        if (j >= size - 6) {
-            size       = size * 2;
-            normalized = (char *)realloc(normalized, size);
-        }
+        digits = (int)floor(log10(n)) + 2;
+        if (j + digits >= size)
+            normalized = realloc(normalized, size += 4096);
 
         ptr++;
         i++;

data/ext/swift/db/postgres/common.h

@@ -22,6 +22,7 @@ extern VALUE cDPA, cDPS, cDPR;
 extern VALUE eSwiftError, eSwiftArgumentError, eSwiftRuntimeError, eSwiftConnectionError;
 extern VALUE cStringIO;
 
+DLL_PRIVATE char* CSTRING_PTR(VALUE);
 DLL_PRIVATE VALUE rb_uuid_string();
 DLL_PRIVATE VALUE db_postgres_normalized_sql(VALUE);
 DLL_PRIVATE void  db_postgres_check_result(PGresult *);

data/ext/swift/db/postgres/gvl.h

@@ -0,0 +1,18 @@
+// vim:ts=4:sts=4:sw=4:expandtab
+
+// (c) Bharanee Rathna 2012
+
+#pragma once
+
+#include "ruby/ruby.h"
+#include "ruby/intern.h"
+#include "ruby/version.h"
+
+#if RUBY_API_VERSION_MAJOR >= 2
+#include "ruby/thread.h"
+#define GVL_NOLOCK rb_thread_call_without_gvl
+#define GVL_NOLOCK_RETURN_TYPE void*
+#else
+#define GVL_NOLOCK rb_thread_blocking_region
+#define GVL_NOLOCK_RETURN_TYPE VALUE
+#endif

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

@@ -5,6 +5,7 @@
 #include "statement.h"
 #include "adapter.h"
 #include "typecast.h"
+#include "gvl.h"
 
 /* declaration */
 
@@ -88,9 +89,10 @@ VALUE db_postgres_statement_release(VALUE self) {
     return Qfalse;
 }
 
-VALUE nogvl_pq_exec_prepared(void *ptr) {
+ GVL_NOLOCK_RETURN_TYPE nogvl_pq_exec_prepared(void *ptr) {
     Query *q = (Query *)ptr;
-    return (VALUE)PQexecPrepared(q->connection, q->command, q->n_args, (const char * const *)q->data, q->size, q->format, 0);
+    PGresult *r  = PQexecPrepared(q->connection, q->command, q->n_args, (const char * const *)q->data, q->size, q->format, 0);
+    return (GVL_NOLOCK_RETURN_TYPE)r;
 }
 
 VALUE db_postgres_statement_execute(int argc, VALUE *argv, VALUE self) {
@@ -105,12 +107,12 @@ VALUE db_postgres_statement_execute(int argc, VALUE *argv, VALUE self) {
 
     rb_scan_args(argc, argv, "00*", &bind);
 
+    rb_gc_register_address(&bind);
     if (RARRAY_LEN(bind) > 0) {
         bind_args_size = (int   *) malloc(sizeof(int)    * RARRAY_LEN(bind));
         bind_args_fmt  = (int   *) malloc(sizeof(int)    * RARRAY_LEN(bind));
         bind_args_data = (char **) malloc(sizeof(char *) * RARRAY_LEN(bind));
 
-        rb_gc_register_address(&bind);
         for (n = 0; n < RARRAY_LEN(bind); n++) {
             data = rb_ary_entry(bind, n);
             if (NIL_P(data)) {
@@ -125,7 +127,7 @@ VALUE db_postgres_statement_execute(int argc, VALUE *argv, VALUE self) {
                     bind_args_fmt[n] = 0;
                 data = typecast_to_string(data);
                 bind_args_size[n] = RSTRING_LEN(data);
-                bind_args_data[n] = RSTRING_PTR(data);
+                bind_args_data[n] = CSTRING_PTR(data);
             }
         }
 
@@ -138,8 +140,10 @@ VALUE db_postgres_statement_execute(int argc, VALUE *argv, VALUE self) {
             .format     = bind_args_fmt
         };
 
-        result = (PGresult *)rb_thread_blocking_region(nogvl_pq_exec_prepared, &q, RUBY_UBF_IO, 0);
-        rb_gc_unregister_address(&bind);
+        result = (PGresult *)GVL_NOLOCK(nogvl_pq_exec_prepared, &q, RUBY_UBF_IO, 0);
+        for (n = 0; n < RARRAY_LEN(bind); n++)
+            if (bind_args_data[n])
+                free(bind_args_data[n]);
         free(bind_args_fmt);
         free(bind_args_size);
         free(bind_args_data);
@@ -153,9 +157,10 @@ VALUE db_postgres_statement_execute(int argc, VALUE *argv, VALUE self) {
             .size       = 0,
             .format     = 0
         };
-        result = (PGresult *)rb_thread_blocking_region(nogvl_pq_exec_prepared, &q, RUBY_UBF_IO, 0);
+        result = (PGresult *)GVL_NOLOCK(nogvl_pq_exec_prepared, &q, RUBY_UBF_IO, 0);
     }
 
+    rb_gc_unregister_address(&bind);
     db_postgres_check_result(result);
     return db_postgres_result_load(db_postgres_result_allocate(cDPR), result);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift-db-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -37,17 +37,18 @@ extra_rdoc_files: []
 files:
 - ext/swift/db/postgres/datetime.c
 - ext/swift/db/postgres/result.c
+- ext/swift/db/postgres/common.c
 - ext/swift/db/postgres/adapter.c
-- ext/swift/db/postgres/statement.c
 - ext/swift/db/postgres/typecast.c
-- ext/swift/db/postgres/common.c
+- ext/swift/db/postgres/statement.c
 - ext/swift/db/postgres/main.c
 - ext/swift/db/postgres/typecast.h
-- ext/swift/db/postgres/common.h
 - ext/swift/db/postgres/datetime.h
 - ext/swift/db/postgres/result.h
+- ext/swift/db/postgres/gvl.h
 - ext/swift/db/postgres/statement.h
 - ext/swift/db/postgres/adapter.h
+- ext/swift/db/postgres/common.h
 - ext/swift/db/postgres/extconf.rb
 - test/test_ssl.rb
 - test/test_adapter.rb
@@ -84,4 +85,3 @@ signing_key:
 specification_version: 3
 summary: Swift postgres adapter
 test_files: []
-has_rdoc: