Skip to content

Commit

Permalink
index all name returns only distributed index
Browse files Browse the repository at this point in the history
  • Loading branch information
bibendi committed Jul 15, 2013
1 parent d46d2e6 commit a19506c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
14 changes: 7 additions & 7 deletions lib/sphinx/integration/extensions/thinking_sphinx/index.rb
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ def merged_indexes
model.sphinx_indexes.select { |i| i.merged_with_core? }
end

# Перекрытый метод
# Возращает индексы, по которым делается select
# Оригинальынй TS зачем то перечисляет все индексы, входящие в состав distributed, зачем так делать не совсем понятно
# Мы же будем возврящять только distributed индекс, чтобы воспользоваться фичей dist_threads
#
# Returns Array of String
def all_names_with_rt
if rt?
names = [core_name, rt_name, delta_rt_name]
else
names = [core_name]
end

names
[name]
end

# Карта атрибутов и их типов, нужна для типкастинга
Expand Down
13 changes: 2 additions & 11 deletions spec/sphinx/integration/extensions/thinking_sphinx/index_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,8 @@
end

describe '#all_names' do
context 'when rt' do
it 'returns rt index names' do
index.all_names.should == [index.core_name, index.rt_name, index.delta_rt_name]
end
end

context 'when disk' do
it 'returns core index names' do
index.stub(:rt?).and_return(false)
index.all_names.should == [index.core_name]
end
it 'returns only distributed index name' do
index.all_names.should == [index.name]
end
end

Expand Down

0 comments on commit a19506c

Please sign in to comment.