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

DLS: Use the cache keys of the wrapped reader instead of the document subset reader itself. 

Original commit: elastic/x-pack-elasticsearch@14ff21cc5b
This commit is contained in:
Martijn van Groningen 2015-10-09 22:38:44 +02:00
parent 6e0365127a
commit 72c015f82e
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shield/src/main/java/org/elasticsearch/shield/authz/accesscontrol/DocumentSubsetReader.java
View File

@ -140,6 +140,13 @@ public final class DocumentSubsetReader extends FilterLeafReader {
return true;
}
// Don't delegate getCombinedCoreAndDeletesKey(), because we change the live docs here.
@Override
public Object getCoreCacheKey() {
return in.getCoreCacheKey();
}
BitSet getRoleQueryBits() {
return roleQueryBits;
}

40
shield/src/test/java/org/elasticsearch/shield/authz/accesscontrol/DocumentSubsetReaderTests.java
View File

@ -15,6 +15,8 @@ import org.apache.lucene.search.join.BitSetProducer;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BitSet;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.TestUtil;
import org.elasticsearch.index.cache.bitset.BitsetFilterCache;
import org.elasticsearch.test.ESTestCase;
import org.junit.After;
@ -162,4 +164,42 @@ public class DocumentSubsetReaderTests extends ESTestCase {
directoryReader.close();
dir.close();
}
/** Same test as in FieldSubsetReaderTests, test that core cache key (needed for NRT) is working */
public void testCoreCacheKey() throws Exception {
Directory dir = newDirectory();
IndexWriterConfig iwc = new IndexWriterConfig(null);
iwc.setMaxBufferedDocs(100);
iwc.setMergePolicy(NoMergePolicy.INSTANCE);
IndexWriter iw = new IndexWriter(dir, iwc);
// add two docs, id:0 and id:1
Document doc = new Document();
Field idField = new StringField("id", "", Field.Store.NO);
doc.add(idField);
idField.setStringValue("0");
iw.addDocument(doc);
idField.setStringValue("1");
iw.addDocument(doc);
// open reader
DirectoryReader ir = DocumentSubsetReader.wrap(DirectoryReader.open(iw, true), bitsetFilterCache, new MatchAllDocsQuery());
assertEquals(2, ir.numDocs());
assertEquals(1, ir.leaves().size());
// delete id:0 and reopen
iw.deleteDocuments(new Term("id", "0"));
DirectoryReader ir2 = DirectoryReader.openIfChanged(ir);
// we should have the same cache key as before
assertEquals(1, ir2.numDocs());
assertEquals(1, ir2.leaves().size());
assertSame(ir.leaves().get(0).reader().getCoreCacheKey(), ir2.leaves().get(0).reader().getCoreCacheKey());
// this is kind of stupid, but for now its here
assertNotSame(ir.leaves().get(0).reader().getCombinedCoreAndDeletesKey(), ir2.leaves().get(0).reader().getCombinedCoreAndDeletesKey());
TestUtil.checkReader(ir);
IOUtils.close(ir, ir2, iw, dir);
}
}