swift 0.4.2 → 0.4.3

data/README.rdoc

@@ -23,13 +23,6 @@ dbic++ can be found here http://github.com/deepfryed/dbicpp
 * EventMachine asynchronous interface.
 * Migrations.
 
-== Performance
-
-Swift prefers performance when it doesn't compromise the Ruby-ish interface. It's unfair to compare Swift to DataMapper
-and ActiveRecord which suffer under the weight of support for many more databases and legacy/alternative Ruby
-implementations. That said obviously if Swift were slower it would be redundant so benchmark code does exist in
-http://github.com/shanna/swift/tree/master/benchmarks
-
 == Synopsis
 
 === DB
@@ -193,7 +186,14 @@ You are not just limited to files - you can stream data from anywhere into MySQL
 PostgreSQL directly without creating temporary files.
 
 
-== Benchmarks
+== Performance
+
+Swift prefers performance when it doesn't compromise the Ruby-ish interface. It's unfair to compare Swift to DataMapper
+and ActiveRecord which suffer under the weight of support for many more databases and legacy/alternative Ruby
+implementations. That said obviously if Swift were slower it would be redundant so benchmark code does exist in
+http://github.com/shanna/swift/tree/master/benchmarks
+
+=== Benchmarks
 
 The following bechmarks were run on a machine with 4G ram, 5200rpm sata drive,
 Intel Core2Duo P8700 2.53GHz and stock PostgreSQL 8.4.1.

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/ext/extconf.rb

@@ -4,7 +4,7 @@ require 'mkmf'
 Config::CONFIG['CC']  = 'g++'
 Config::CONFIG['CPP'] = 'g++'
 
-$CFLAGS  = '-fPIC -O3'
+$CFLAGS  = '-fPIC -Os'
 
 def apt_install_hint pkg
   "sudo apt-get install #{pkg}"

data/ext/swift.cc

@@ -27,7 +27,7 @@ static VALUE fRead;
 static VALUE fWrite;
 
 size_t tzoffset;
-char errstr[8192];
+char   errstr[8192];
 
 #define CSTRING(v)    RSTRING_PTR(TYPE(v) == T_STRING ? v : rb_funcall(v, fStringify, 0))
 #define OBJ2STRING(v) (TYPE(v) == T_STRING ? v : rb_funcall(v, fStringify, 0))
@@ -420,8 +420,8 @@ VALUE rb_field_typecast(VALUE adapter, int type, const char *data, ulong len) {
     time_t epoch, offset;
     struct tm tm;
 
-    char datetime[512], tzsign = ' ';
-    int hour = 0, min = 0, sec = 0, tzhour = 0, tzmin = 0;
+    char tzsign = ' ';
+    int tzhour = 0, tzmin = 0;
     double usec = 0;
 
     switch(type) {
@@ -436,18 +436,25 @@ VALUE rb_field_typecast(VALUE adapter, int type, const char *data, ulong len) {
         case DBI_TYPE_TEXT:
             return rb_enc_str_new(data, len, rb_utf8_encoding());
         case DBI_TYPE_TIME:
-            // if timestamp field has usec resolution, parse it.
-            if (strlen(data) > 19 && data[19] == '.') {
-                sscanf(data, "%s %d:%d:%d%lf%c%02d:%02d",
-                    datetime, &hour, &min, &sec, &usec, &tzsign, &tzhour, &tzmin);
+            /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+               NOTE Flexibility sacrificed for performance.
+                    Timestamp parser is very unforgiving and only parses
+                    YYYY-MM-DD HH:MM:SS.ms[+-]HH:MM
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+            memset(&tm, 0, sizeof(struct tm));
+            if (strchr(data, '.')) {
+                sscanf(data, "%04d-%02d-%02d %02d:%02d:%02d%lf%c%02d:%02d",
+                    &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec,
+                    &usec, &tzsign, &tzhour, &tzmin);
             }
             else {
-                sscanf(data, "%s %d:%d:%d%c%02d:%02d",
-                    datetime, &hour, &min, &sec, &tzsign, &tzhour, &tzmin);
+                sscanf(data, "%04d-%02d-%02d %02d:%02d:%02d%c%02d:%02d",
+                    &tm.tm_year, &tm.tm_mon, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec,
+                    &tzsign, &tzhour, &tzmin);
             }
-            sprintf(datetime, "%s %02d:%02d:%02d", datetime, hour, min, sec);
-            memset(&tm, 0, sizeof(struct tm));
-            if (strptime(datetime, "%F %T", &tm)) {
+            tm.tm_year -= 1900;
+            tm.tm_mon  -= 1;
+            if (tm.tm_mday > 0) {
                 offset = tzoffset;
                 epoch  = mktime(&tm);
                 if (tzsign == '+' || tzsign == '-') {

data/swift.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swift}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Hanna", "Bharanee 'Barney' Rathna"]
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
      "test/test_encoding.rb",
      "test/test_identity_map.rb",
      "test/test_io.rb",
+     "test/test_pool.rb",
      "test/test_timestamps.rb"
   ]
   s.homepage = %q{http://github.com/shanna/swift}
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
      "test/test_timestamps.rb",
      "test/helper.rb",
      "test/test_identity_map.rb",
+     "test/test_pool.rb",
      "examples/async.rb",
      "examples/scheme.rb",
      "examples/db.rb"

data/test/helper.rb

@@ -4,6 +4,7 @@ require 'minitest/spec'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'swift'
+require 'swift/pool'
 
 class MiniTest::Unit::TestCase
 end

data/test/test_pool.rb

@@ -0,0 +1,34 @@
+require_relative 'helper'
+
+describe 'Adapter' do
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql do
+    describe 'Asynchronous connection pool' do
+      before do
+        Swift.db do |db|
+          type = db.is_a?(Swift::DB::Postgres) ? 'bytea' : 'blob'
+          db.execute %q{drop table if exists users}
+          db.execute %Q{create table users(id serial, name text)}
+        end
+      end
+
+      it 'creates connection pool' do
+        driver = Swift.db.kind_of?(Swift::DB::Mysql) ? 'mysql' : 'postgresql'
+        assert Swift::Pool.new 5, db: 'swift_test', driver: driver
+      end
+
+      describe 'Running queries' do
+        it 'should select data' do
+          rows = []
+          assert Swift.db.write('users', %w{name}, StringIO.new("user1\nuser2\nuser3\n"))
+          Swift.pool 5 do |pool|
+            pool.execute('select * from users') do |rs|
+              rows += rs.to_a
+              pool.execute('select * from users') {|rs| rows += rs.to_a }
+            end
+          end
+          assert_equal 6, rows.length
+        end
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Shane Hanna
@@ -66,6 +66,7 @@ files:
 - test/test_encoding.rb
 - test/test_identity_map.rb
 - test/test_io.rb
+- test/test_pool.rb
 - test/test_timestamps.rb
 has_rdoc: true
 homepage: http://github.com/shanna/swift
@@ -104,6 +105,7 @@ test_files:
 - test/test_timestamps.rb
 - test/helper.rb
 - test/test_identity_map.rb
+- test/test_pool.rb
 - examples/async.rb
 - examples/scheme.rb
 - examples/db.rb