|
@@ -28,9 +28,7 @@ import java.io.IOException;
|
|
|
|
|
|
import static org.elasticsearch.cluster.metadata.AliasMetaData.newAliasMetaDataBuilder;
|
|
|
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
|
|
|
-import static org.hamcrest.Matchers.equalTo;
|
|
|
-import static org.hamcrest.Matchers.is;
|
|
|
-import static org.hamcrest.Matchers.nullValue;
|
|
|
+import static org.hamcrest.Matchers.*;
|
|
|
|
|
|
/**
|
|
|
*
|
|
@@ -52,12 +50,27 @@ public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase {
|
|
|
.numberOfReplicas(2)
|
|
|
.putMapping("mapping1", MAPPING_SOURCE1))
|
|
|
.put(IndexMetaData.builder("test4")
|
|
|
+ .numberOfShards(1)
|
|
|
+ .numberOfReplicas(2)
|
|
|
+ .creationDate(2l))
|
|
|
+ .put(IndexMetaData.builder("test5")
|
|
|
.settings(settingsBuilder().put("setting1", "value1").put("setting2", "value2"))
|
|
|
.numberOfShards(1)
|
|
|
.numberOfReplicas(2)
|
|
|
.putMapping("mapping1", MAPPING_SOURCE1)
|
|
|
.putMapping("mapping2", MAPPING_SOURCE2))
|
|
|
- .put(IndexMetaData.builder("test5")
|
|
|
+ .put(IndexMetaData.builder("test6")
|
|
|
+ .settings(settingsBuilder().put("setting1", "value1").put("setting2", "value2"))
|
|
|
+ .numberOfShards(1)
|
|
|
+ .numberOfReplicas(2)
|
|
|
+ .creationDate(2l))
|
|
|
+ .put(IndexMetaData.builder("test7")
|
|
|
+ .numberOfShards(1)
|
|
|
+ .numberOfReplicas(2)
|
|
|
+ .creationDate(2l)
|
|
|
+ .putMapping("mapping1", MAPPING_SOURCE1)
|
|
|
+ .putMapping("mapping2", MAPPING_SOURCE2))
|
|
|
+ .put(IndexMetaData.builder("test8")
|
|
|
.settings(settingsBuilder().put("setting1", "value1").put("setting2", "value2"))
|
|
|
.numberOfShards(1)
|
|
|
.numberOfReplicas(2)
|
|
@@ -65,7 +78,16 @@ public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase {
|
|
|
.putMapping("mapping2", MAPPING_SOURCE2)
|
|
|
.putAlias(newAliasMetaDataBuilder("alias1"))
|
|
|
.putAlias(newAliasMetaDataBuilder("alias2")))
|
|
|
- .put(IndexMetaData.builder("test6")
|
|
|
+ .put(IndexMetaData.builder("test9")
|
|
|
+ .settings(settingsBuilder().put("setting1", "value1").put("setting2", "value2"))
|
|
|
+ .creationDate(2l)
|
|
|
+ .numberOfShards(1)
|
|
|
+ .numberOfReplicas(2)
|
|
|
+ .putMapping("mapping1", MAPPING_SOURCE1)
|
|
|
+ .putMapping("mapping2", MAPPING_SOURCE2)
|
|
|
+ .putAlias(newAliasMetaDataBuilder("alias1"))
|
|
|
+ .putAlias(newAliasMetaDataBuilder("alias2")))
|
|
|
+ .put(IndexMetaData.builder("test10")
|
|
|
.settings(settingsBuilder()
|
|
|
.put("setting1", "value1")
|
|
|
.put("setting2", "value2"))
|
|
@@ -75,7 +97,7 @@ public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase {
|
|
|
.putMapping("mapping2", MAPPING_SOURCE2)
|
|
|
.putAlias(newAliasMetaDataBuilder("alias1"))
|
|
|
.putAlias(newAliasMetaDataBuilder("alias2")))
|
|
|
- .put(IndexMetaData.builder("test7")
|
|
|
+ .put(IndexMetaData.builder("test11")
|
|
|
.settings(settingsBuilder()
|
|
|
.put("setting1", "value1")
|
|
|
.put("setting2", "value2"))
|
|
@@ -95,6 +117,27 @@ public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase {
|
|
|
.putAlias(newAliasMetaDataBuilder("alias-bar1"))
|
|
|
.putAlias(newAliasMetaDataBuilder("alias-bar2").filter("{\"term\":{\"user\":\"kimchy\"}}"))
|
|
|
.putAlias(newAliasMetaDataBuilder("alias-bar3").routing("routing-bar")))
|
|
|
+ .put(IndexMetaData.builder("test12")
|
|
|
+ .settings(settingsBuilder()
|
|
|
+ .put("setting1", "value1")
|
|
|
+ .put("setting2", "value2"))
|
|
|
+ .creationDate(2l)
|
|
|
+ .numberOfShards(1)
|
|
|
+ .numberOfReplicas(2)
|
|
|
+ .putMapping("mapping1", MAPPING_SOURCE1)
|
|
|
+ .putMapping("mapping2", MAPPING_SOURCE2)
|
|
|
+ .putAlias(newAliasMetaDataBuilder("alias1").filter(ALIAS_FILTER1))
|
|
|
+ .putAlias(newAliasMetaDataBuilder("alias2"))
|
|
|
+ .putAlias(newAliasMetaDataBuilder("alias4").filter(ALIAS_FILTER2)))
|
|
|
+ .put(IndexTemplateMetaData.builder("foo")
|
|
|
+ .template("bar")
|
|
|
+ .order(1)
|
|
|
+ .settings(settingsBuilder()
|
|
|
+ .put("setting1", "value1")
|
|
|
+ .put("setting2", "value2"))
|
|
|
+ .putAlias(newAliasMetaDataBuilder("alias-bar1"))
|
|
|
+ .putAlias(newAliasMetaDataBuilder("alias-bar2").filter("{\"term\":{\"user\":\"kimchy\"}}"))
|
|
|
+ .putAlias(newAliasMetaDataBuilder("alias-bar3").routing("routing-bar")))
|
|
|
.build();
|
|
|
|
|
|
String metaDataSource = MetaData.Builder.toXContent(metaData);
|
|
@@ -105,12 +148,14 @@ public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase {
|
|
|
IndexMetaData indexMetaData = parsedMetaData.index("test1");
|
|
|
assertThat(indexMetaData.numberOfShards(), equalTo(1));
|
|
|
assertThat(indexMetaData.numberOfReplicas(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(-1l));
|
|
|
assertThat(indexMetaData.settings().getAsMap().size(), equalTo(2));
|
|
|
assertThat(indexMetaData.mappings().size(), equalTo(0));
|
|
|
|
|
|
indexMetaData = parsedMetaData.index("test2");
|
|
|
assertThat(indexMetaData.numberOfShards(), equalTo(2));
|
|
|
assertThat(indexMetaData.numberOfReplicas(), equalTo(3));
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(-1l));
|
|
|
assertThat(indexMetaData.settings().getAsMap().size(), equalTo(4));
|
|
|
assertThat(indexMetaData.settings().get("setting1"), equalTo("value1"));
|
|
|
assertThat(indexMetaData.settings().get("setting2"), equalTo("value2"));
|
|
@@ -119,13 +164,22 @@ public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase {
|
|
|
indexMetaData = parsedMetaData.index("test3");
|
|
|
assertThat(indexMetaData.numberOfShards(), equalTo(1));
|
|
|
assertThat(indexMetaData.numberOfReplicas(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(-1l));
|
|
|
assertThat(indexMetaData.settings().getAsMap().size(), equalTo(2));
|
|
|
assertThat(indexMetaData.mappings().size(), equalTo(1));
|
|
|
assertThat(indexMetaData.mappings().get("mapping1").source().string(), equalTo(MAPPING_SOURCE1));
|
|
|
|
|
|
indexMetaData = parsedMetaData.index("test4");
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(2l));
|
|
|
assertThat(indexMetaData.numberOfShards(), equalTo(1));
|
|
|
assertThat(indexMetaData.numberOfReplicas(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.settings().getAsMap().size(), equalTo(3));
|
|
|
+ assertThat(indexMetaData.mappings().size(), equalTo(0));
|
|
|
+
|
|
|
+ indexMetaData = parsedMetaData.index("test5");
|
|
|
+ assertThat(indexMetaData.numberOfShards(), equalTo(1));
|
|
|
+ assertThat(indexMetaData.numberOfReplicas(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(-1l));
|
|
|
assertThat(indexMetaData.settings().getAsMap().size(), equalTo(4));
|
|
|
assertThat(indexMetaData.settings().get("setting1"), equalTo("value1"));
|
|
|
assertThat(indexMetaData.settings().get("setting2"), equalTo("value2"));
|
|
@@ -133,9 +187,28 @@ public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase {
|
|
|
assertThat(indexMetaData.mappings().get("mapping1").source().string(), equalTo(MAPPING_SOURCE1));
|
|
|
assertThat(indexMetaData.mappings().get("mapping2").source().string(), equalTo(MAPPING_SOURCE2));
|
|
|
|
|
|
- indexMetaData = parsedMetaData.index("test5");
|
|
|
+ indexMetaData = parsedMetaData.index("test6");
|
|
|
+ assertThat(indexMetaData.numberOfShards(), equalTo(1));
|
|
|
+ assertThat(indexMetaData.numberOfReplicas(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(2l));
|
|
|
+ assertThat(indexMetaData.settings().getAsMap().size(), equalTo(5));
|
|
|
+ assertThat(indexMetaData.settings().get("setting1"), equalTo("value1"));
|
|
|
+ assertThat(indexMetaData.settings().get("setting2"), equalTo("value2"));
|
|
|
+ assertThat(indexMetaData.mappings().size(), equalTo(0));
|
|
|
+
|
|
|
+ indexMetaData = parsedMetaData.index("test7");
|
|
|
+ assertThat(indexMetaData.numberOfShards(), equalTo(1));
|
|
|
+ assertThat(indexMetaData.numberOfReplicas(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(2l));
|
|
|
+ assertThat(indexMetaData.settings().getAsMap().size(), equalTo(3));
|
|
|
+ assertThat(indexMetaData.mappings().size(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.mappings().get("mapping1").source().string(), equalTo(MAPPING_SOURCE1));
|
|
|
+ assertThat(indexMetaData.mappings().get("mapping2").source().string(), equalTo(MAPPING_SOURCE2));
|
|
|
+
|
|
|
+ indexMetaData = parsedMetaData.index("test8");
|
|
|
assertThat(indexMetaData.numberOfShards(), equalTo(1));
|
|
|
assertThat(indexMetaData.numberOfReplicas(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(-1l));
|
|
|
assertThat(indexMetaData.settings().getAsMap().size(), equalTo(4));
|
|
|
assertThat(indexMetaData.settings().get("setting1"), equalTo("value1"));
|
|
|
assertThat(indexMetaData.settings().get("setting2"), equalTo("value2"));
|
|
@@ -146,9 +219,24 @@ public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase {
|
|
|
assertThat(indexMetaData.aliases().get("alias1").alias(), equalTo("alias1"));
|
|
|
assertThat(indexMetaData.aliases().get("alias2").alias(), equalTo("alias2"));
|
|
|
|
|
|
- indexMetaData = parsedMetaData.index("test6");
|
|
|
+ indexMetaData = parsedMetaData.index("test9");
|
|
|
+ assertThat(indexMetaData.numberOfShards(), equalTo(1));
|
|
|
+ assertThat(indexMetaData.numberOfReplicas(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(2l));
|
|
|
+ assertThat(indexMetaData.settings().getAsMap().size(), equalTo(5));
|
|
|
+ assertThat(indexMetaData.settings().get("setting1"), equalTo("value1"));
|
|
|
+ assertThat(indexMetaData.settings().get("setting2"), equalTo("value2"));
|
|
|
+ assertThat(indexMetaData.mappings().size(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.mappings().get("mapping1").source().string(), equalTo(MAPPING_SOURCE1));
|
|
|
+ assertThat(indexMetaData.mappings().get("mapping2").source().string(), equalTo(MAPPING_SOURCE2));
|
|
|
+ assertThat(indexMetaData.aliases().size(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.aliases().get("alias1").alias(), equalTo("alias1"));
|
|
|
+ assertThat(indexMetaData.aliases().get("alias2").alias(), equalTo("alias2"));
|
|
|
+
|
|
|
+ indexMetaData = parsedMetaData.index("test10");
|
|
|
assertThat(indexMetaData.numberOfShards(), equalTo(1));
|
|
|
assertThat(indexMetaData.numberOfReplicas(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(-1l));
|
|
|
assertThat(indexMetaData.settings().getAsMap().size(), equalTo(4));
|
|
|
assertThat(indexMetaData.settings().get("setting1"), equalTo("value1"));
|
|
|
assertThat(indexMetaData.settings().get("setting2"), equalTo("value2"));
|
|
@@ -159,9 +247,10 @@ public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase {
|
|
|
assertThat(indexMetaData.aliases().get("alias1").alias(), equalTo("alias1"));
|
|
|
assertThat(indexMetaData.aliases().get("alias2").alias(), equalTo("alias2"));
|
|
|
|
|
|
- indexMetaData = parsedMetaData.index("test7");
|
|
|
+ indexMetaData = parsedMetaData.index("test11");
|
|
|
assertThat(indexMetaData.numberOfShards(), equalTo(1));
|
|
|
assertThat(indexMetaData.numberOfReplicas(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(-1l));
|
|
|
assertThat(indexMetaData.settings().getAsMap().size(), equalTo(4));
|
|
|
assertThat(indexMetaData.settings().get("setting1"), equalTo("value1"));
|
|
|
assertThat(indexMetaData.settings().get("setting2"), equalTo("value2"));
|
|
@@ -176,6 +265,24 @@ public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase {
|
|
|
assertThat(indexMetaData.aliases().get("alias4").alias(), equalTo("alias4"));
|
|
|
assertThat(indexMetaData.aliases().get("alias4").filter().string(), equalTo(ALIAS_FILTER2));
|
|
|
|
|
|
+ indexMetaData = parsedMetaData.index("test12");
|
|
|
+ assertThat(indexMetaData.numberOfShards(), equalTo(1));
|
|
|
+ assertThat(indexMetaData.numberOfReplicas(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.creationDate(), equalTo(2l));
|
|
|
+ assertThat(indexMetaData.settings().getAsMap().size(), equalTo(5));
|
|
|
+ assertThat(indexMetaData.settings().get("setting1"), equalTo("value1"));
|
|
|
+ assertThat(indexMetaData.settings().get("setting2"), equalTo("value2"));
|
|
|
+ assertThat(indexMetaData.mappings().size(), equalTo(2));
|
|
|
+ assertThat(indexMetaData.mappings().get("mapping1").source().string(), equalTo(MAPPING_SOURCE1));
|
|
|
+ assertThat(indexMetaData.mappings().get("mapping2").source().string(), equalTo(MAPPING_SOURCE2));
|
|
|
+ assertThat(indexMetaData.aliases().size(), equalTo(3));
|
|
|
+ assertThat(indexMetaData.aliases().get("alias1").alias(), equalTo("alias1"));
|
|
|
+ assertThat(indexMetaData.aliases().get("alias1").filter().string(), equalTo(ALIAS_FILTER1));
|
|
|
+ assertThat(indexMetaData.aliases().get("alias2").alias(), equalTo("alias2"));
|
|
|
+ assertThat(indexMetaData.aliases().get("alias2").filter(), nullValue());
|
|
|
+ assertThat(indexMetaData.aliases().get("alias4").alias(), equalTo("alias4"));
|
|
|
+ assertThat(indexMetaData.aliases().get("alias4").filter().string(), equalTo(ALIAS_FILTER2));
|
|
|
+
|
|
|
// templates
|
|
|
assertThat(parsedMetaData.templates().get("foo").name(), is("foo"));
|
|
|
assertThat(parsedMetaData.templates().get("foo").template(), is("bar"));
|