Merge pull request #203 from datastax/RUBY-264

RUBY-264 - Table erroneously reported as using compact storage

Author: stamhankar999

CHANGELOG.md

@@ -13,6 +13,7 @@ Features:
 
 Bug Fixes:
 * [RUBY-255](https://datastax-oss.atlassian.net/browse/RUBY-255) ControlConnection.peer_ip ignores peers that are missing critical information in system.peers.
+* [RUBY-264](https://datastax-oss.atlassian.net/browse/RUBY-255) Table erroneously reported as using compact storage.
 
 # 3.0.3
 

integration/metadata_test.rb

@@ -45,6 +45,12 @@ def setup
     @listener.wait_for_table('simplex', 'test2')
     @session.execute("CREATE TABLE simplex.audit (key timeuuid, keyspace_name text, table_name text, primary_key text, PRIMARY KEY(key))")
     @listener.wait_for_table('simplex', 'audit')
+    @session.execute(<<EOF)
+        CREATE TABLE rb264(inclusion_r_t text, inclusion_r_id text, inclusion_uaid timeuuid, own_t text, own_id text,
+        PRIMARY KEY (inclusion_r_t, inclusion_r_id, inclusion_uaid, own_t, own_id)
+        ) WITH CLUSTERING ORDER BY (inclusion_r_id ASC, inclusion_uaid ASC, own_t ASC, own_id ASC)
+EOF
+    @listener.wait_for_table('simplex', 'rb264')
   end
 
   def teardown
@@ -69,7 +75,7 @@ def test_can_retrieve_keyspace_metadata
     assert_equal 1, ks_meta.replication.options['replication_factor'].to_i
     assert ks_meta.durable_writes?
     assert ks_meta.has_table?('users')
-    assert_equal 7, ks_meta.tables.size
+    assert_equal 8, ks_meta.tables.size
 
     ks_cql = Regexp.new(/CREATE KEYSPACE simplex WITH replication = {'class': 'SimpleStrategy', \
 'replication_factor': '1'} AND durable_writes = true;/)
@@ -109,6 +115,23 @@ def test_can_retrieve_table_metadata
     end
   end
 
+  # Regression test for retrieving table metadata, RUBY-264
+  #
+  # test_ruby_264 tests that a table with a relatively large number of clustering columns is not erroneously
+  # considered to use compact storage.
+  #
+  # @since 3.0.0
+  # @jira_ticket RUBY-264
+  # @expected_result table metadata should be retrieved.
+  #
+  # @test_category metadata
+  #
+  def test_ruby_264
+    assert @cluster.keyspace('simplex').has_table?('rb264')
+    table_meta = @cluster.keyspace('simplex').table('rb264')
+    assert(!table_meta.options.compact_storage?)
+  end
+
   # Test for column ordering in table metadata
   #
   # test_column_ordering_is_deterministic tests that the metadata relating to the columns are retrieved in the proper

lib/cassandra/cluster/schema/fetchers.rb

@@ -632,7 +632,7 @@ def create_table(table_data, rows_columns, rows_indexes, rows_triggers)
                 clustering_columns[ind] = column
                 clustering_order[ind]   = column.order
 
-                clustering_size = ind + 1 if clustering_size.zero? || ind == clustering_size
+                clustering_size += 1
               else
                 other_columns << column
               end