clickhouse 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ef193e0967f146e206ce76d41d1b5893948ae9
-  data.tar.gz: 47a7ba893cb391215495c80384146947be07b62d
+  metadata.gz: 9430c069f56f33af1e4e54bcad89cf33fd836051
+  data.tar.gz: a708443dd04408661f84e897e0cec49777188330
 SHA512:
-  metadata.gz: 774e1ae3330a758d3dd5bd0609d4f4819a06050a35f2f66b520fbfced6baab89ab376e5c855079486dccc841e627bfb9db19af48ca5005c08154d9e95974180d
-  data.tar.gz: 06dd73764247a86c0651f50b1a10c27f5b8f8e13e1b9198b5f1386f73edb597c9c51afb8f28f08999a4feaf4f6fc7fefe4ae967af93d29682ead965d34293f67
+  metadata.gz: 4b99166f3cbe200af3337764a0db939432094168d52cd2ba0f6526ef43fc5778e60030bbb49e7e877def07b5c0670df71a2c548488135a5a7613a2e7510884c8
+  data.tar.gz: a71ad741943715b618bfae02fa34874074b4a72c3b9814c2a38c48bb5fae184b77a9367aa6976d6ca68312397112db11a28bbf3fee4573443839bec5c05fafca

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Clickhouse CHANGELOG
 
+### Version 0.1.3 (October 21, 2016)
+
+* Only removing connections from cluster connection pool after a Clickhouse::ConnectionError
+
 ### Version 0.1.2 (October 20, 2016)
 
 * Being able to specify a URL

data/README.md

@@ -141,6 +141,40 @@ GROUP BY year, date;
 => [2, 2016, #<Date: 2016-10-17 ((2457679j,0s,0n),+0s,2299161j)>, 0.1915000081062317]
 ```
 
+### Connecting to a cluster
+
+To connect to a cluster you only need to specify the URLs of the cluster servers in `:urls` of the configuration and that is it! The API of using Clickhouse stays the same.
+
+```ruby
+Clickhouse.establish_connection urls: %w(http://192.168.99.100:32809 http://192.168.99.100:32812 http://192.168.99.100:32815)
+=> true
+
+Clickhouse.connection.tables
+I, [2016-10-21T11:56:47.375772 #63374]  INFO -- :
+  SQL (6.2ms)  SHOW TABLES;
+=> ["events"]
+```
+
+In case of a connection dropping out, Clickhouse will retry the request with another connection. The failed connection will also be removed from the connection pool.
+
+```ruby
+Clickhouse.establish_connection urls: %w(http://192.168.99.100:32809 http://192.168.99.100:1 http://192.168.99.100:32815)
+=> true
+
+Clickhouse.connection.pond.available.collect(&:url)
+=> ["http://192.168.99.100:1", "http://192.168.99.100:32815", "http://192.168.99.100:32809"]
+
+Clickhouse.connection.tables
+I, [2016-10-21T12:11:55.974573 #63527]  INFO -- :
+  SQL (7.1ms)  SHOW TABLES;
+=> ["events"]
+
+Clickhouse.connection.pond.available.collect(&:url)
+=> ["http://192.168.99.100:32809", "http://192.168.99.100:32815"]
+```
+
+If all the connections failed, it will just return `nil`.
+
 ### Check out the tests
 
 To see what more the `Clickhouse` gem has to offer, please take a look at the unit tests ( [test/unit/connection/test_query.rb](https://github.com/archan937/clickhouse/blob/master/test/unit/connection/test_query.rb) for instance).

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/clickhouse/cluster.rb

@@ -33,7 +33,7 @@ module Clickhouse
       pond.checkout do |connection|
         connection.send(*args, &block)
       end
-    rescue
+    rescue ::Clickhouse::ConnectionError
       retry if pond.available.any?
     end
 

data/lib/clickhouse/error.rb

@@ -3,16 +3,16 @@ module Clickhouse
   class Error < StandardError
   end
 
-  class InvalidConnectionError < Error
-  end
-
   class ConnectionError < Error
   end
 
-  class InvalidQueryError < Error
+  class InvalidConnectionError < ConnectionError
   end
 
   class QueryError < Error
   end
 
+  class InvalidQueryError < QueryError
+  end
+
 end

data/lib/clickhouse/version.rb

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

data/test/unit/connection/test_cluster.rb

@@ -34,6 +34,7 @@ module Unit
         describe "when connection fails" do
           it "removes invalid connections from the pond" do
             cluster = Clickhouse::Cluster.new :urls => %w(http://localhost:1234 http://localhost:1235 http://localhost:1236)
+
             assert_equal %w(
               http://localhost:1234
               http://localhost:1235
@@ -44,6 +45,29 @@ module Unit
             assert_equal [], cluster.pond.available.collect(&:url)
           end
         end
+
+        describe "when error gets raised other than Clickhouse::ConnectionError" do
+          it "does not remove the connection from the pond" do
+            Clickhouse::Connection.any_instance.expects(:ping!)
+
+            cluster = Clickhouse::Cluster.new :urls => %w(http://localhost:1234 http://localhost:1235 http://localhost:1236)
+            assert_equal %w(
+              http://localhost:1234
+              http://localhost:1235
+              http://localhost:1236
+            ), cluster.pond.available.collect(&:url)
+
+            assert_raises NoMethodError do
+              cluster.select_rows ""
+            end
+
+            assert_equal %w(
+              http://localhost:1235
+              http://localhost:1236
+              http://localhost:1234
+            ), cluster.pond.available.collect(&:url)
+          end
+        end
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday