datastax_rails 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 150f13ab506894d9c6edfc1ea23a858419cfc3da
-  data.tar.gz: 2b13f273c0bd56d94f5439b3eb263bdcb5b616d1
+  metadata.gz: e80abdc73c3bac8e56fdb675295e529983946232
+  data.tar.gz: 5da1c5c5adb42a8fa0acbbd179dc8f418073cb56
 SHA512:
-  metadata.gz: dc6b22915a67bd1a40f4adafde3a5238f12eb4f4a6f3e850c278df262170b9482460921e2134399897720a2c76a60d3eac6aed8272e83670962f8ab661671227
-  data.tar.gz: 26dbfde1fd0233048bfc50d4271a3f17aef839ca82f2e8f4fa739cf61b98628795857b8626800949686c8f38605ff72e5d08fd4432177501fda2933bb7cb74dd
+  metadata.gz: 84d18abd6033f66ca2398dbdbb1e6d8971fa656b80b80b570144265a1135e2d8c106bd32c195beb518ce4346e47cd31a7fd677f531cb9d0fe6379644deee719f
+  data.tar.gz: 02d506b87d0868e49dd05b310c6c1777bef53c45e34a9520217cb65a2a909a2a355f2cb6b3f513158a3001e9f748a84736df66f72ef21ef938fd4b9897b4e8b2

data/README.rdoc

@@ -13,6 +13,13 @@ Significant changes from SolandraObject:
 * Solr communication is now handled directly via RSolr
 * Bifurcation of data is no longer necessary as DSE writes data to SOLR automatically 
 
+As of 2.4.0, DSE 4.7 is supported and live indexing is enabled by default. 
+If you are using any version prior to DSE 4.7 or do not wish to use live indexing, 
+you will want to override the following settings:
+
+  DatastaxRails::Base.solr_commit_time = 5000
+  DatastaxRails::Base.ram_buffer_size = 100
+
 === Usage Note
 
 Before using this gem, you should probably take a strong look at the type of problem you are trying to solve.

data/config/solrconfig.xml.erb

@@ -47,7 +47,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>LUCENE_46</luceneMatchVersion>
+  <luceneMatchVersion>4.10.3</luceneMatchVersion>
   
   <!-- Enable DSE Search new type mappings -->
   <dseTypeMappingVersion>2</dseTypeMappingVersion>
@@ -111,7 +111,7 @@
   <indexConfig>
 
     <useCompoundFile>false</useCompoundFile>
-    <ramBufferSizeMB>100</ramBufferSizeMB>
+    <ramBufferSizeMB><%= @ram_buffer_size %></ramBufferSizeMB>
     <mergeFactor>10</mergeFactor>
 
     <!-- Unlock On Startup

data/lib/datastax_rails/base.rb

@@ -392,9 +392,17 @@ module DatastaxRails #:nodoc:
     # See {DatastaxRails::WideStorageModel} or {DatastaxRails::Payload} model for an example
     class_attribute :create_options
 
-    # Allows the setting of how frequently to commit data to solr. Default is 10s.
+    # Allows the setting of how frequently to commit data to solr. Default is 1000ms.
+    # If you're running something prior to DSE 4.7 or not using live indexing, you should
+    # change this to at least 5000ms.
     class_attribute :solr_commit_time
-    self.solr_commit_time = 10_000
+    self.solr_commit_time = 1000
+
+    # Allows the setting of how much memory to dedicate to the solr ram buffer. This defaults to 2000MB
+    # in order to allow live indexing to do its thing. If you don't want to use live indexing (or if you
+    # are using DSE prior to 4.7) you should set this to something more reasonable like 100MB.
+    class_attribute :ram_buffer_size
+    self.ram_buffer_size = 2000
 
     # Stores the attribute that wide models should cluster on. Basically, this is the
     # attribute that CQL uses to "group" columns into logical records even though they

data/lib/datastax_rails/schema/migrator.rb

@@ -16,6 +16,31 @@ module DatastaxRails
         @errors = []
       end
 
+      def reindex_all
+        say_with_time('Reindexing all models') do
+          FileList[rails_models].each do |model|
+            require model
+          end
+
+          count = 0
+          DatastaxRails::Base.models.each do |m|
+            count += reindex_one(m) unless m.abstract_class?
+          end
+          count
+        end
+      end
+
+      def reindex_one(model)
+        count = 0
+        unless model <= DatastaxRails::CassandraOnlyModel
+          say_with_time("Reindexing #{model.name}") do
+            reindex_solr(model, false)
+            count += 1
+          end
+        end
+        count
+      end
+
       def migrate_all(force = false)
         say_with_time('Migrating all models') do
           FileList[rails_models].each do |model|

