datastax_rails 2.4.0 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e80abdc73c3bac8e56fdb675295e529983946232
-  data.tar.gz: 5da1c5c5adb42a8fa0acbbd179dc8f418073cb56
+  metadata.gz: c995883ead403d6ca3e7fb247feaec562361cd40
+  data.tar.gz: d81eaeeee8b20156ff6e752c8ce7da6037ffad4a
 SHA512:
-  metadata.gz: 84d18abd6033f66ca2398dbdbb1e6d8971fa656b80b80b570144265a1135e2d8c106bd32c195beb518ce4346e47cd31a7fd677f531cb9d0fe6379644deee719f
-  data.tar.gz: 02d506b87d0868e49dd05b310c6c1777bef53c45e34a9520217cb65a2a909a2a355f2cb6b3f513158a3001e9f748a84736df66f72ef21ef938fd4b9897b4e8b2
+  metadata.gz: c87e71d2898ac4d3e73d9676083ef48d48ee936dfaf3ffb343e551b3298568884a5444e09530b2e411704daa23dce1c949b830a15e147da0ec33535e1a9628d3
+  data.tar.gz: ad90941b3f68b77c2ce2ae0746b1effdf2f2f7e0590288ab5fc9ac99026214dc56695e4275db6a82103ab3c8d17b1bb20e732c8e548bef8dcf8f0cf293d1b22c

data/README.rdoc

@@ -15,10 +15,9 @@ Significant changes from SolandraObject:
 
 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:
+you will want to override the following setting:
 
-  DatastaxRails::Base.solr_commit_time = 5000
-  DatastaxRails::Base.ram_buffer_size = 100
+  DatastaxRails::Base.live_indexing = false
 
 === Usage Note
 

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>4.10.3</luceneMatchVersion>
+  <luceneMatchVersion><%= @lucene_match_version %></luceneMatchVersion>
   
   <!-- Enable DSE Search new type mappings -->
   <dseTypeMappingVersion>2</dseTypeMappingVersion>
@@ -111,6 +111,7 @@
   <indexConfig>
 
     <useCompoundFile>false</useCompoundFile>
+    <rt><%= @live_indexing %></rt>
     <ramBufferSizeMB><%= @ram_buffer_size %></ramBufferSizeMB>
     <mergeFactor>10</mergeFactor>
 

data/lib/datastax_rails/base.rb

@@ -392,17 +392,24 @@ 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 1000ms.
-    # If you're running something prior to DSE 4.7 or not using live indexing, you should
-    # change this to at least 5000ms.
+    # Whether or not to enable DSE 4.7 live indexing. Default is true. If using DSE < 4.7
+    # or if you don't want to use live indexing, set to false.
+    class_attribute :live_indexing
+    self.live_indexing = true
+
+    # Allows the setting of how frequently to commit data to solr. Default is 1000ms if
+    # live indexing is enabled. 5000ms otherwise.
+    # Setting this to lower than these values runs the risk of corrupting your indexes.
     class_attribute :solr_commit_time
-    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.
+    # when live indexing is enabled. Otherwise the default is 100MB.
     class_attribute :ram_buffer_size
-    self.ram_buffer_size = 2000
+
+    # Allows the setting of what lucene version (and bugs) data should be indexed with.
+    # Defaults to LUCENE_46.
+    class_attribute :lucene_match_version
+    self.lucene_match_version = 'LUCENE_46'
 
     # 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/relation.rb

@@ -466,7 +466,7 @@ module DatastaxRails
 
       q = @fulltext_values.empty? ? '*:*' : @fulltext_values.map { |ftv| '(' + ftv[:query] + ')' }.join(' AND ')
 
-      params = { q: q }
+      params = { q: q, commit: true }
       params[:sort] = sort
       params[:fq] = filter_queries unless filter_queries.empty?
       if @query_parser_value

data/lib/datastax_rails/schema/solr.rb

@@ -41,7 +41,7 @@ module DatastaxRails
       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}'`
+        `curl -s -X POST '#{url}' -H 'Content-type:text/xml; charset=utf-8'`
         say 'Reindexing will run in the background', :subitem
       end
 
@@ -50,7 +50,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}'`
+        `curl -s -X POST '#{url}' -H 'Content-type:text/xml; charset=utf-8'`
       end
 
       # Uploads the necessary configuration files for solr to function
@@ -62,12 +62,14 @@ module DatastaxRails
       # TODO: Simplify this method
       def upload_solr_configuration(model, force = false, reindex = true) # rubocop:disable all
         count = 0
+        @live_indexing = model.live_indexing
+        @solr_commit_time = model.solr_commit_time || (@live_indexing ? '1000' : '5000')
+        @ram_buffer_size = model.ram_buffer_size || (@live_indexing ? '2000' : '100')
+        @lucene_match_version = model.lucene_match_version
         if Rails.root.join('config', 'solr', "#{model.column_family}-solrconfig.xml").exist?
           say 'Using custom solrconfig file', :subitem
-          solrconfig = Rails.root.join('config', 'solr', "#{model.column_family}-solrconfig.xml").read
+          solrconfig = ERB.new(Rails.root.join('config', 'solr', "#{model.column_family}-solrconfig.xml").read).result(binding)
         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?
@@ -104,7 +106,7 @@ module DatastaxRails
           count += 1
           loop do
             say "Posting Solr Config file to '#{solr_url}/solrconfig.xml'", :subitem
-            http.post(uri.path + '/solrconfig.xml', solrconfig)
+            http.post(uri.path + '/solrconfig.xml', solrconfig, 'Content-type' => 'text/xml; charset=utf-8')
             if Rails.env.production?
               sleep(5)
               resp = http.get(uri.path + '/solrconfig.xml')
@@ -118,7 +120,7 @@ module DatastaxRails
           count += 1
           loop do
             say "Posting Solr Stopwords file to '#{solr_url}/stopwords.txt'", :subitem
-            http.post(uri.path + '/stopwords.txt', stopwords)
+            http.post(uri.path + '/stopwords.txt', stopwords, 'Content-type' => 'text/xml; charset=utf-8')
             if Rails.env.production?
               sleep(5)
               resp = http.get(uri.path + '/stopwords.txt')
@@ -132,7 +134,7 @@ module DatastaxRails
           count += 1
           loop do
             say "Posting Solr Schema file to '#{solr_url}/schema.xml'", :subitem
-            http.post(uri.path + '/schema.xml', schema)
+            http.post(uri.path + '/schema.xml', schema, 'Content-type' => 'text/xml; charset=utf-8')
             if Rails.env.production?
               sleep(5)
               resp = http.get(uri.path + '/schema.xml')

data/lib/datastax_rails/version.rb

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

data/spec/dummy/log/test.log

@@ -589,3 +589,12 @@
   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}
+  PersonRole Search (3.8ms) {q: "*:*", sort: "", fq: ["person_id:(4b7bed5e-2a45-11e5-8a5d-1be499a854eb)"], fl: "id,person_id,role_id,created_at,updated_at", page: 1, per_page: 100000}
+  Role CQL (4.3ms) SELECT id,name,created_at,updated_at FROM roles WHERE "id" IN (?,?) LIMIT 100000  [#<Cassandra::TimeUuid:0x007f3288bd56e8 @n=100343444245272480166332369569408290340>, #<Cassandra::TimeUuid:0x007f3288bd5468 @n=100357660154472414617096357815357548456>] - 2 results
+  Person Search (3.5ms) {q: "*:*", sort: "", fq: ["sort_name:(steve)"], fl: "id", page: 1, per_page: 1}
+  Person CQL (3.8ms) INSERT INTO people (name,str_,created_at,updated_at,id) VALUES (?,?,?,?,?)  ["Steve", {"str_favorite_color"=>"blue"}, 2015-07-14 16:28:06 UTC, 2015-07-14 16:28:06 UTC, #<Cassandra::TimeUuid:0x007f3288c126b0 @n=104753604644874615968050975373676543666>] - 0 results
+  Person Search (5.1ms) {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.1ms) INSERT INTO dynamic_model (group,s_,ts_,id) VALUES (?,?,?,?)  ["core", {"s_source"=>"BBC", "s_author"=>"John"}, {"ts_published_at"=>2015-07-14 16:28:08 UTC}, #<Cassandra::TimeUuid:0x007f3288c7ada0 @n=105958403543780279470681916281545570196>] - 0 results
+  TeamMetadata CQL (3.7ms) INSERT INTO dynamic_model (group,id,s_,d_) VALUES (?,?,?,?)  ["team", #<Cassandra::TimeUuid:0x007f3288cc3d98 @n=105958403543780279470681916281545570196>, {"s_source"=>"TV", "s_medium"=>"television"}, {"d_published_on"=>2015-07-14 00:00:00 UTC}] - 0 results
+  CoreMetadata Search (4.8ms) {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 (20.7ms) {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.4.0
+  version: 2.4.4
 platform: ruby
 authors:
 - Jason M. Kusar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails