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

Merge branch 'master' into config-changes 

Original commit: elastic/x-pack-elasticsearch@efb366bf46
This commit is contained in:
Lukas Olson 2015-12-23 08:52:28 -07:00
parent f90124da7a cda1095f75
commit 01a2a5b307
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authz/accesscontrol/FieldDataCacheWithFieldSubsetReaderTests.java
View File

@ -58,11 +58,11 @@ public class FieldDataCacheWithFieldSubsetReaderTests extends ESTestCase {
public void setup() throws Exception { public void setup() throws Exception {
IndexSettings indexSettings = createIndexSettings(); IndexSettings indexSettings = createIndexSettings();
CircuitBreakerService circuitBreakerService = new NoneCircuitBreakerService(); CircuitBreakerService circuitBreakerService = new NoneCircuitBreakerService();
MappedFieldType.Names names = new MappedFieldType.Names("_field"); String name = "_field";
FieldDataType fieldDataType = new StringFieldMapper.StringFieldType().fieldDataType(); FieldDataType fieldDataType = new StringFieldMapper.StringFieldType().fieldDataType();
indexFieldDataCache = new DummyAccountingFieldDataCache(); indexFieldDataCache = new DummyAccountingFieldDataCache();
sortedSetDVOrdinalsIndexFieldData = new SortedSetDVOrdinalsIndexFieldData(indexSettings,indexFieldDataCache, names, circuitBreakerService, fieldDataType); sortedSetDVOrdinalsIndexFieldData = new SortedSetDVOrdinalsIndexFieldData(indexSettings,indexFieldDataCache, name, circuitBreakerService, fieldDataType);
pagedBytesIndexFieldData = new PagedBytesIndexFieldData(indexSettings, names, fieldDataType, indexFieldDataCache, circuitBreakerService); pagedBytesIndexFieldData = new PagedBytesIndexFieldData(indexSettings, name, fieldDataType, indexFieldDataCache, circuitBreakerService);
dir = newDirectory(); dir = newDirectory();
IndexWriterConfig iwc = new IndexWriterConfig(null); IndexWriterConfig iwc = new IndexWriterConfig(null);