From c185c1339ab9165404e1d5d7a43186900d4efca4 Mon Sep 17 00:00:00 2001 From: javanna Date: Thu, 7 Jan 2016 11:30:02 +0100 Subject: [PATCH] remove grok and join usage from IngestClientIT --- .../elasticsearch/ingest/IngestClientIT.java | 59 +++++++------------ 1 file changed, 22 insertions(+), 37 deletions(-) diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java b/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java index a42635d2d79..872180be17d 100644 --- a/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java +++ b/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java @@ -19,7 +19,6 @@ package org.elasticsearch.ingest; -import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; import org.elasticsearch.action.bulk.BulkItemResponse; import org.elasticsearch.action.bulk.BulkRequest; import org.elasticsearch.action.bulk.BulkResponse; @@ -38,20 +37,17 @@ import org.elasticsearch.action.ingest.simulate.SimulatePipelineAction; import org.elasticsearch.action.ingest.simulate.SimulatePipelineRequestBuilder; import org.elasticsearch.action.ingest.simulate.SimulatePipelineResponse; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.ingest.core.ConfigurationUtils; import org.elasticsearch.ingest.core.IngestDocument; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.nullValue; @@ -81,7 +77,8 @@ public class IngestClientIT extends ESIntegTestCase { protected Settings externalClusterClientSettings() { return Settings.builder() .put(super.transportClientSettings()) - .put("node.ingest", true) + //TODO can we remove this? + .put("node.ingest", true) .build(); } @@ -115,6 +112,7 @@ public class IngestClientIT extends ESIntegTestCase { .field("_id", "id") .startObject("_source") .field("foo", "bar") + .field("fail", false) .endObject() .endObject() .endArray() @@ -128,6 +126,7 @@ public class IngestClientIT extends ESIntegTestCase { SimulateDocumentSimpleResult simulateDocumentSimpleResult = (SimulateDocumentSimpleResult) response.getResults().get(0); Map source = new HashMap<>(); source.put("foo", "bar"); + source.put("fail", false); source.put("processed", true); IngestDocument ingestDocument = new IngestDocument("index", "type", "id", null, null, null, null, source); assertThat(simulateDocumentSimpleResult.getIngestDocument().getSourceAndMetadata(), equalTo(ingestDocument.getSourceAndMetadata())); @@ -143,9 +142,7 @@ public class IngestClientIT extends ESIntegTestCase { .field("description", "my_pipeline") .startArray("processors") .startObject() - .startObject("join") - .field("field", "field1") - .field("separator", "|") + .startObject("test") .endObject() .endObject() .endArray() @@ -157,11 +154,7 @@ public class IngestClientIT extends ESIntegTestCase { bulkRequest.putHeader(ConfigurationUtils.PIPELINE_ID_PARAM, "_id"); for (int i = 0; i < numRequests; i++) { IndexRequest indexRequest = new IndexRequest("index", "type", Integer.toString(i)); - if (i % 2 == 0) { - indexRequest.source("field1", Arrays.asList("value1", "value2")); - } else { - indexRequest.source("field2", Arrays.asList("value1", "value2")); - } + indexRequest.source("field", "value", "fail", i % 2 == 0); bulkRequest.add(indexRequest); } @@ -170,12 +163,12 @@ public class IngestClientIT extends ESIntegTestCase { for (int i = 0; i < bulkRequest.requests().size(); i++) { BulkItemResponse itemResponse = response.getItems()[i]; if (i % 2 == 0) { + BulkItemResponse.Failure failure = itemResponse.getFailure(); + assertThat(failure.getMessage(), equalTo("java.lang.IllegalArgumentException: test processor failed")); + } else { IndexResponse indexResponse = itemResponse.getResponse(); assertThat(indexResponse.getId(), equalTo(Integer.toString(i))); assertThat(indexResponse.isCreated(), is(true)); - } else { - BulkItemResponse.Failure failure = itemResponse.getFailure(); - assertThat(failure.getMessage(), equalTo("java.lang.IllegalArgumentException: field [field1] not present as part of path [field1]")); } } } @@ -187,9 +180,7 @@ public class IngestClientIT extends ESIntegTestCase { .field("description", "my_pipeline") .startArray("processors") .startObject() - .startObject("grok") - .field("field", "field1") - .field("pattern", "%{NUMBER:val:float} %{NUMBER:status:int} <%{WORD:msg}>") + .startObject("test") .endObject() .endObject() .endArray() @@ -202,32 +193,21 @@ public class IngestClientIT extends ESIntegTestCase { assertThat(getResponse.pipelines().size(), equalTo(1)); assertThat(getResponse.pipelines().get(0).getId(), equalTo("_id")); - createIndex("test"); - XContentBuilder updateMappingBuilder = jsonBuilder().startObject().startObject("properties") - .startObject("status").field("type", "integer").endObject() - .startObject("val").field("type", "float").endObject() - .endObject(); - PutMappingResponse putMappingResponse = client().admin().indices() - .preparePutMapping("test").setType("type").setSource(updateMappingBuilder).get(); - assertAcked(putMappingResponse); - - client().prepareIndex("test", "type", "1").setSource("field1", "123.42 400 ") + client().prepareIndex("test", "type", "1").setSource("field", "value", "fail", false) .putHeader(ConfigurationUtils.PIPELINE_ID_PARAM, "_id") .get(); Map doc = client().prepareGet("test", "type", "1") .get().getSourceAsMap(); - assertThat(doc.get("val"), equalTo(123.42)); - assertThat(doc.get("status"), equalTo(400)); - assertThat(doc.get("msg"), equalTo("foo")); + assertThat(doc.get("field"), equalTo("value")); + assertThat(doc.get("processed"), equalTo(true)); client().prepareBulk().add( - client().prepareIndex("test", "type", "2").setSource("field1", "123.42 400 ") + client().prepareIndex("test", "type", "2").setSource("field", "value2", "fail", false) ).putHeader(ConfigurationUtils.PIPELINE_ID_PARAM, "_id").get(); doc = client().prepareGet("test", "type", "2").get().getSourceAsMap(); - assertThat(doc.get("val"), equalTo(123.42)); - assertThat(doc.get("status"), equalTo(400)); - assertThat(doc.get("msg"), equalTo("foo")); + assertThat(doc.get("field"), equalTo("value2")); + assertThat(doc.get("processed"), equalTo(true)); DeleteResponse response = new DeletePipelineRequestBuilder(client(), DeletePipelineAction.INSTANCE) .setId("_id") @@ -261,7 +241,12 @@ public class IngestClientIT extends ESIntegTestCase { public void onModule(IngestModule ingestModule) { ingestModule.addProcessor("test", (environment, templateService) -> config -> - new TestProcessor("test", ingestDocument -> ingestDocument.setFieldValue("processed", true)) + new TestProcessor("test", ingestDocument -> { + ingestDocument.setFieldValue("processed", true); + if (ingestDocument.getFieldValue("fail", Boolean.class)) { + throw new IllegalArgumentException("test processor failed"); + } + }) ); } }