cassandra-driver 3.0.2-java → 3.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78dc265751584f3c23a824f4f8f8cfebd5f98d32
-  data.tar.gz: 303da68ffd2ec37685f54a22e7c26f0f3568b51d
+  metadata.gz: dd12699ee5345d58839cfaf6ebc7e9f39529f835
+  data.tar.gz: 05efbd46f2dbef7ff4669c79c88e3671629a898f
 SHA512:
-  metadata.gz: 7ecd09602150990d62b56ba5b0c75e1131f54b7c598171f0ca17927dfaf2fc3a2b1bc66c2ffb7b1b61f0164daa6fcbd359c3c6d6528230b05d4e5ba34482665b
-  data.tar.gz: 64d64fadf8a713b97079096af4aafd966689f9b8e9e0a6e1acae8442229de407599e3d4318eed80614fb30af5fb53db4a98e340c9a8c3490b03ae07e3a363023
+  metadata.gz: b8c4bc332b1cdd24dda360c19a564a4af64e865b04a139ac04208768949622fedc4bb83d421d1c1a7450d9bb089e14ba6c24e7b8238b562d349ba88d24980c10
+  data.tar.gz: c99658b87ff4197aedd1c7d0f719be36720252b025797beaefd0a0e0ba718dfdcba17d20c705acd39785e1f9344b0679095aadae9f35217d4c22a561088de403

data/README.md

@@ -1,6 +1,6 @@
 # Datastax Ruby Driver for Apache Cassandra
 
