datastax_rails 2.4.4 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c995883ead403d6ca3e7fb247feaec562361cd40
-  data.tar.gz: d81eaeeee8b20156ff6e752c8ce7da6037ffad4a
+  metadata.gz: b84e6f90074a208e23849f44c8cd68d51f9413b8
+  data.tar.gz: a9fa06f32534a9a1141ee15376d3bc9ae3808bff
 SHA512:
-  metadata.gz: c87e71d2898ac4d3e73d9676083ef48d48ee936dfaf3ffb343e551b3298568884a5444e09530b2e411704daa23dce1c949b830a15e147da0ec33535e1a9628d3
-  data.tar.gz: ad90941b3f68b77c2ce2ae0746b1effdf2f2f7e0590288ab5fc9ac99026214dc56695e4275db6a82103ab3c8d17b1bb20e732c8e548bef8dcf8f0cf293d1b22c
+  metadata.gz: 18ae118015df25c7cdcab36051e92ea1f50a8f18262d1ff87629889683dec60db3ffebc6a2fdf7660867cd67a46f69339223faed1a7c3475b21077664a276115
+  data.tar.gz: b78febe8c0df4d46e758007387114b96d396afcd1af838be2d3e35f3d6ee0cc9b621eed47ad196519d6a8e97f0a181b19eb3147d4e85b59d2f3b8311a7afa4ac

data/config/solrconfig.xml.erb

@@ -335,11 +335,11 @@
                the cache.  (see java.util.HashMap)
            autowarmCount - the number of entries to prepopulate from
                and old cache.  
-      -->
     <filterCache class="solr.FastLRUCache"
                  size="128"
                  initialSize="0"
                  autowarmCount="0"/>
+      -->
 
     <!-- Query Result Cache
          

data/lib/datastax_rails/schema/solr.rb

@@ -39,10 +39,18 @@ module DatastaxRails
       # Sends a command to Solr instructing it to reindex the data.  The data is reindexed in the background,
       # and the new index is swapped in once it is finished.
       def reindex_solr(model, destructive = false)
-        url = "#{DatastaxRails::Base.solr_base_url}/admin/cores?action=RELOAD&name=#{DatastaxRails::Base.config[:keyspace]}.#{model.column_family}&reindex=true&deleteAll=#{destructive}"
-        say "Posting reindex command to '#{url}'", :subitem
-        `curl -s -X POST '#{url}' -H 'Content-type:text/xml; charset=utf-8'`
-        say 'Reindexing will run in the background', :subitem
+        reload_solr_core(model, true, destructive)
+      end
+
+      # Sends a command to Solr instructing it to reload the core for a given model.
+      # This is for making sure that solr knows the model changes when it comes to multiple
+      # datacenter deployments.
+      def reload_solr_core(model, reindex = false, destructive = false)
+        url = "#{DatastaxRails::Base.solr_base_url}/admin/cores?action=RELOAD&name=#{DatastaxRails::Base.config[:keyspace]}.#{model.column_family}&reindex=#{reindex}&deleteAll=#{destructive}"
+        action = reindex ? 'reindex' : 'reload'
+        say "Posting #{action} command to '#{url}'", :subitem
+        system("curl -s -X POST '#{url}' -H 'Content-type:text/xml; charset=utf-8' &")
+        say "#{action.capitalize} will run in the background", :subitem
       end
 
       # Creates the initial Solr Core.  This is required once the first time a Solr schema is uploaded.
@@ -50,7 +58,7 @@ module DatastaxRails
       def create_solr_core(model)
         url = "#{DatastaxRails::Base.solr_base_url}/admin/cores?action=CREATE&name=#{DatastaxRails::Base.config[:keyspace]}.#{model.column_family}"
         say "Posting create command to '#{url}'", :subitem
-        `curl -s -X POST '#{url}' -H 'Content-type:text/xml; charset=utf-8'`
+        system("curl -s -X POST '#{url}' -H 'Content-type:text/xml; charset=utf-8' &"
       end
 
       # Uploads the necessary configuration files for solr to function
@@ -61,6 +69,7 @@ module DatastaxRails
       # TODO: find a way to upload arbitrary files automatically (e.g., additional stopwords lists)
       # TODO: Simplify this method
       def upload_solr_configuration(model, force = false, reindex = true) # rubocop:disable all
+        reload_solr_core(model, false, false)
         count = 0
         @live_indexing = model.live_indexing
         @solr_commit_time = model.solr_commit_time || (@live_indexing ? '1000' : '5000')

data/lib/datastax_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datastax_rails
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.8
 platform: ruby
 authors:
 - Jason M. Kusar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails