Added experimental support for Cequel - #828

Andrew Kane
1 parent 0a17dd2e
Showing 15 changed files with 141 additions and 14 deletions Show diff stats
lib/searchkick.rb
lib/searchkick/model.rb
lib/searchkick/reindex_v2_job.rb
test/aggs_test.rb
test/boost_test.rb
test/errors_test.rb
test/gemfiles/cequel.gemfile
test/inheritance_test.rb
test/match_test.rb
test/model_test.rb
test/order_test.rb
test/records_test.rb
test/reindex_test.rb
test/test_helper.rb
test/where_test.rb
@@ -169,6 +169,8 @@ module Searchkick
       elsif records.respond_to?(:unscoped) && :id.respond_to?(:in)
         # Nobrainer
         records.unscoped.where(:id.in => ids)
+      elsif records.respond_to?(:key_column_names)
+        records.where(records.key_column_names.first => ids)
       end
     raise Searchkick::Error, "Not sure how to load records" if !records
@@ -144,6 +144,12 @@ module Searchkick
         def should_index?
           true
         end unless method_defined?(:should_index?)
+
+        if defined?(Cequel) && self < Cequel::Record && !method_defined?(:destroyed?)
+          def destroyed?
+            transient?
+          end
+        end
       end
     end
   end
@@ -3,7 +3,8 @@ module Searchkick
     RECORD_NOT_FOUND_CLASSES = [
       "ActiveRecord::RecordNotFound",
       "Mongoid::Errors::DocumentNotFound",
-      "NoBrainer::Error::DocumentNotFound"
+      "NoBrainer::Error::DocumentNotFound",
+      "Cequel::Record::RecordNotFound"
     ]
     queue_as :searchkick
@@ -6,8 +6,8 @@ class AggsTest &lt; Minitest::Test
     store [
       {name: "Product Show", latitude: 37.7833, longitude: 12.4167, store_id: 1, in_stock: true, color: "blue", price: 21, created_at: 2.days.ago},
       {name: "Product Hide", latitude: 29.4167, longitude: -98.5000, store_id: 2, in_stock: false, color: "green", price: 25, created_at: 2.days.from_now},
-      {name: "Product B", latitude: 43.9333, longitude: -122.4667, store_id: 2, in_stock: false, color: "red", price: 5},
-      {name: "Foo", latitude: 43.9333, longitude: 12.4667, store_id: 3, in_stock: false, color: "yellow", price: 15}
+      {name: "Product B", latitude: 43.9333, longitude: -122.4667, store_id: 2, in_stock: false, color: "red", price: 5, created_at: Time.now},
+      {name: "Foo", latitude: 43.9333, longitude: 12.4667, store_id: 3, in_stock: false, color: "yellow", price: 15, created_at: Time.now}
     ]
   end
@@ -157,6 +157,8 @@ class BoostTest &lt; Minitest::Test
   end
   def test_boost_by_indices
+    skip if cequel?
+
     store_names ["Rex"], Animal
     store_names ["Rexx"], Product
@@ -2,8 +2,8 @@ require_relative &quot;test_helper&quot;
 class ErrorsTest < Minitest::Test
   def test_bulk_import_raises_error
-    valid_dog = Dog.new(name: "2016-01-02")
-    invalid_dog = Dog.new(name: "Ol' One-Leg")
+    valid_dog = Product.new(name: "2016-01-02")
+    invalid_dog = Product.new(name: "Ol' One-Leg")
     index = Searchkick::Index.new "dogs", mappings: {
       dog: {
         properties: {
@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../../"
+
+gem "cequel"
+gem "activejob"
+gem "redis"
 require_relative "test_helper"
 class InheritanceTest < Minitest::Test
+  def setup
+    skip if defined?(Cequel)
+    super
+  end
+
   def test_child_reindex
     store_names ["Max"], Cat
     assert Dog.reindex
@@ -184,6 +184,7 @@ class MatchTest &lt; Minitest::Test
   end
   def test_no_arguments
+    store_names []
     assert_equal [], Product.search.to_a
   end
@@ -37,6 +37,6 @@ class ModelTest &lt; Minitest::Test
   def test_multiple_models
     store_names ["Product A"]
     store_names ["Product B"], Speaker
-    assert_equal Product.all + Speaker.all, Searchkick.search("product", index_name: [Product, Speaker], fields: [:name], order: "name").to_a
+    assert_equal Product.all.to_a + Speaker.all.to_a, Searchkick.search("product", index_name: [Product, Speaker], fields: [:name], order: "name").to_a
   end
 end
@@ -12,6 +12,8 @@ class OrderTest &lt; Minitest::Test
   end
   def test_order_id
+    skip if cequel?
+
     store_names ["Product A", "Product B"]
     product_a = Product.where(name: "Product A").first
     product_b = Product.where(name: "Product B").first
@@ -2,6 +2,8 @@ require_relative &quot;test_helper&quot;
 class RecordsTest < Minitest::Test
   def test_records
+    skip if cequel?
+
     store_names ["Milk", "Apple"]
     assert_equal Product.search("milk").records.where(name: "Milk").count, 1
   end
@@ -2,7 +2,7 @@ require_relative &quot;test_helper&quot;
 class ReindexTest < Minitest::Test
   def test_scoped
-    skip if nobrainer?
+    skip if nobrainer? || cequel?
     store_names ["Product A"]
     Searchkick.callbacks(false) do
@@ -13,7 +13,7 @@ class ReindexTest &lt; Minitest::Test
   end
   def test_associations
-    skip if nobrainer?
+    skip if nobrainer? || cequel?
     store_names ["Product A"]
     store = Store.create!(name: "Test")
@@ -45,6 +45,10 @@ def nobrainer?
   defined?(NoBrainer)
 end
+def cequel?
+  defined?(Cequel)
+end
+
 if defined?(Mongoid)
   Mongoid.logger.level = Logger::INFO
   Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo::Logger)
@@ -162,6 +166,87 @@ elsif defined?(NoBrainer)
   class Cat < Animal
   end
+elsif defined?(Cequel)
+  cequel =
+    Cequel.connect(
+      host: "127.0.0.1",
+      port: 9042,
+      keyspace: "searchkick_test",
+      default_consistency: :all
+    )
+  cequel.schema.drop! if cequel.schema.exists?
+  cequel.schema.create!
+  Cequel::Record.connection = cequel
+
+  class Product
+    include Cequel::Record
+
+    key :id, :uuid, auto: true
+    column :name, :text, index: true
+    column :store_id, :int
+    column :in_stock, :boolean
+    column :backordered, :boolean
+    column :orders_count, :int
+    column :found_rate, :decimal
+    column :price, :int
+    column :color, :text
+    column :latitude, :decimal
+    column :longitude, :decimal
+    column :description, :text
+    column :alt_description, :text
+    column :created_at, :timestamp
+  end
+
+  class Store
+    include Cequel::Record
+
+    key :id, :timeuuid, auto: true
+    column :name, :text
+
+    # has issue with id serialization
+    def search_data
+      {
+        name: name
+      }
+    end
+  end
+
+  class Region
+    include Cequel::Record
+
+    key :id, :timeuuid, auto: true
+    column :name, :text
+    column :text, :text
+  end
+
+  class Speaker
+    include Cequel::Record
+
+    key :id, :timeuuid, auto: true
+    column :name, :text
+  end
+
+  class Animal
+    include Cequel::Record
+
+    key :id, :timeuuid, auto: true
+    column :name, :text
+
+    # has issue with id serialization
+    def search_data
+      {
+        name: name
+      }
+    end
+  end
+
+  class Dog < Animal
+  end
+
+  class Cat < Animal
+  end
+
+  [Product, Store, Region, Speaker, Animal].each(&:synchronize_schema)
 else
   require "active_record"
@@ -10,16 +10,22 @@ class WhereTest &lt; Minitest::Test
       {name: "Product D", store_id: 4, in_stock: false, backordered: false, created_at: now - 3, orders_count: 1}
     ]
     assert_search "product", ["Product A", "Product B"], where: {in_stock: true}
-    # date
-    assert_search "product", ["Product A"], where: {created_at: {gt: now - 1}}
-    assert_search "product", ["Product A", "Product B"], where: {created_at: {gte: now - 1}}
-    assert_search "product", ["Product D"], where: {created_at: {lt: now - 2}}
-    assert_search "product", ["Product C", "Product D"], where: {created_at: {lte: now - 2}}
+
+    # due to precision
+    unless cequel?
+      # date
+      assert_search "product", ["Product A"], where: {created_at: {gt: now - 1}}
+      assert_search "product", ["Product A", "Product B"], where: {created_at: {gte: now - 1}}
+      assert_search "product", ["Product D"], where: {created_at: {lt: now - 2}}
+      assert_search "product", ["Product C", "Product D"], where: {created_at: {lte: now - 2}}
+    end
+
     # integer
     assert_search "product", ["Product A"], where: {store_id: {lt: 2}}
     assert_search "product", ["Product A", "Product B"], where: {store_id: {lte: 2}}
     assert_search "product", ["Product D"], where: {store_id: {gt: 3}}
     assert_search "product", ["Product C", "Product D"], where: {store_id: {gte: 3}}
+
     # range
     assert_search "product", ["Product A", "Product B"], where: {store_id: 1..2}
     assert_search "product", ["Product A"], where: {store_id: 1...2}
@@ -27,23 +33,30 @@ class WhereTest &lt; Minitest::Test
     assert_search "product", ["Product B", "Product C", "Product D"], where: {store_id: {not: 1}}
     assert_search "product", ["Product C", "Product D"], where: {store_id: {not: [1, 2]}}
     assert_search "product", ["Product A"], where: {user_ids: {lte: 2, gte: 2}}
+
     # or
     assert_search "product", ["Product A", "Product B", "Product C"], where: {or: [[{in_stock: true}, {store_id: 3}]]}
     assert_search "product", ["Product A", "Product B", "Product C"], where: {or: [[{orders_count: [2, 4]}, {store_id: [1, 2]}]]}
     assert_search "product", ["Product A", "Product D"], where: {or: [[{orders_count: 1}, {created_at: {gte: now - 1}, backordered: true}]]}
+
     # _or
     assert_search "product", ["Product A", "Product B", "Product C"], where: {_or: [{in_stock: true}, {store_id: 3}]}
     assert_search "product", ["Product A", "Product B", "Product C"], where: {_or: [{orders_count: [2, 4]}, {store_id: [1, 2]}]}
     assert_search "product", ["Product A", "Product D"], where: {_or: [{orders_count: 1}, {created_at: {gte: now - 1}, backordered: true}]}
+
     # _and
     assert_search "product", ["Product A"], where: {_and: [{in_stock: true}, {backordered: true}]}
+
     # _not
     assert_search "product", ["Product B", "Product C"], where: {_not: {_or: [{orders_count: 1}, {created_at: {gte: now - 1}, backordered: true}]}}
+
     # all
     assert_search "product", ["Product A", "Product C"], where: {user_ids: {all: [1, 3]}}
     assert_search "product", [], where: {user_ids: {all: [1, 2, 3, 4]}}
+
     # any / nested terms
     assert_search "product", ["Product B", "Product C"], where: {user_ids: {not: [2], in: [1, 3]}}
+
     # not / exists
     assert_search "product", ["Product D"], where: {user_ids: nil}
     assert_search "product", ["Product A", "Product B", "Product C"], where: {user_ids: {not: nil}}
@@ -78,7 +91,7 @@ class WhereTest &lt; Minitest::Test
   def test_where_id
     store_names ["Product A"]
-    product = Product.last
+    product = Product.first
     assert_search "product", ["Product A"], where: {id: product.id.to_s}
   end
	@@ -144,6 +144,12 @@ module Searchkick		@@ -144,6 +144,12 @@ module Searchkick
144	def should_index?	144	def should_index?
145	true	145	true
146	end unless method_defined?(:should_index?)	146	end unless method_defined?(:should_index?)
		147	+
		148	+ if defined?(Cequel) && self < Cequel::Record && !method_defined?(:destroyed?)
		149	+ def destroyed?
		150	+ transient?
		151	+ end
		152	+ end
147	end	153	end
148	end	154	end
149	end	155	end
	@@ -157,6 +157,8 @@ class BoostTest < Minitest::Test		@@ -157,6 +157,8 @@ class BoostTest < Minitest::Test
157	end	157	end
158		158
159	def test_boost_by_indices	159	def test_boost_by_indices
		160	+ skip if cequel?
		161	+
160	store_names ["Rex"], Animal	162	store_names ["Rex"], Animal
161	store_names ["Rexx"], Product	163	store_names ["Rexx"], Product
162		164
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+source 'https://rubygems.org'
	2	+
	3	+# Specify your gem's dependencies in searchkick.gemspec
	4	+gemspec path: "../../"
	5	+
	6	+gem "cequel"
	7	+gem "activejob"
	8	+gem "redis"
	@@ -184,6 +184,7 @@ class MatchTest < Minitest::Test		@@ -184,6 +184,7 @@ class MatchTest < Minitest::Test
184	end	184	end
185		185
186	def test_no_arguments	186	def test_no_arguments
		187	+ store_names []
187	assert_equal [], Product.search.to_a	188	assert_equal [], Product.search.to_a
188	end	189	end
189		190
	@@ -37,6 +37,6 @@ class ModelTest < Minitest::Test		@@ -37,6 +37,6 @@ class ModelTest < Minitest::Test
37	def test_multiple_models	37	def test_multiple_models
38	store_names ["Product A"]	38	store_names ["Product A"]
39	store_names ["Product B"], Speaker	39	store_names ["Product B"], Speaker
40	- assert_equal Product.all + Speaker.all, Searchkick.search("product", index_name: [Product, Speaker], fields: [:name], order: "name").to_a	40	+ assert_equal Product.all.to_a + Speaker.all.to_a, Searchkick.search("product", index_name: [Product, Speaker], fields: [:name], order: "name").to_a
41	end	41	end
42	end	42	end
	@@ -2,7 +2,7 @@ require_relative "test_helper"		@@ -2,7 +2,7 @@ require_relative "test_helper"
2		2
3	class ReindexTest < Minitest::Test	3	class ReindexTest < Minitest::Test
4	def test_scoped	4	def test_scoped
5	- skip if nobrainer?	5	+ skip if nobrainer? \|\| cequel?
6		6
7	store_names ["Product A"]	7	store_names ["Product A"]
8	Searchkick.callbacks(false) do	8	Searchkick.callbacks(false) do
	@@ -13,7 +13,7 @@ class ReindexTest < Minitest::Test		@@ -13,7 +13,7 @@ class ReindexTest < Minitest::Test
13	end	13	end
14		14
15	def test_associations	15	def test_associations
16	- skip if nobrainer?	16	+ skip if nobrainer? \|\| cequel?
17		17
18	store_names ["Product A"]	18	store_names ["Product A"]
19	store = Store.create!(name: "Test")	19	store = Store.create!(name: "Test")
	@@ -45,6 +45,10 @@ def nobrainer?		@@ -45,6 +45,10 @@ def nobrainer?
45	defined?(NoBrainer)	45	defined?(NoBrainer)
46	end	46	end
47		47
		48	+def cequel?
		49	+ defined?(Cequel)
		50	+end
		51	+
48	if defined?(Mongoid)	52	if defined?(Mongoid)
49	Mongoid.logger.level = Logger::INFO	53	Mongoid.logger.level = Logger::INFO
50	Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo::Logger)	54	Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo::Logger)
	@@ -162,6 +166,87 @@ elsif defined?(NoBrainer)		@@ -162,6 +166,87 @@ elsif defined?(NoBrainer)
162		166
163	class Cat < Animal	167	class Cat < Animal
164	end	168	end
		169	+elsif defined?(Cequel)
		170	+ cequel =
		171	+ Cequel.connect(
		172	+ host: "127.0.0.1",
		173	+ port: 9042,
		174	+ keyspace: "searchkick_test",
		175	+ default_consistency: :all
		176	+ )
		177	+ cequel.schema.drop! if cequel.schema.exists?
		178	+ cequel.schema.create!
		179	+ Cequel::Record.connection = cequel
		180	+
		181	+ class Product
		182	+ include Cequel::Record
		183	+
		184	+ key :id, :uuid, auto: true
		185	+ column :name, :text, index: true
		186	+ column :store_id, :int
		187	+ column :in_stock, :boolean
		188	+ column :backordered, :boolean
		189	+ column :orders_count, :int
		190	+ column :found_rate, :decimal
		191	+ column :price, :int
		192	+ column :color, :text
		193	+ column :latitude, :decimal
		194	+ column :longitude, :decimal
		195	+ column :description, :text
		196	+ column :alt_description, :text
		197	+ column :created_at, :timestamp
		198	+ end
		199	+
		200	+ class Store
		201	+ include Cequel::Record
		202	+
		203	+ key :id, :timeuuid, auto: true
		204	+ column :name, :text
		205	+
		206	+ # has issue with id serialization
		207	+ def search_data
		208	+ {
		209	+ name: name
		210	+ }
		211	+ end
		212	+ end
		213	+
		214	+ class Region
		215	+ include Cequel::Record
		216	+
		217	+ key :id, :timeuuid, auto: true
		218	+ column :name, :text
		219	+ column :text, :text
		220	+ end
		221	+
		222	+ class Speaker
		223	+ include Cequel::Record
		224	+
		225	+ key :id, :timeuuid, auto: true
		226	+ column :name, :text
		227	+ end
		228	+
		229	+ class Animal
		230	+ include Cequel::Record
		231	+
		232	+ key :id, :timeuuid, auto: true
		233	+ column :name, :text
		234	+
		235	+ # has issue with id serialization
		236	+ def search_data
		237	+ {
		238	+ name: name
		239	+ }
		240	+ end
		241	+ end
		242	+
		243	+ class Dog < Animal
		244	+ end
		245	+
		246	+ class Cat < Animal
		247	+ end
		248	+
		249	+ [Product, Store, Region, Speaker, Animal].each(&:synchronize_schema)
165	else	250	else
166	require "active_record"	251	require "active_record"
167		252