-*If you're reading this on GitHub, please note that this is the readme for the development version and that some features described here might not yet have been released. You can [find the documentation for the latest version through ruby driver docs](http://docs.datastax.com/en/latest-ruby-driver/ruby-driver/whatsNew.html) or via the release tags, [e.g. v3.0.2](https://github.com/datastax/ruby-driver/tree/v3.0.2).*
+*If you're reading this on GitHub, please note that this is the readme for the development version and that some features described here might not yet have been released. You can [find the documentation for the latest version through ruby driver docs](http://docs.datastax.com/en/latest-ruby-driver/ruby-driver/whatsNew.html) or via the release tags, [e.g. v3.0.3](https://github.com/datastax/ruby-driver/tree/v3.0.3).*
 
 [![Build Status](https://travis-ci.org/datastax/ruby-driver.svg?branch=master)](https://travis-ci.org/datastax/ruby-driver)
 
@@ -90,11 +90,11 @@ __Note__: if you want to use compression you should also install [snappy](http:/
 
 ## Upgrading from cql-rb
 
-Some of the new features added to the driver have unfortunately led to changes in the original cql-rb API. In the examples directory, you can find [an example of how to wrap the ruby driver to achieve almost complete interface parity with cql-rb](https://github.com/datastax/ruby-driver/blob/v3.0.2/examples/cql-rb-wrapper.rb) to assist you with gradual upgrade.
+Some of the new features added to the driver have unfortunately led to changes in the original cql-rb API. In the examples directory, you can find [an example of how to wrap the ruby driver to achieve almost complete interface parity with cql-rb](https://github.com/datastax/ruby-driver/blob/v3.0.3/examples/cql-rb-wrapper.rb) to assist you with gradual upgrade.
 
 ## What's new in v3.0
 
-See the [changelog](https://github.com/datastax/ruby-driver/blob/v3.0.2/CHANGELOG.md) for details on patch versions.
+See the [changelog](https://github.com/datastax/ruby-driver/blob/v3.0.3/CHANGELOG.md) for details on patch versions.
 
 ### Features:
 
@@ -164,7 +164,7 @@ examples in the `features/` directory.
 ## Running tests
 
 If you don't feel like reading through the following instructions on how to run
-ruby-driver tests, feel free to [check out .travis.yml for the entire build code](https://github.com/datastax/ruby-driver/blob/v3.0.2/.travis.yml).
+ruby-driver tests, feel free to [check out .travis.yml for the entire build code](https://github.com/datastax/ruby-driver/blob/v3.0.3/.travis.yml).
 
 * Check out the driver codebase and install test dependencies:
 
@@ -188,7 +188,7 @@ CASSANDRA_VERSION=2.0.17 bundle exec rake test # run both as well as integration
 ## Changelog & versioning
 
 Check out the [releases on GitHub](https://github.com/datastax/ruby-driver/releases) and
-[changelog](https://github.com/datastax/ruby-driver/blob/v3.0.2/CHANGELOG.md). Version
+[changelog](https://github.com/datastax/ruby-driver/blob/v3.0.3/CHANGELOG.md). Version
 numbering follows the [semantic versioning](http://semver.org/) scheme.
 
 Private and experimental APIs, defined as whatever is not in the

data/lib/cassandra/cluster/schema/fetchers.rb

@@ -107,10 +107,8 @@ module Cassandra
               nil
             else
               view_row = rows_views.first
-              base_table = @schema.keyspace(keyspace_name).table(view_row['base_table_name'])
               create_materialized_view(view_row,
-                                       rows_columns,
-                                       base_table)
+                                       rows_columns)
             end
           end
         end
@@ -1216,10 +1214,8 @@ module Cassandra
 
             views = rows_views.each_with_object({}) do |row, h|
               view_name = row['view_name']
-              base_table = tables[row['base_table_name']]
               h[view_name] = create_materialized_view(row,
                                                       lookup_columns[view_name],
-                                                      base_table,
                                                       types)
             end
 
@@ -1366,9 +1362,10 @@ module Cassandra
                                                  options['target'], options))
           end
 
-          def create_materialized_view(view_data, rows_columns, base_table, types = nil)
+          def create_materialized_view(view_data, rows_columns, types = nil)
             keyspace_name   = view_data['keyspace_name']
             view_name       = view_data['view_name']
+            base_table_name = view_data['base_table_name']
             include_all_columns = view_data['include_all_columns']
             where_clause = view_data['where_clause']
 
@@ -1406,7 +1403,7 @@ module Cassandra
                                  view_options,
                                  include_all_columns,
                                  where_clause,
-                                 base_table,
+                                 base_table_name,
                                  view_data['id'])
           end
         end

data/lib/cassandra/column_container.rb

@@ -286,13 +286,12 @@ module Cassandra
 
     # @private
     # keyspace attribute may be nil because when this object was constructed, we didn't have
-    # its keyspace constructed yet. So allow updating @keyspace if it's nil, thus
+    # its keyspace constructed yet. So allow updating @keyspace, thus
     # allowing fetchers to create keyspace, table/view, and hook them together without
     # worrying about chickens and eggs.
-    # NOTE: Ignore the set request if the @keyspace is already set.
     # rubocop:disable Style/AccessorMethodName
     def set_keyspace(keyspace)
-      @keyspace = keyspace unless @keyspace
+      @keyspace = keyspace
     end
 
     # @private

data/lib/cassandra/execution/options.rb

@@ -54,7 +54,7 @@ module Cassandra
       #
       # @see https://github.com/apache/cassandra/blob/cassandra-3.4/doc/native_protocol_v4.spec#L125-L131 Description
       #   of custom payload in Cassandra native protocol v4.
-      # @see https://datastax.github.io/java-driver/manual/custom_payloads/#enabling-custom-payloads-on-c-nodes
+      # @see http://docs.datastax.com/en/developer/java-driver/3.0/supplemental/manual/custom_payloads/?local=true&nav=toc#enabling-custom-payloads-on-c-nodes
       #   Enabling custom payloads on Cassandra nodes.
       #
       # @example Sending a custom payload

data/lib/cassandra/keyspace.rb

@@ -113,13 +113,15 @@ module Cassandra
     # @return [Boolean] whether this keyspace has a materialized view with the given name
     # @param name [String] materialized view name
     def has_materialized_view?(name)
-      @views.key?(name)
+      # We check if the view exists *and* that its base-table is set. If base-table isn't available,
+      # it will be soon, so the user can poll on this method until we return a fully-baked materialized view.
+      @views.key?(name) && !@views[name].base_table.nil?
     end
 
     # @return [Cassandra::MaterializedView, nil] a materialized view or nil
     # @param name [String] materialized view name
     def materialized_view(name)
-      @views[name]
+      @views[name] if has_materialized_view?(name)
     end
 
     # Yield or enumerate each materialized view defined in this keyspace
@@ -130,10 +132,16 @@ module Cassandra
     #   @return [Array<Cassandra::MaterializedView>] a list of materialized views
     def each_materialized_view(&block)
       if block_given?
-        @views.each_value(&block)
+        @views.each_value do |v|
+          block.call(v) if v.base_table
+        end
         self
       else
-        @views.values
+        result = []
+        @views.each_value do |v|
+          result << v if v.base_table
+        end
+        result
       end
     end
     alias materialized_views each_materialized_view

data/lib/cassandra/materialized_view.rb

@@ -21,9 +21,6 @@ module Cassandra
   # @see Cassandra::Keyspace#each_materialized_view
   # @see Cassandra::Keyspace#materialized_view
   class MaterializedView < ColumnContainer
-    # @return [Table] the table that this materialized view applies to.
-    attr_reader :base_table
-
     # @private
     def initialize(keyspace,
                    name,
@@ -33,12 +30,17 @@ module Cassandra
                    options,
                    include_all_columns,
                    where_clause,
-                   base_table,
+                   base_table_name,
                    id)
       super(keyspace, name, partition_key, clustering_columns, other_columns, options, id)
       @include_all_columns = include_all_columns
       @where_clause = where_clause
-      @base_table = base_table
+      @base_table_name = base_table_name
+    end
+
+    # @return [Table] the table that this materialized view applies to.
+    def base_table
+      @keyspace.table(@base_table_name)
     end
 
     # @return [String] a cql representation of this materialized view
@@ -52,7 +54,7 @@ module Cassandra
                  Util.escape_name(column.name)
                end.join(', ')
              end
-      cql << "\nFROM #{keyspace_name}.#{Util.escape_name(@base_table.name)}"
+      cql << "\nFROM #{keyspace_name}.#{Util.escape_name(@base_table_name)}"
       cql << "\nWHERE #{@where_clause}" if @where_clause
       cql << "\nPRIMARY KEY (("
       cql << @partition_key.map do |column|
@@ -74,7 +76,7 @@ module Cassandra
         super.eql?(other) &&
         @include_all_columns == other.include_all_columns &&
         @where_clause == other.where_clause &&
-        @base_table == other.base_table
+        @base_table_name == other.base_table.name
     end
     alias == eql?
 

data/lib/cassandra/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Cassandra
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandra-driver
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: java
 authors:
 - Theo Hultberg
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement