fix: use matching option only when reindex

https://jira.railsc.ru/browse/PC4-15389
abak-press · Aug 10, 2015 · f770236 · f770236
1 parent a41700b
commit f770236
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/sphinx/integration/transmitter.rb b/lib/sphinx/integration/transmitter.rb
@@ -70,14 +70,15 @@ def update(record, data)
     def update_fields(fields, where)
       return if write_disabled?
 
+      matching = where.delete(:matching)
+
       rt_indexes do |index|
         if full_reindex?
           # вначале обновим всё что уже есть в rt индексе
           partitions { |i| ThinkingSphinx.update(index.rt_name_w(i), fields, where) }
 
           # и зареплейсим всё что осталось в core
           # TODO: implement sphinx transactions
-          matching = where.delete(:matching)
           batch_options = {where: where, matching: matching}
           ThinkingSphinx.find_in_batches(index.core_name, batch_options) do |ids|
             klass.where(id: ids).each { |record| transmit(index, record) }

diff --git a/spec/sphinx/integration/transmitter_spec.rb b/spec/sphinx/integration/transmitter_spec.rb
@@ -43,8 +43,8 @@
       before { transmitter.stub(:full_reindex? => true) }
 
       it do
-        expect(ThinkingSphinx).to receive(:update).with("model_with_rt_rt0", {field: 123}, id: 1, matching: "@id_idx 1")
-        expect(ThinkingSphinx).to receive(:update).with("model_with_rt_rt1", {field: 123}, id: 1, matching: "@id_idx 1")
+        expect(ThinkingSphinx).to receive(:update).with("model_with_rt_rt0", {field: 123}, id: 1)
+        expect(ThinkingSphinx).to receive(:update).with("model_with_rt_rt1", {field: 123}, id: 1)
         expect(ThinkingSphinx).
           to receive(:find_in_batches).
             with("model_with_rt_core", where: {id: 1}, matching: "@id_idx 1").