quandl_cassandra 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 756eb2a45036fe393963ff6941347c29decb2ac4
-  data.tar.gz: 795fda4ec1224d696794799cc425e26332070214
+  metadata.gz: b04729bd3d3e3675a93e9bbc6f0fef5cadd7c8c9
+  data.tar.gz: be46b8678c94354e2c6e6fa0afdd659ae18db3e9
 SHA512:
-  metadata.gz: a18fb65de10df02b1e298264c7094f8e382feb9081c0cb95602eddf7738d172ff0f43a9854db5604444596a6f1f276145fef82edab362a0ecc7eff4ad0c2e8e0
-  data.tar.gz: 7c35c8eaae1fb3177dfb8014fa4f569783ab5814e487eb3217990d153fd3d1330f9b22083bf91c1877b43392ee996e8980a8d1038d3f9a8d0328a3c3e329fe10
+  metadata.gz: 91c13e7f33ff01a8b0356c06fb40dbf3a960e896e2fca59108a75acc162c6283d763ca5622ac9b5417bf81584052660712e2f569be40693a9f2250a9bd3e25a2
+  data.tar.gz: b2c0492d2a9314c73911442843ea8d7dce3099823efc04167e04f5768e0e5b0c213f748847d68d595a21642d2319f7b41eb74b8b2a2d0499700e9a879b6a25a4

data/Gemfile

@@ -7,5 +7,4 @@ local_gem_dir = ENV['BUNDLE_LOCAL_DIR']
 if use_local_gems
   gem 'quandl_data', path: "#{local_gem_dir}/quandl/data"
   gem 'quandl_operation', path: "#{local_gem_dir}/quandl/operation"
-  gem 'quandl_babelfish', path: "#{local_gem_dir}/quandl/babelfish"
 end

data/lib/quandl/cassandra/base/connection.rb

@@ -19,43 +19,55 @@ module Quandl::Cassandra::Base::Connection
       with_connection do |c|
         c.prepare(statement)
       end
+    rescue Cql::QueryError
+      raise $!, "#{$!}\n  statement: #{statement}", $!.backtrace
     end
     
-    def execute_async(statement, query_consistency = nil)
-      query_consistency = consistency unless query_consistency.present?
+    def execute_async(statement, consist = nil)
+      consist = consistency unless consist.present?
       with_connection do |c|
-        c.async.execute( statement, query_consistency )
+        c.async.execute( statement, consist )
       end
-    rescue Cql::QueryError => e
-      raise $!, "#{statement} #{$!}", $!.backtrace
+    rescue Cql::QueryError
+      raise $!, "#{$!}\n  statement: #{statement}", $!.backtrace
     end
     
-    def execute(statement, qconsistency = nil)
-      qconsistency = consistency unless qconsistency.present?
+    def execute(statement, consist = nil)
+      consist = consistency unless consist.present?
       with_connection do |c|
-        c.execute( statement, qconsistency )
+        c.execute( statement, consist )
       end
-    rescue Cql::QueryError => e
-      raise $!, "#{statement} #{$!}", $!.backtrace
+    rescue Cql::QueryError
+      raise $!, "#{$!}\n  statement: #{statement}", $!.backtrace
     end
     
     def with_connection(&block)
-      begin
-        yield(connection)
-        
-      rescue Cql::Io::ConnectionError => err
-        Quandl::Logger.error(err)
-        reset_connection
-        raise
-        
-      rescue Cql::NotConnectedError => err
-        Quandl::Logger.error(err)
-        reset_connection
-        raise
-      
+      rescue_and_retry(2) do
+        block.call(connection)
       end
     end
     
+    def rescue_and_retry(times, &block)
+
+      block.call(connection)
+      
+    rescue Cql::QueryError => err
+      #puts "ERROR: #{err.code} #{err}\n  cql: '#{err.cql}'"
+      Quandl::Logger.error("#{err.code} '#{err.cql}' #{$!}")
+      # raise error if it's failed three times
+      raise( $!, "#{err.code} '#{err.cql}' #{$!}", $!.backtrace ) if times <= 1
+      # otherwise rescue and retry
+      rescue_and_retry(times - 1, &block)
+      
+    rescue Cql::Io::ConnectionError, Cql::NotConnectedError => err
+      #puts "ERROR: #{err}"
+      Quandl::Logger.error(err)
+      reset_connection
+      raise if times <= 1
+      rescue_and_retry(times - 1, &block)
+      
+    end
+    
     def connection
       @@connection ||= establish_connection
     end

data/lib/quandl/cassandra/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Cassandra
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassandra
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake