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

Fixed compile and test errors after merging in master

This commit is contained in:
Martijn van Groningen 2018-03-16 17:47:10 +01:00
parent 10cfa21a68
commit 9e4c68c389
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java
View File

@ -28,6 +28,7 @@ import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.analysis.common.CommonAnalysisPlugin;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.common.CheckedRunnable;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentType;
@ -276,7 +277,7 @@ public class ShardChangesIT extends ESIntegTestCase {
builder.endObject();
}
builder.endObject();
settings = builder.string();
settings = BytesReference.bytes(builder).utf8ToString();
}
return settings;
}

11
x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java
View File

@ -29,6 +29,7 @@ import org.elasticsearch.index.VersionType;
import org.elasticsearch.index.codec.CodecService;
import org.elasticsearch.index.engine.Engine;
import org.elasticsearch.index.engine.EngineConfig;
import org.elasticsearch.index.engine.EngineDiskUtils;
import org.elasticsearch.index.engine.EngineTestCase;
import org.elasticsearch.index.engine.TranslogHandler;
import org.elasticsearch.index.mapper.IdFieldMapper;
@ -121,7 +122,9 @@ public class FollowingEngineTests extends ESTestCase {
final IndexSettings indexSettings = new IndexSettings(indexMetaData, settings);
try (Store store = createStore(shardId, indexSettings, newDirectory())) {
final EngineConfig engineConfig = engineConfig(shardId, indexSettings, threadPool, store, logger, xContentRegistry());
EngineDiskUtils.createEmpty(store.directory(), engineConfig.getTranslogConfig().getTranslogPath(), shardId);
try (FollowingEngine followingEngine = new FollowingEngine(engineConfig)) {
followingEngine.recoverFromTranslog();
final VersionType versionType =
randomFrom(VersionType.INTERNAL, VersionType.EXTERNAL, VersionType.EXTERNAL_GTE, VersionType.FORCE);
final List<Engine.Operation> ops = EngineTestCase.generateSingleDocHistory(true, versionType, false, 2, 2, 20);
@ -145,7 +148,9 @@ public class FollowingEngineTests extends ESTestCase {
final IndexSettings indexSettings = new IndexSettings(indexMetaData, settings);
try (Store store = createStore(shardId, indexSettings, newDirectory())) {
final EngineConfig engineConfig = engineConfig(shardId, indexSettings, threadPool, store, logger, xContentRegistry());
EngineDiskUtils.createEmpty(store.directory(), engineConfig.getTranslogConfig().getTranslogPath(), shardId);
try (FollowingEngine followingEngine = new FollowingEngine(engineConfig)) {
followingEngine.recoverFromTranslog();
final String id = "id";
final Field uidField = new Field("_id", id, IdFieldMapper.Defaults.FIELD_TYPE);
final String type = "type";
@ -221,7 +226,9 @@ public class FollowingEngineTests extends ESTestCase {
final IndexSettings indexSettings = new IndexSettings(indexMetaData, settings);
try (Store store = createStore(shardId, indexSettings, newDirectory())) {
final EngineConfig engineConfig = engineConfig(shardId, indexSettings, threadPool, store, logger, xContentRegistry());
EngineDiskUtils.createEmpty(store.directory(), engineConfig.getTranslogConfig().getTranslogPath(), shardId);
try (FollowingEngine followingEngine = new FollowingEngine(engineConfig)) {
followingEngine.recoverFromTranslog();
final String id = "id";
final Engine.Delete delete = new Engine.Delete(
"type",
@ -250,7 +257,6 @@ public class FollowingEngineTests extends ESTestCase {
final Path translogPath = createTempDir("translog");
final TranslogConfig translogConfig = new TranslogConfig(shardId, translogPath, indexSettings, BigArrays.NON_RECYCLING_INSTANCE);
return new EngineConfig(
EngineConfig.OpenMode.CREATE_INDEX_AND_TRANSLOG,
shardId,
"allocation-id",
threadPool,
@ -269,7 +275,6 @@ public class FollowingEngineTests extends ESTestCase {
},
IndexSearcher.getDefaultQueryCache(),
IndexSearcher.getDefaultQueryCachingPolicy(),
randomBoolean(),
translogConfig,
TimeValue.timeValueMinutes(5),
Collections.emptyList(),
@ -278,7 +283,7 @@ public class FollowingEngineTests extends ESTestCase {
new TranslogHandler(
xContentRegistry, IndexSettingsModule.newIndexSettings(shardId.getIndexName(), indexSettings.getSettings())),
new NoneCircuitBreakerService(),
() -> SequenceNumbers.UNASSIGNED_SEQ_NO
() -> SequenceNumbers.NO_OPS_PERFORMED
);
}