From fd4306c597501ac7c6d1b8b5c1708b5e6478968b Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Thu, 12 Jan 2017 11:28:14 -0800 Subject: [PATCH 1/4] docs(changelog) add recent additions to the 1.1.0 release --- CHANGELOG.md | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfdefc0..7662e0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,14 @@ ### [Unreleased][unreleased] -### [1.1.0] +### [1.1.0] - 2016/01/12 ##### Changed - :warning: Peers are now part of different connection pools depending on their keyspace. This can fix eventual issues when using several keyspaces with a -single peer/cluster instance. This is a breaking change: +single peer/cluster instance. +[6c0db5e](https://github.com/thibaultcha/lua-cassandra/commit/6c0db5e178daa119c6df2b40ff648349cba50799) +This is a breaking change: ```lua -- before: local peer = cassandra.new() @@ -16,7 +18,7 @@ single peer/cluster instance. This is a breaking change: -- after: local peer = cassandra.new() peer:connect() - peer:change_keyspace('my_keyspace') -- close the connection and opens a new one + peer:change_keyspace('my_keyspace') -- closes the underlying connection and open a new one ``` ##### Added @@ -41,11 +43,39 @@ more granularity in keyspace settings. Example: - Parse `SCHEMA_CHANGE` results for `FUNCTION` and `AGGREGATE`. - The Cluster module now parses warnings contained in response frames and logs them at the `ngx.WARN` level. +- Implement a `silent` option for `Cluster.new()` to disable logging in the + nginx error logs. + [#60](https://github.com/thibaultcha/lua-cassandra/pull/69) +- Implement a `lock_timeout` option for `Cluster.new()` to specify a max + waiting time in seconds for the cluster refreshing and requests preparing + mutexes. This option prevents such mutexes to hang for too long. + [2bd3d66](https://github.com/thibaultcha/lua-cassandra/commit/2bd3d66eb26530490391ffb0f5dc366cc9fd0874) +- Implement a `no_keyspace` option for `cluster:execute()` to execute a given + query with a socket that is not connected to any keyspace in particular. + [cdc6607](https://github.com/thibaultcha/lua-cassandra/commit/cdc6607d26d23d6d9e1268d3db316aaf90ce51a8) +- The `cluster:refresh()` method now returns the list of fetched Cassandra + nodes from the cluster as a third return value. + [34f5f11](https://github.com/thibaultcha/lua-cassandra/commit/34f5f1168f5a69dddf53c5564b8577250a7fde0a) ##### Fixed - Correctly logs the address of peers being set UP or DOWN in the warning logs. + [40fd870](https://github.com/thibaultcha/lua-cassandra/commit/40fd8705b55059e55e6687394354937d2dead2c2) - Better error messages for SSL handshake/locking failures. +- Better handling in case the shm containing the cluster info is full. We do + not override previous values at the risk of losing cluster nodes info, but + error out with the `"no memory"` error instead. + [4520a3b](https://github.com/thibaultcha/lua-cassandra/commit/4520a3b034a7b4d9d00975c95ecf834ce263f048) +- Correctly receives read and connect timeout options. + [#71](https://github.com/thibaultcha/lua-cassandra/pull/71) +- Log the reason behind retrying a request in the `cluster` module. + [#71](https://github.com/thibaultcha/lua-cassandra/pull/71) +- Fallback on `listen_address` when `rpc_address` is "bind all" when refreshing + the cluster nodes with the `cluster` module. + [#72](https://github.com/thibaultcha/lua-cassandra/pull/72) +- Propagate the CQL version in use when marshalling CQL collection types such + as map, set, tuple or udt. We now properly marshall such nested CQL values. + [#73](https://github.com/thibaultcha/lua-cassandra/pull/73) ### [1.0.0] - 2016/07/27 From bc275e12b312c3682704caaa5b07e1354dccc279 Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Thu, 12 Jan 2017 12:11:58 -0800 Subject: [PATCH 2/4] chore(rockspec) update repo URL --- lua-cassandra-1.1.0-0.rockspec | 4 ++-- lua-cassandra-dev-0.rockspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua-cassandra-1.1.0-0.rockspec b/lua-cassandra-1.1.0-0.rockspec index 59d2223..8089a38 100644 --- a/lua-cassandra-1.1.0-0.rockspec +++ b/lua-cassandra-1.1.0-0.rockspec @@ -1,12 +1,12 @@ package = "lua-cassandra" version = "1.1.0-0" source = { - url = "git://github.com/thibaultCha/lua-cassandra", + url = "git://github.com/thibaultcha/lua-cassandra", tag = "1.1.0" } description = { summary = "A pure Lua client library for Apache Cassandra", - homepage = "https://github.com/thibaultCha/lua-cassandra", + homepage = "https://github.com/thibaultcha/lua-cassandra", license = "MIT" } dependencies = { diff --git a/lua-cassandra-dev-0.rockspec b/lua-cassandra-dev-0.rockspec index f974e1f..7dd921a 100644 --- a/lua-cassandra-dev-0.rockspec +++ b/lua-cassandra-dev-0.rockspec @@ -1,11 +1,11 @@ package = "lua-cassandra" version = "dev-0" source = { - url = "git://github.com/thibaultCha/lua-cassandra" + url = "git://github.com/thibaultcha/lua-cassandra" } description = { summary = "A pure Lua client library for Apache Cassandra", - homepage = "https://github.com/thibaultCha/lua-cassandra", + homepage = "https://github.com/thibaultcha/lua-cassandra", license = "MIT" } dependencies = { From dd4d16dc6bd0adcf09961d4b823e1fbc909b78dd Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Thu, 12 Jan 2017 13:41:27 -0800 Subject: [PATCH 3/4] docs(ldoc) regenerate docs for 1.1.0 release --- docs/examples/authentication.lua.html | 4 ++-- docs/examples/batch.lua.html | 4 ++-- docs/examples/intro.lua.html | 4 ++-- docs/examples/pagination.lua.html | 4 ++-- docs/examples/ssl.lua.html | 4 ++-- docs/index.html | 4 ++-- docs/manual/README.md.html | 14 +++++++------- docs/modules/cassandra.html | 4 ++-- docs/modules/resty.cassandra.cluster.html | 4 ++-- .../modules/resty.cassandra.policies.lb.dc_rr.html | 4 ++-- docs/modules/resty.cassandra.policies.lb.rr.html | 4 ++-- ...esty.cassandra.policies.reconnection.const.html | 4 ++-- .../resty.cassandra.policies.reconnection.exp.html | 4 ++-- .../resty.cassandra.policies.retry.simple.html | 4 ++-- 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/docs/examples/authentication.lua.html b/docs/examples/authentication.lua.html index 3bd3674..913b381 100644 --- a/docs/examples/authentication.lua.html +++ b/docs/examples/authentication.lua.html @@ -105,8 +105,8 @@

authentication.lua

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/examples/batch.lua.html b/docs/examples/batch.lua.html index bba25e6..a178253 100644 --- a/docs/examples/batch.lua.html +++ b/docs/examples/batch.lua.html @@ -139,8 +139,8 @@

batch.lua

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/examples/intro.lua.html b/docs/examples/intro.lua.html index 5c47674..7eae347 100644 --- a/docs/examples/intro.lua.html +++ b/docs/examples/intro.lua.html @@ -182,8 +182,8 @@

intro.lua

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/examples/pagination.lua.html b/docs/examples/pagination.lua.html index 37327c6..6d5af46 100644 --- a/docs/examples/pagination.lua.html +++ b/docs/examples/pagination.lua.html @@ -115,8 +115,8 @@

pagination.lua

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/examples/ssl.lua.html b/docs/examples/ssl.lua.html index d70dc9b..3f9061a 100644 --- a/docs/examples/ssl.lua.html +++ b/docs/examples/ssl.lua.html @@ -121,8 +121,8 @@

ssl.lua

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/index.html b/docs/index.html index ca5ad58..7eaa7e5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -124,8 +124,8 @@

Examples

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/manual/README.md.html b/docs/manual/README.md.html index 83a9921..40ee33b 100644 --- a/docs/manual/README.md.html +++ b/docs/manual/README.md.html @@ -32,11 +32,11 @@

lua-cassandra

Contents

@@ -253,8 +253,8 @@

License

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/modules/cassandra.html b/docs/modules/cassandra.html index 1c1be73..3b40370 100644 --- a/docs/modules/cassandra.html +++ b/docs/modules/cassandra.html @@ -1120,8 +1120,8 @@

Usage:

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/modules/resty.cassandra.cluster.html b/docs/modules/resty.cassandra.cluster.html index 435ef6e..fd6b755 100644 --- a/docs/modules/resty.cassandra.cluster.html +++ b/docs/modules/resty.cassandra.cluster.html @@ -507,8 +507,8 @@

Fields:

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/modules/resty.cassandra.policies.lb.dc_rr.html b/docs/modules/resty.cassandra.policies.lb.dc_rr.html index 24c20fc..7854daa 100644 --- a/docs/modules/resty.cassandra.policies.lb.dc_rr.html +++ b/docs/modules/resty.cassandra.policies.lb.dc_rr.html @@ -134,8 +134,8 @@

Usage:

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/modules/resty.cassandra.policies.lb.rr.html b/docs/modules/resty.cassandra.policies.lb.rr.html index f25d0e0..dcfb17f 100644 --- a/docs/modules/resty.cassandra.policies.lb.rr.html +++ b/docs/modules/resty.cassandra.policies.lb.rr.html @@ -126,8 +126,8 @@

Usage:

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/modules/resty.cassandra.policies.reconnection.const.html b/docs/modules/resty.cassandra.policies.reconnection.const.html index 6ee67bc..571b561 100644 --- a/docs/modules/resty.cassandra.policies.reconnection.const.html +++ b/docs/modules/resty.cassandra.policies.reconnection.const.html @@ -133,8 +133,8 @@

Usage:

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/modules/resty.cassandra.policies.reconnection.exp.html b/docs/modules/resty.cassandra.policies.reconnection.exp.html index a59b2e8..2e8ccc2 100644 --- a/docs/modules/resty.cassandra.policies.reconnection.exp.html +++ b/docs/modules/resty.cassandra.policies.reconnection.exp.html @@ -140,8 +140,8 @@

Usage:

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
diff --git a/docs/modules/resty.cassandra.policies.retry.simple.html b/docs/modules/resty.cassandra.policies.retry.simple.html index 841800f..fcfdeeb 100644 --- a/docs/modules/resty.cassandra.policies.retry.simple.html +++ b/docs/modules/resty.cassandra.policies.retry.simple.html @@ -135,8 +135,8 @@

Usage:

-generated by LDoc 1.4.5 -Last updated 2016-10-17 20:28:32 +generated by LDoc 1.4.6 +Last updated 2017-01-12 13:41:18
From 6d5f7108379847e4b58be52611f0adfcb3be9041 Mon Sep 17 00:00:00 2001 From: Thibault Charbonnier Date: Thu, 12 Jan 2017 13:44:40 -0800 Subject: [PATCH 4/4] docs(changelog) remove a change that is already documented --- CHANGELOG.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7662e0d..a2d03bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,8 @@ This is a breaking change: ##### Added - New `coordinator_options` for `execute()`/`batch()`/`iterate()` allowing for -more granularity in keyspace settings. Example: +more granularity in keyspace settings. Accepted options are `keyspace` and +`no_keyspace`. Example: ```lua local Cluster = cluster.new { keyspace = 'my_keyspace' @@ -35,6 +36,7 @@ more granularity in keyspace settings. Example: --no_keyspace = true -- would disable setting a keyspace for this request }) ``` +[cdc6607](https://github.com/thibaultcha/lua-cassandra/commit/cdc6607d26d23d6d9e1268d3db316aaf90ce51a8) - Support for binary protocol v4. [#61](https://github.com/thibaultcha/lua-cassandra/pull/61) - New `cassandra.null` CQL marshalling type. This type is different than @@ -50,9 +52,6 @@ more granularity in keyspace settings. Example: waiting time in seconds for the cluster refreshing and requests preparing mutexes. This option prevents such mutexes to hang for too long. [2bd3d66](https://github.com/thibaultcha/lua-cassandra/commit/2bd3d66eb26530490391ffb0f5dc366cc9fd0874) -- Implement a `no_keyspace` option for `cluster:execute()` to execute a given - query with a socket that is not connected to any keyspace in particular. - [cdc6607](https://github.com/thibaultcha/lua-cassandra/commit/cdc6607d26d23d6d9e1268d3db316aaf90ce51a8) - The `cluster:refresh()` method now returns the list of fetched Cassandra nodes from the cluster as a third return value. [34f5f11](https://github.com/thibaultcha/lua-cassandra/commit/34f5f1168f5a69dddf53c5564b8577250a7fde0a)