monetdb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWJkMDFjNjQyYWY5ZTFiY2IyZmU5YTQwYTUwMjhiZjY0OWRkYTM3Mg==
+    MThkM2ZmNjgyZDMwNmMzZmVlYTc3ZTBhYzZmZjhhZGFmOGFlZWFlNg==
   data.tar.gz: !binary |-
-    ZTBlNWNjNDA1YTAzN2I2YzYyZGZmZmVkYjEyYWVhMDk3MmI3OWE5OA==
+    MjZiNTIxYTNmMzkyOTQzMjBkNGQxZGY3MWJhMGQ0MjI1MGE5NWRiZg==
 SHA512:
   metadata.gz: !binary |-
-    ZWNiM2RmYmM1MTQ0MjE3ZDk4NzVjYWI5ZDYzMDFjMDFmYTg0YmNhZGYwYzIx
-    ZmE3MDJiNThmZGFhNjM5ZDQxODEwMjU3ZDVkNmM4MTFiZjg1YjE1NzU1NzNh
-    MjkzZGRkYTI0NjdhMjcwN2RlZGVhODk0NWIzZGMyMjkyMzZjNTI=
+    Njg2ZGY4ZjQxZWVhMmFhYjkxNDQ2NWJlYTM4ZmE1NDExZmIxYTJhNTRhYmQw
+    ZDUzZDFiY2ViMzRhNTk0MzkxZDI2NmZiOWE3NTM2NWM0ZWEyYTI5MGMxMGRh
+    MTc3MjcxNDVjNWY5OWNiYjY2OTEzNzA4ZGNjOWY5Nzg4MmUyYjI=
   data.tar.gz: !binary |-
-    ODUzYzExNWY5N2VjOWI0OWFiMmJjNDgzMDIyMDBjMmRlYTU4ZjU2NWM0ZTMy
-    NjM2MDMwODkzNzMzNTZkM2I2ZGU0YjhjMGU4ZTNkMGViNzU3MWY4YmNhYjhj
-    ZGEyZTMxY2Y4NzgyYWU2ZWZlMzgwZjcxNWU0ZmJhMGZjZTcxZjk=
+    NGU0NDk0MWFkNTMzYjU0MTllZGNiOWFiMmRlZWVkY2EzM2EzMTQwZDM1MDFj
+    NTc2NjZmZWExMDU5ODhiZTI5ODVkMGJmNmQ2NjQ5Yjk1NGI1NWZmZTg1NzQy
+    MTQ1NzI1ZDllYjExZWU3NzZjNGVlZjY4YTRiY2U4Mzg4MGUwY2E=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = MonetDB CHANGELOG
 
+== Version 0.1.2 (October 6, 2014)
+
+* Simplified MonetDB#select_rows gaining performance receiving the query result set
+
 == Version 0.1.1 (August 28, 2014)
 
 * Fixed raising several errors

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    monetdb (0.1.1)
+    monetdb (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/monetdb.rb

@@ -183,29 +183,48 @@ class MonetDB
   #
   # Returns an array of arrays with casted values.
   def select_rows(qry)
+    return if @connection.nil?
+    data = MonetDB::Data.new @connection
+
     start = Time.now
-    data = query(qry)
+    @connection.send(data.send(:format_query, qry))
+    result_set = @connection.receive.split("\n")
     log :info, "\n  SQL (#{((Time.now - start) * 1000).round(1)}ms)  #{qry}"
-    column_types = data.instance_variable_get(:@header)["columns_type"]
-    types = data.instance_variable_get(:@header)["columns_name"].collect{|x| column_types[x]}
-    data.fetch_all.collect do |array|
-      row = []
-      array.each_with_index do |value, index|
-        row << begin
-          unless value == "NULL"
-            case types[index]
-            when "bigint", "int"
-              value.to_i
-            when "double"
-              value.to_f
-            else
-              value.force_encoding("UTF-8")
+
+    if (row = result_set[0]).chr == MSG_INFO
+      raise QueryError, row
+    end
+
+    record_set = result_set.select{|x| [MSG_SCHEMA_HEADER, MSG_QUERY].include? x[0]}.compact
+    data.send :receive_record_set, record_set.join("\n")
+
+    if data.instance_variable_get(:@action) == Q_TABLE
+      header = data.send :parse_header_table, data.instance_variable_get(:@header)
+    end
+
+    column_types = header["columns_type"]
+    types = header["columns_name"].collect{|x| column_types[x]}
+
+    result_set.collect do |x|
+      if x[0] == MSG_TUPLE
+        row, values = [], x[1..-2].split(",\t")
+        values.each_with_index do |value, index|
+          row << begin
+            unless value.strip == "NULL"
+              case types[index]
+              when "bigint", "int"
+                value.to_i
+              when "double"
+                value.to_f
+              else
+                value.strip.gsub(/(^"|"$|\\|\")/, "").force_encoding("UTF-8")
+              end
             end
           end
         end
+        row
       end
-      row
-    end
+    end.compact
   end
 
   # Returns whether a "connection" object exists.

data/lib/monetdb/version.rb

@@ -1,7 +1,7 @@
 class MonetDB
   MAJOR = 0
   MINOR = 1
-  TINY  = 1
+  TINY  = 2
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monetdb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake