Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/models/search/pseud_indexer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ def self.mapping
}
end

def self.index_all(options = {})
unless options[:skip_delete]
delete_index
create_index(shards: ArchiveConfig.PSEUD_SHARDS)
end
options[:skip_delete] = true
super(options)
end

def document(object)
object.as_json(
root: false,
Expand Down
9 changes: 9 additions & 0 deletions app/models/search/tag_indexer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ def self.mapping
}
end

def self.index_all(options = {})
unless options[:skip_delete]
delete_index
create_index(shards: ArchiveConfig.TAG_SHARDS)
end
options[:skip_delete] = true
super(options)
end

def self.settings
{
analysis: {
Expand Down
4 changes: 3 additions & 1 deletion config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -787,5 +787,7 @@ PERCONA_ARGS: >
# Production may have more than 5 for these
BOOKMARKABLE_SHARDS: 5
COLLECTION_SHARDS: 5
WORKS_SHARDS: 5
PSEUD_SHARDS: 5
TAG_SHARDS: 5
USER_SHARDS: 5
Comment thread
not-varram marked this conversation as resolved.
WORKS_SHARDS: 5
9 changes: 9 additions & 0 deletions spec/models/search/pseud_indexer_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
require "spec_helper"

describe PseudIndexer, pseud_search: true do
describe ".index_all" do
it "uses configured shard count when creating the index" do
Comment thread
not-varram marked this conversation as resolved.
allow(PseudIndexer).to receive(:index_from_db)
expect(PseudIndexer).to receive(:create_index).with(shards: ArchiveConfig.PSEUD_SHARDS)

PseudIndexer.index_all
end
end

describe "#index_documents" do
let(:pseud) { create(:pseud) }
let(:indexer) { PseudIndexer.new([pseud.id]) }
Expand Down
12 changes: 12 additions & 0 deletions spec/models/search/tag_indexer_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
require "spec_helper"

describe TagIndexer, tag_search: true do
describe ".index_all" do
it "uses configured shard count when creating the index" do
allow(TagIndexer).to receive(:index_from_db)
expect(TagIndexer).to receive(:create_index).with(shards: ArchiveConfig.TAG_SHARDS)

TagIndexer.index_all
end
end
end
Loading