honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow to clear the fielddata cache per field 

With this commit we clear the fielddata cache per field as it is
supposed to be. Previously we retrieved the proper field from the cache
but then cleared the entire cache anyway.

Closes #33798
Relates #33807
This commit is contained in:
Daniel Mitterdorfer 2018-09-20 08:59:53 +02:00 committed by GitHub
parent 384ce58535
commit b1cc58e425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java
View File

@ -97,7 +97,7 @@ public class IndexFieldDataService extends AbstractIndexComponent implements Clo
final IndexFieldDataCache cache = fieldDataCaches.remove(fieldName);
if (cache != null) {
try {
cache.clear();
cache.clear(fieldName);
} catch (Exception e) {
exceptions.add(e);
}

60
server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java
View File

@ -100,6 +100,66 @@ public class IndexFieldDataServiceTests extends ESSingleNodeTestCase {
assertTrue(fd instanceof SortedNumericDVIndexFieldData);
}
public void testClearField() throws Exception {
final IndexService indexService = createIndex("test");
final IndicesService indicesService = getInstanceFromNode(IndicesService.class);
// copy the ifdService since we can set the listener only once.
final IndexFieldDataService ifdService = new IndexFieldDataService(indexService.getIndexSettings(),
indicesService.getIndicesFieldDataCache(), indicesService.getCircuitBreakerService(), indexService.mapperService());
final BuilderContext ctx = new BuilderContext(indexService.getIndexSettings().getSettings(), new ContentPath(1));
final MappedFieldType mapper1 = new TextFieldMapper.Builder("field_1").fielddata(true).build(ctx).fieldType();
final MappedFieldType mapper2 = new TextFieldMapper.Builder("field_2").fielddata(true).build(ctx).fieldType();
final IndexWriter writer = new IndexWriter(new RAMDirectory(), new IndexWriterConfig(new KeywordAnalyzer()));
Document doc = new Document();
doc.add(new StringField("field_1", "thisisastring", Store.NO));
doc.add(new StringField("field_2", "thisisanotherstring", Store.NO));
writer.addDocument(doc);
final IndexReader reader = DirectoryReader.open(writer);
final AtomicInteger onCacheCalled = new AtomicInteger();
final AtomicInteger onRemovalCalled = new AtomicInteger();
ifdService.setListener(new IndexFieldDataCache.Listener() {
@Override
public void onCache(ShardId shardId, String fieldName, Accountable ramUsage) {
onCacheCalled.incrementAndGet();
}
@Override
public void onRemoval(ShardId shardId, String fieldName, boolean wasEvicted, long sizeInBytes) {
onRemovalCalled.incrementAndGet();
}
});
IndexFieldData<?> ifd1 = ifdService.getForField(mapper1);
IndexFieldData<?> ifd2 = ifdService.getForField(mapper2);
LeafReaderContext leafReaderContext = reader.getContext().leaves().get(0);
AtomicFieldData loadField1 = ifd1.load(leafReaderContext);
AtomicFieldData loadField2 = ifd2.load(leafReaderContext);
assertEquals(2, onCacheCalled.get());
assertEquals(0, onRemovalCalled.get());
ifdService.clearField("field_1");
assertEquals(2, onCacheCalled.get());
assertEquals(1, onRemovalCalled.get());
ifdService.clearField("field_1");
assertEquals(2, onCacheCalled.get());
assertEquals(1, onRemovalCalled.get());
ifdService.clearField("field_2");
assertEquals(2, onCacheCalled.get());
assertEquals(2, onRemovalCalled.get());
reader.close();
loadField1.close();
loadField2.close();
writer.close();
ifdService.clear();
}
public void testFieldDataCacheListener() throws Exception {
final IndexService indexService = createIndex("test");
final IndicesService indicesService = getInstanceFromNode(IndicesService.class);