Skip to content

IndexWriterConfig used in InMemoryNoOpCommitDirectory should support soft-deletes #52781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlrx merged 1 commit into from
Feb 26, 2020
+22 −3
Merged

IndexWriterConfig used in InMemoryNoOpCommitDirectory should support soft-deletes #52781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion ...c/main/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@

import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.NoMergePolicy;
import org.apache.lucene.store.Directory;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.cluster.metadata.RepositoryMetaData;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.blobstore.BlobContainer;
import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.IndexSettings;
Expand Down Expand Up @@ -93,7 +95,11 @@ private Directory makeDirectory(IndexSettings indexSettings, ShardPath shardPath
}
directory = new InMemoryNoOpCommitDirectory(directory);

try (IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig())) {
final IndexWriterConfig indexWriterConfig = new IndexWriterConfig(null)
.setSoftDeletesField(Lucene.SOFT_DELETES_FIELD)
.setMergePolicy(NoMergePolicy.INSTANCE);

try (IndexWriter indexWriter = new IndexWriter(directory, indexWriterConfig)) {
final Map<String, String> userData = new HashMap<>();
indexWriter.getLiveCommitData().forEach(e -> userData.put(e.getKey(), e.getValue()));

Expand Down
17 changes: 15 additions & 2 deletions .../org/elasticsearch/xpack/searchablesnapshots/AbstractSearchableSnapshotsRestTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void testSearchableSnapshots() throws Exception {

final StringBuilder bulkBody = new StringBuilder();
for (int i = 0; i < numDocs; i++) {
bulkBody.append("{\"index\":{}}\n");
bulkBody.append("{\"index\":{\"_id\":\"").append(i).append("\"}}\n");
bulkBody.append("{\"field\":").append(i).append(",\"text\":\"Document number ").append(i).append("\"}\n");
}

Expand All @@ -75,8 +75,21 @@ public void testSearchableSnapshots() throws Exception {
documents.setJsonEntity(bulkBody.toString());
assertOK(client().performRequest(documents));

if (randomBoolean()) {
final StringBuilder bulkUpdateBody = new StringBuilder();
for (int i = 0; i < randomIntBetween(1, numDocs); i++) {
bulkUpdateBody.append("{\"update\":{\"_id\":\"").append(i).append("\"}}\n");
bulkUpdateBody.append("{\"doc\":{").append("\"text\":\"Updated document number ").append(i).append("\"}}\n");
}

final Request bulkUpdate = new Request(HttpPost.METHOD_NAME, '/' + indexName + "/_bulk");
bulkUpdate.addParameter("refresh", Boolean.TRUE.toString());
bulkUpdate.setJsonEntity(bulkUpdateBody.toString());
assertOK(client().performRequest(bulkUpdate));
}

logger.info("force merging index [{}]", indexName);
forceMerge(indexName, true, true);
forceMerge(indexName, randomBoolean(), randomBoolean());

final String snapshot = "searchable-snapshot";

Expand Down