data/lib/datastax_rails/schema/solr.rb

@@ -67,6 +67,7 @@ module DatastaxRails
           solrconfig = Rails.root.join('config', 'solr', "#{model.column_family}-solrconfig.xml").read
         else
           @solr_commit_time = model.solr_commit_time
+          @ram_buffer_size = model.ram_buffer_size
           solrconfig = ERB.new(File.read(File.join(File.dirname(__FILE__), '..', '..', '..', 'config', 'solrconfig.xml.erb'))).result(binding)
         end
         if Rails.root.join('config', 'solr', "#{model.column_family}-stopwords.txt").exist?

data/lib/datastax_rails/tasks/ds.rake

@@ -37,8 +37,10 @@ namespace :ds do
   task :reindex, [:model] => :configure do |_t, args|
     if args[:model].blank?
       puts "\nUSAGE: rake ds:reindex[Model]"
+    elsif args[:model] == 'all'
+      @migrator.reindex_all
     else
-      @migrator.reindex_solr(args[:model].constantize)
+      @migrator.reindex_one(args[:model].constantize)
     end
   end
 

data/lib/datastax_rails/version.rb

@@ -1,4 +1,4 @@
 # rubocop:disable Style/Documentation
 module DatastaxRails
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 end

data/spec/datastax_rails/dynamic_model_spec.rb

@@ -33,8 +33,8 @@ describe DatastaxRails::DynamicModel do
     two.save
     one.destroy
     DynamicTestModel1.commit_solr
-    expect(DynamicTestModel1.count).to be(0)
     DynamicTestModel2.commit_solr
+    expect(DynamicTestModel1.count).to be(0)
     expect(DynamicTestModel2.count).to be(1)
   end
 

data/spec/dummy/log/test.log

@@ -571,3 +571,21 @@
   TeamMetadata CQL (7.9ms) INSERT INTO dynamic_model (group,id,s_,d_) VALUES (?,?,?,?)  ["team", #<Cassandra::TimeUuid:0x007f4544991598 @n=194877043329956181002329162597684281855>, {"s_source"=>"TV", "s_medium"=>"television"}, {"d_published_on"=>2015-04-28 00:00:00 UTC}] - 0 results
   CoreMetadata Search (6.4ms) {q: "(bbc)", sort: "", fq: ["group:(core)"], fl: "id,group,s_*,t_*,b_*,d_*,l_*,db_*,ts_*,i_*,f_*,u_*", page: 1, per_page: 100000}
   CoreMetadata Search (5.2ms) {q: "(tv)", sort: "", fq: ["group:(core)"], fl: "id,group,s_*,t_*,b_*,d_*,l_*,db_*,ts_*,i_*,f_*,u_*", page: 1, per_page: 100000}
+  PersonRole Search (11.4ms) {q: "*:*", sort: "", fq: ["person_id:(73fd1d42-2190-11e5-a954-4136c888eb9c)"], fl: "id,person_id,role_id,created_at,updated_at", page: 1, per_page: 100000}
+  Role CQL (7.7ms) SELECT id,name,created_at,updated_at FROM roles WHERE "id" IN (?,?) LIMIT 100000  [#<Cassandra::TimeUuid:0x007f0b38e2c800 @n=154185041942365393188856393493624783394>, #<Cassandra::TimeUuid:0x007f0b38e2e100 @n=154208614697558262256981922784432414106>] - 2 results
+  Person Search (5.2ms) {q: "*:*", sort: "", fq: ["sort_name:(steve)"], fl: "id", page: 1, per_page: 1}
+  Person CQL (7.8ms) INSERT INTO people (name,str_,created_at,updated_at,id) VALUES (?,?,?,?,?)  ["Steve", {"str_favorite_color"=>"blue"}, 2015-07-03 14:33:27 UTC, 2015-07-03 14:33:27 UTC, #<Cassandra::TimeUuid:0x007f0b38e63c38 @n=159442905651352150554347113102875752322>] - 0 results
+  Person Search (6.5ms) {q: "*:*", sort: "", fq: ["str_favorite_color:(blue)"], fl: "id,name,birthdate,nickname,email_addresses,str_*,created_at,updated_at", page: 1, per_page: 100000}
+  CoreMetadata CQL (5.6ms) INSERT INTO dynamic_model (group,s_,ts_,id) VALUES (?,?,?,?)  ["core", {"s_source"=>"BBC", "s_author"=>"John"}, {"ts_published_at"=>2015-07-03 14:33:30 UTC}, #<Cassandra::TimeUuid:0x007f0b38ec2990 @n=161544733729060566312981916619281616201>] - 0 results
+  TeamMetadata CQL (4.8ms) INSERT INTO dynamic_model (group,id,s_,d_) VALUES (?,?,?,?)  ["team", #<Cassandra::TimeUuid:0x007f0b38ef8360 @n=161544733729060566312981916619281616201>, {"s_source"=>"TV", "s_medium"=>"television"}, {"d_published_on"=>2015-07-03 00:00:00 UTC}] - 0 results
+  CoreMetadata Search (22.4ms) {q: "(bbc)", sort: "", fq: ["group:(core)"], fl: "id,group,s_*,t_*,b_*,d_*,l_*,db_*,ts_*,i_*,f_*,u_*", page: 1, per_page: 100000}
+  CoreMetadata Search (39.2ms) {q: "(tv)", sort: "", fq: ["group:(core)"], fl: "id,group,s_*,t_*,b_*,d_*,l_*,db_*,ts_*,i_*,f_*,u_*", page: 1, per_page: 100000}
+  PersonRole Search (5.5ms) {q: "*:*", sort: "", fq: ["person_id:(212ef5e4-2196-11e5-88d7-1d26c3e00733)"], fl: "id,person_id,role_id,created_at,updated_at", page: 1, per_page: 100000}
+  Role CQL (4.1ms) SELECT id,name,created_at,updated_at FROM roles WHERE "id" IN (?,?) LIMIT 100000  [#<Cassandra::TimeUuid:0x007f8900dd1e28 @n=44121189366645637896307254878190144332>, #<Cassandra::TimeUuid:0x007f8900dd1bd0 @n=44139174951818001042741152732173921356>] - 2 results
+  Person Search (3.8ms) {q: "*:*", sort: "", fq: ["sort_name:(steve)"], fl: "id", page: 1, per_page: 1}
+  Person CQL (5.3ms) INSERT INTO people (name,str_,created_at,updated_at,id) VALUES (?,?,?,?,?)  ["Steve", {"str_favorite_color"=>"blue"}, 2015-07-03 15:14:07 UTC, 2015-07-03 15:14:07 UTC, #<Cassandra::TimeUuid:0x007f8900e04d50 @n=50807323722007417899209455217420016375>] - 0 results
+  Person Search (5.7ms) {q: "*:*", sort: "", fq: ["str_favorite_color:(blue)"], fl: "id,name,birthdate,nickname,email_addresses,str_*,created_at,updated_at", page: 1, per_page: 100000}
+  CoreMetadata CQL (4.9ms) INSERT INTO dynamic_model (group,s_,ts_,id) VALUES (?,?,?,?)  ["core", {"s_source"=>"BBC", "s_author"=>"John"}, {"ts_published_at"=>2015-07-03 15:14:10 UTC}, #<Cassandra::TimeUuid:0x007f8900e69ea8 @n=52989871036248616450023570844302361768>] - 0 results
+  TeamMetadata CQL (7.7ms) INSERT INTO dynamic_model (group,id,s_,d_) VALUES (?,?,?,?)  ["team", #<Cassandra::TimeUuid:0x007f8900eb2ef0 @n=52989871036248616450023570844302361768>, {"s_source"=>"TV", "s_medium"=>"television"}, {"d_published_on"=>2015-07-03 00:00:00 UTC}] - 0 results
+  CoreMetadata Search (4.4ms) {q: "(bbc)", sort: "", fq: ["group:(core)"], fl: "id,group,s_*,t_*,b_*,d_*,l_*,db_*,ts_*,i_*,f_*,u_*", page: 1, per_page: 100000}
+  CoreMetadata Search (32.3ms) {q: "(tv)", sort: "", fq: ["group:(core)"], fl: "id,group,s_*,t_*,b_*,d_*,l_*,db_*,ts_*,i_*,f_*,u_*", page: 1, per_page: 100000}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datastax_rails
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Jason M. Kusar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,7 +39,7 @@ dependencies:
         version: '2.1'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '2.1'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement