back to 3.2.5 base (#3)

* Revert "Updates for ruby 3.0 (#1)"

This reverts commit a134e1e.

* Revert "Fix a case sensitivity issue when fetching the clustering order"

This reverts commit 71e70bf.

* Revert "Update docs.yaml to reflect recent work on docs"

This reverts commit 5f41fa9.

* Revert "changed 4.0+ to 4.0.x"

This reverts commit aa6e17d.

* Revert "readme and docs.yaml updates"

This reverts commit 28cc9aa.

* Revert "DOC-4040 update to docs.yaml (datastax#274)"

This reverts commit c18f98e.

* Revert "Add varchar to Cassandra::Types.text mapping (datastax#270)"

This reverts commit 2c9070c.

* Revert "Slight refactorig of prior commit.  Main goal was to preserve ordering of hosts on the"

This reverts commit 022906d.

* Revert "Merge pull request datastax#267 from abicky/fix-replication-strategies-simple"

This reverts commit 42c435d.

* Revert "Minor spec fixes"

This reverts commit 765f9c9.

* Revert "Merge pull request datastax#265 from EasyPost:log_in_protocol"

This reverts commit e1b8dcb.

* Revert "Quick testing fix; make check for enable_materialized_views YAML config more"

This reverts commit 8fdcfd2.

* Revert "RUBY-331: Migrate to Jenkins pipelines (datastax#264)"

This reverts commit 572dec0.

* Revert "Revert "Fix a case sensitivity issue when fetching the clustering order""

This reverts commit 23ce3b9.

* Revert "Revert "Updates for ruby 3.0 (#1)""

This reverts commit 1b3f6ea.

* Version bump to 3.2.5.2

README.md

@@ -18,6 +18,8 @@ better compatibility and support for DataStax Enterprise.
 - Docs: http://docs.datastax.com/en/developer/ruby-driver
 - Jira: https://datastax-oss.atlassian.net/browse/RUBY
 - Mailing List: https://groups.google.com/a/lists.datastax.com/forum/#!forum/ruby-driver-user
+- Slack: `#datastax-drivers` channel at https://academy.datastax.com/slack
+- Twitter: Follow the latest news about DataStax Drivers - [@stamhankar999](http://twitter.com/stamhankar999), [@avalanche123](http://twitter.com/avalanche123), [@al3xandru](https://twitter.com/al3xandru)
 
 This driver is based on [the cql-rb gem](https://github.com/iconara/cql-rb) by [Theo Hultberg](https://github.com/iconara) and we added support for:
 
@@ -36,7 +38,7 @@ This driver is based on [the cql-rb gem](https://github.com/iconara/cql-rb) by [
 
 This driver works exclusively with the Cassandra Query Language v3 (CQL3) and Cassandra's native protocol. The current version works with:
 
-* Apache Cassandra versions 2.1, 2.2, 3.0+, and 4.0.x
+* Apache Cassandra versions 2.1, 2.2, and 3.x
 * DataStax Enterprise 4.8 and above. However, the [Ruby DSE driver](https://docs.datastax.com/en/developer/ruby-driver-dse/2.1/) provides more features and is recommended for use with DataStax Enterprise.
 * Ruby (MRI) 2.2, 2.3, 2.4
 * JRuby 9k

docs.yaml

@@ -23,20 +23,18 @@ rewrites:
   - supplemental/: /
   - en/latest-ruby-driver/ruby-driver/whatsNew.html: en/developer/ruby-driver/latest
   - 'trunk/doc/native_protocol_v([12])\.spec': cassandra-2.2/doc/native_protocol_v\1.spec
-  - search: 'http://www.datastax.com/documentation/cql/3.1/webhelp/index.html'
-    replace: 'http://docs.datastax.com/en/cql/3.3/cql/cql_using/useAboutCQL.html'
-  - search: 'https://datastax.github.io/java-driver/features'
-    replace: 'https://datastax.github.io/java-driver/manual'
-  - search: 'http://dsdocs30_java'
-    replace: 'http://docs.datastax.com/en/developer/java-driver/3.0'
-  - search: 'http://www.datastax.com/documentation/cassandra/2.0'
-    replace: 'https://docs.datastax.com/en/archived/cassandra/2.0'
-  - search: 'http://www.datastax.com/documentation/cassandra/1.2'
-    replace: 'https://docs.datastax.com/en/archived/cassandra/1.2'
-  - search: 'http://www.datastax.com/documentation/cql/3.0'
-    replace: 'https://docs.datastax.com/en/archived/cql/3.0'
-  - search: 'http://cukes.info/'
-    replace: 'https://cucumber.io/'
+  - search: http://www.datastax.com/documentation/cql/3.1/webhelp/index.html
+    replace: http://docs.datastax.com/en/cql/3.3/cql/cql_using/useAboutCQL.html
+  - search: https://datastax.github.io/java-driver/features
+    replace: https://datastax.github.io/java-driver/manual
+  - search: http://dsdocs30_java
+    replace: http://docs.datastax.com/en/developer/java-driver/3.0
+  - search: http://www.datastax.com/documentation/cassandra/2.0
+    replace: https://docs.datastax.com/en/archived/cassandra/2.0
+  - search: http://www.datastax.com/documentation/cassandra/1.2
+    replace: https://docs.datastax.com/en/archived/cassandra/1.2
+  - search: http://www.datastax.com/documentation/cql/3.0
+    replace: https://docs.datastax.com/en/archived/cql/3.0
 links:
   - title: Code
     href:  https://github.com/datastax/ruby-driver/
@@ -52,7 +50,7 @@ links:
     href:  https://github.com/datastax/ruby-driver/releases
 versions:
   - name: 3.2
-    ref: 1e95ca94ffbba215b5bf2758a646a48d4f4eaa0f
+    ref: v3.2.4
   - name: 3.1
     ref: v3.1.0
   - name: 3.0
@@ -67,28 +65,3 @@ versions:
     ref:  1763066e2f70db8889799aa0af4a8eb63ad9ab74
   - name: 1.0
     ref:  72bfc9609f94e904c0186b061a02404fb2c0d22e
-checks:
-  external_links:
-    exclude:
-      - 'https://twitter.com/dsJavaDriver'
-      - 'https://twitter.com/datastaxeng'
-      - 'https://twitter.com/datastax'
-      - 'https://projectreactor.io'
-      - 'https://docs.datastax.com/en/drivers/java/4.[0-9]+/com/datastax/oss/driver/internal/'
-      - 'http://www.planetcassandra.org/blog/user-defined-functions-in-cassandra-3-0/'
-      - 'http://www.planetcassandra.org/making-the-change-from-thrift-to-cql/'
-      - 'https://academy.datastax.com/slack'
-      - 'https://community.datastax.com/index.html'
-      - 'https://micrometer.io/docs'
-      - 'http://datastax.github.io/java-driver/features/shaded_jar/'
-      - 'http://twitter.com/avalanche123'
-      - 'http://twitter.com/mfiguiere'
-      - 'http://twitter.com/stamhankar999'
-      - 'https://twitter.com/al3xandru'
-      - 'https://github.com/datastax/ruby-dse-driver.git'
-      - 'https://academy.datastax.com/demos/datastax-ruby-driver-load-balancing-policies'
-  internal_links:
-    exclude:
-      - 'netty_pipeline/'
-      - '../core/'
-      - '%5Bguava%20eviction%5D'

lib/cassandra/cluster/connector.rb

@@ -126,9 +126,7 @@ def do_connect(host)
                                       @connection_options.nodelay? ? 1 : 0)
 
           Protocol::CqlProtocolHandler.new(connection,
-                                           host,
                                            @reactor,
-                                           @logger,
                                            @connection_options.protocol_version,
                                            @connection_options.compressor,
                                            @connection_options.heartbeat_interval,

lib/cassandra/cluster/schema/cql_type_parser.rb

@@ -42,7 +42,6 @@ def parse(string, types)
         def lookup_type(node, types)
           case node.name
           when 'text'              then Cassandra::Types.text
-          when 'varchar'           then Cassandra::Types.text
           when 'blob'              then Cassandra::Types.blob
           when 'ascii'             then Cassandra::Types.ascii
           when 'bigint'            then Cassandra::Types.bigint

lib/cassandra/cluster/schema/replication_strategies/simple.rb

@@ -29,10 +29,10 @@ def replication_map(token_hosts, token_ring, replication_options)
             factor = size if size < factor
             replication_map = ::Hash.new
 
-            hosts_ring = token_ring.map { |t| token_hosts[t] }
             token_ring.each_with_index do |token, i|
-              candidates = hosts_ring.cycle(2 * size).drop(i).take(size).uniq
-              replication_map[token] = candidates.take(factor).freeze
+              replication_map[token] = factor.times.map do |j|
+                token_hosts[token_ring[(i + j) % size]]
+              end.freeze
             end
 
             replication_map

lib/cassandra/protocol/cql_protocol_handler.rb

@@ -41,9 +41,7 @@ class CqlProtocolHandler
       attr_reader :protocol_version
 
       def initialize(connection,
-                     host,
                      scheduler,
-                     logger,
                      protocol_version,
                      compressor = nil,
                      heartbeat_interval = 30,
@@ -52,12 +50,10 @@ def initialize(connection,
                      custom_type_handlers = {})
         @protocol_version = protocol_version
         @connection = connection
-        @host = host
         @scheduler = scheduler
         @compressor = compressor
         @connection.on_data(&method(:receive_data))
         @connection.on_closed(&method(:socket_closed))
-        @logger = logger
 
         @streams = Array.new(requests_per_connection) {|i| i}
 
@@ -418,8 +414,7 @@ def schedule_heartbeat
         end
 
         timer.on_value do
-          @logger.debug("sending heartbeat to #{@host}")
-          send_request(HEARTBEAT, nil, false).on_complete do
+          send_request(HEARTBEAT, nil, false).on_value do
             schedule_heartbeat
           end
         end
@@ -437,7 +432,6 @@ def reschedule_termination
         end
 
         timer.on_value do
-          @logger.info("#{@host} has had no activity in the last #{@idle_timeout}s; marking as failed")
           @terminate = nil
           @connection.close(TERMINATED)
         end

lib/cassandra/version.rb

@@ -22,6 +22,6 @@ module Cassandra
   # We publish our fork with a revision number appended to the upstream version.
   #
   # @return [String] the ART19 revision number
-  ART19_REVISION = '1'.freeze
+  ART19_REVISION = '2'.freeze
   VERSION = "3.2.5.#{ART19_REVISION}".freeze
 end