ChrisSamo632 commented on code in PR #7537:
URL: https://github.com/apache/nifi/pull/7537#discussion_r1278389375
##########
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/src/main/java/org/apache/nifi/elasticsearch/IndexOperationRequest.java:
##########
@@ -71,7 +71,7 @@ public Operation getOperation() {
return operation;
}
- public Map<String, Object> getScript() {
+ public Map<String, Object> getScript() {
Review Comment:
```suggestion
public Map<String, Object> getScript() {
```
Unnecessary change
##########
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.java:
##########
@@ -0,0 +1,243 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License") you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.processors.elasticsearch;
+
+import org.apache.nifi.components.state.Scope;
+import org.apache.nifi.processors.elasticsearch.api.PaginationType;
+import org.apache.nifi.processors.elasticsearch.api.ResultOutputStrategy;
+import org.apache.nifi.state.MockStateManager;
+import org.apache.nifi.util.TestRunner;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.time.Instant;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class SearchElasticsearchTest extends
AbstractPaginatedJsonQueryElasticsearchTest {
+ private static final String MATCH_ALL_WITH_SORT_BY_MSG_WITH_SIZE_QUERY;
+
+ static {
+ try {
+ MATCH_ALL_WITH_SORT_BY_MSG_WITH_SIZE_QUERY =
Files.readString(Paths.get("src/test/resources/AbstractPaginatedJsonQueryElasticsearchTest/matchAllWithSortByMsgQueryWithSize.json"));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public AbstractPaginatedJsonQueryElasticsearch getProcessor() {
+ return new SearchElasticsearch();
+ }
+
+ public boolean isStateUsed() {
+ return true;
+ }
+
+ public boolean isInput() {
+ return false;
+ }
+
+ @Test
+ public void testScrollError() {
+ final TestRunner runner = createRunner(false);
+ final TestElasticsearchClientService service =
AbstractJsonQueryElasticsearchTest.getService(runner);
+ service.setMaxPages(2);
+ service.setThrowErrorInSearch(false);
+
runner.setProperty(AbstractPaginatedJsonQueryElasticsearch.PAGINATION_TYPE,
PaginationType.SCROLL.getValue());
+ runner.setProperty(AbstractJsonQueryElasticsearch.QUERY,
MATCH_ALL_WITH_SORT_BY_MSG_WITH_SIZE_QUERY);
+
+ // initialize search
+ runOnce(runner);
+ AbstractJsonQueryElasticsearchTest.testCounts(runner, 0, 1, 0, 0);
+ runner.clearTransferState();
+
+ // scroll (error)
+ service.setThrowErrorInSearch(true);
+ runOnce(runner);
+ AbstractJsonQueryElasticsearchTest.testCounts(runner, 0, 0, 0, 0);
+
assertTrue(runner.getLogger().getErrorMessages().stream().anyMatch(logMessage ->
+ logMessage.getMsg().contains("Could not query documents") &&
logMessage.getThrowable().getMessage().contains("Simulated IOException -
scroll")));
+ }
+
+ @Test
+ public void testScrollExpiration() throws Exception {
+ testPaginationExpiration(PaginationType.SCROLL);
+ }
+
+ @Test
+ public void testPitExpiration() throws Exception {
+ testPaginationExpiration(PaginationType.POINT_IN_TIME);
+ }
+
+ @Test
+ public void testSearchAfterExpiration() throws Exception {
+ testPaginationExpiration(PaginationType.SEARCH_AFTER);
+ }
+
+ private void testPaginationExpiration(final PaginationType paginationType)
throws Exception{
+ // test flowfile per page
+ final TestRunner runner = createRunner(false);
+ final TestElasticsearchClientService service =
AbstractJsonQueryElasticsearchTest.getService(runner);
+ service.setMaxPages(2);
+
runner.setProperty(AbstractPaginatedJsonQueryElasticsearch.PAGINATION_TYPE,
paginationType.getValue());
+
runner.setProperty(AbstractPaginatedJsonQueryElasticsearch.PAGINATION_KEEP_ALIVE,
"1 sec");
+ runner.setProperty(AbstractJsonQueryElasticsearch.QUERY,
MATCH_ALL_WITH_SORT_BY_MSG_WITH_SIZE_QUERY);
+
+ // first page
+ runOnce(runner);
+ AbstractJsonQueryElasticsearchTest.testCounts(runner, 0, 1, 0, 0);
+
runner.getFlowFilesForRelationship(AbstractJsonQueryElasticsearch.REL_HITS).get(0).assertAttributeEquals("hit.count",
"10");
+
runner.getFlowFilesForRelationship(AbstractJsonQueryElasticsearch.REL_HITS).get(0).assertAttributeEquals("page.number",
"1");
+ assertState(runner.getStateManager(), paginationType, 10, 1);
+
+ // wait for expiration
+ final Instant expiration =
Instant.ofEpochMilli(Long.parseLong(runner.getStateManager().getState(Scope.LOCAL).get(SearchElasticsearch.STATE_PAGE_EXPIRATION_TIMESTAMP)));
+ while (expiration.isAfter(Instant.now())) {
+ Thread.sleep(10);
+ }
+
+ if ("true".equalsIgnoreCase(System.getenv("CI"))) {
+ // allow extra time if running in CI Pipeline to prevent
intermittent timing-issue failures
+ Thread.sleep(1000);
+ }
+
+ service.resetPageCount();
+ runner.clearTransferState();
+
+ // first page again (new query after first query expired)
+ runOnce(runner);
+ AbstractJsonQueryElasticsearchTest.testCounts(runner, 0, 1, 0, 0);
+
runner.getFlowFilesForRelationship(AbstractJsonQueryElasticsearch.REL_HITS).get(0).assertAttributeEquals("hit.count",
"10");
+
runner.getFlowFilesForRelationship(AbstractJsonQueryElasticsearch.REL_HITS).get(0).assertAttributeEquals("page.number",
"1");
+ assertState(runner.getStateManager(), paginationType, 10, 1);
+ runner.clearTransferState();
+
+ // second page
+ runOnce(runner);
+ AbstractJsonQueryElasticsearchTest.testCounts(runner, 0, 1, 0, 0);
+
runner.getFlowFilesForRelationship(AbstractJsonQueryElasticsearch.REL_HITS).get(0).assertAttributeEquals("hit.count",
"10");
+
runner.getFlowFilesForRelationship(AbstractJsonQueryElasticsearch.REL_HITS).get(0).assertAttributeEquals("page.number",
"2");
+ assertState(runner.getStateManager(), paginationType, 20, 2);
+ runner.clearTransferState();
+ }
+
+ @Override
+ public void testPagination(final PaginationType paginationType) throws
Exception{
+ // test flowfile per page
+ final TestRunner runner = createRunner(false);
+ final TestElasticsearchClientService service =
AbstractJsonQueryElasticsearchTest.getService(runner);
+ service.setMaxPages(2);
+
runner.setProperty(AbstractPaginatedJsonQueryElasticsearch.PAGINATION_TYPE,
paginationType.getValue());
+ runner.setProperty(AbstractJsonQueryElasticsearch.QUERY,
MATCH_ALL_WITH_SORT_BY_MSG_WITH_SIZE_QUERY);
+
+ // first page
+ runOnce(runner);
+ AbstractJsonQueryElasticsearchTest.testCounts(runner, 0, 1, 0, 0);
+
runner.getFlowFilesForRelationship(AbstractJsonQueryElasticsearch.REL_HITS).get(0).assertAttributeEquals("hit.count",
"10");
+
runner.getFlowFilesForRelationship(AbstractJsonQueryElasticsearch.REL_HITS).get(0).assertAttributeEquals("page.number",
"1");
+ assertState(runner.getStateManager(), paginationType, 10, 1);
+ runner.clearTransferState();
+
+ // second page
+ runOnce(runner);
+ AbstractJsonQueryElasticsearchTest.testCounts(runner, 0, 1, 0, 0);
+
runner.getFlowFilesForRelationship(AbstractJsonQueryElasticsearch.REL_HITS).get(0).assertAttributeEquals("hit.count",
"10");
+
runner.getFlowFilesForRelationship(AbstractJsonQueryElasticsearch.REL_HITS).get(0).assertAttributeEquals("page.number",
"2");
+ assertState(runner.getStateManager(), paginationType, 20, 2);
+ runner.clearTransferState();
+
+ // third page - no hits
+ runOnce(runner);
+ AbstractJsonQueryElasticsearchTest.testCounts(runner, 0, 0, 0, 0);
+
assertTrue(runner.getStateManager().getState(Scope.LOCAL).toMap().isEmpty());
+ reset(runner);
+
+
+ // test hits splitting
+
runner.setProperty(AbstractPaginatedJsonQueryElasticsearch.SEARCH_RESULTS_SPLIT,
ResultOutputStrategy.PER_HIT.getValue());
Review Comment:
These tests could probably be refactored - but be careful to retain the
`clearTransferState` use between the "pages" where `SEARCH_RESULTS_SPLIT`
remains the same (e.g. `PER_RESPONSE` above, `PER_HIT` here, and `PER_QUERY`
later)
##########
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecordTest.java:
##########
@@ -0,0 +1,782 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License") you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.processors.elasticsearch;
+
+import org.apache.avro.Schema;
+import org.apache.nifi.avro.AvroTypeUtil;
+import org.apache.nifi.elasticsearch.IndexOperationRequest;
+import org.apache.nifi.elasticsearch.IndexOperationResponse;
+import org.apache.nifi.json.JsonRecordSetWriter;
+import org.apache.nifi.json.JsonTreeReader;
+import org.apache.nifi.processors.elasticsearch.mock.MockBulkLoadClientService;
+import org.apache.nifi.provenance.ProvenanceEventType;
+import org.apache.nifi.schema.access.SchemaAccessUtils;
+import org.apache.nifi.serialization.RecordReaderFactory;
+import org.apache.nifi.serialization.record.MockRecordParser;
+import org.apache.nifi.serialization.record.MockSchemaRegistry;
+import org.apache.nifi.serialization.record.RecordFieldType;
+import org.apache.nifi.util.MockFlowFile;
+import org.apache.nifi.util.StringUtils;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class PutElasticsearchRecordTest extends
AbstractPutElasticsearchTest<PutElasticsearchRecord> {
+ private static final int DATE_YEAR = 2020;
+ private static final int DATE_MONTH = 11;
+ private static final int DATE_DAY = 27;
+ private static final int TIME_HOUR = 12;
+ private static final int TIME_MINUTE = 55;
+ private static final int TIME_SECOND = 23;
+ private static final LocalDateTime LOCAL_DATE_TIME =
LocalDateTime.of(DATE_YEAR, DATE_MONTH, DATE_DAY, TIME_HOUR, TIME_MINUTE,
TIME_SECOND);
+ private static final LocalDate LOCAL_DATE = LocalDate.of(DATE_YEAR,
DATE_MONTH, DATE_DAY);
+ private static final LocalTime LOCAL_TIME = LocalTime.of(TIME_HOUR,
TIME_MINUTE, TIME_SECOND);
+ private static final String TEST_DIR =
"src/test/resources/PutElasticsearchRecordTest";
+ private static final String TEST_COMMON_DIR = "src/test/resources/common";
+ private static String simpleSchema;
+ private MockBulkLoadClientService clientService;
+ private MockSchemaRegistry registry;
+ private TestRunner runner;
+
+ @Override
+ public Class<? extends AbstractPutElasticsearch> getTestProcessor() {
+ return PutElasticsearchRecord.class;
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ simpleSchema = Files.readString(Paths.get(TEST_DIR,
"simpleSchema.json"));
+ }
+
+ @BeforeEach
+ public void setup() throws Exception {
+ clientService = new MockBulkLoadClientService();
+ clientService.setResponse(new IndexOperationResponse(1500));
+ registry = new MockSchemaRegistry();
+ registry.addSchema("simple", AvroTypeUtil.createSchema(new
Schema.Parser().parse(simpleSchema)));
+ RecordReaderFactory reader = new JsonTreeReader();
+ runner = TestRunners.newTestRunner(getTestProcessor());
+ runner.addControllerService("registry", registry);
+ runner.addControllerService("reader", reader);
+ runner.addControllerService("clientService", clientService);
+ runner.setProperty(reader, SchemaAccessUtils.SCHEMA_REGISTRY,
"registry");
+ runner.setProperty(reader, SchemaAccessUtils.SCHEMA_ACCESS_STRATEGY,
SchemaAccessUtils.SCHEMA_NAME_PROPERTY);
+ runner.setProperty(PutElasticsearchRecord.RECORD_READER, "reader");
+ runner.setProperty(PutElasticsearchRecord.INDEX_OP,
IndexOperationRequest.Operation.Index.getValue());
+ runner.setProperty(PutElasticsearchRecord.INDEX, "test_index");
+ runner.setProperty(PutElasticsearchRecord.TYPE, "test_type");
+ runner.setProperty(PutElasticsearchRecord.AT_TIMESTAMP,
"test_timestamp");
+ runner.setProperty(PutElasticsearchRecord.CLIENT_SERVICE,
"clientService");
+ runner.setProperty(PutElasticsearchRecord.NOT_FOUND_IS_SUCCESSFUL,
"true");
+ runner.enableControllerService(registry);
+ runner.enableControllerService(reader);
+ runner.enableControllerService(clientService);
+
+ runner.assertValid();
+ }
+
+ public void basicTest(int failure, int retry, int success) {
+ Consumer<List<IndexOperationRequest>> consumer =
(List<IndexOperationRequest> items) -> {
+ long timestampDefaultCount = items.stream().filter(item ->
"test_timestamp".equals(item.getFields().get("@timestamp"))).count();
+ long indexCount = items.stream().filter(item ->
"test_index".equals(item.getIndex())).count();
+ long typeCount = items.stream().filter(item ->
"test_type".equals(item.getType())).count();
+ long opCount = items.stream().filter(item ->
IndexOperationRequest.Operation.Index.equals(item.getOperation())).count();
+ long emptyScriptCount = items.stream().filter(item ->
item.getScript().isEmpty()).count();
+ long falseScriptedUpsertCount = items.stream().filter(item ->
!item.isScriptedUpsert()).count();
+ long emptyDynamicTemplatesCount = items.stream().filter(item ->
item.getDynamicTemplates().isEmpty()).count();
+ long emptyHeaderFields = items.stream().filter(item ->
item.getHeaderFields().isEmpty()).count();
+ assertEquals(2, timestampDefaultCount);
+ assertEquals(2, indexCount);
+ assertEquals(2, typeCount);
+ assertEquals(2, opCount);
+ assertEquals(2, emptyScriptCount);
+ assertEquals(2, falseScriptedUpsertCount);
+ assertEquals(2, emptyDynamicTemplatesCount);
+ assertEquals(2, emptyHeaderFields);
+ };
+
+ basicTest(failure, retry, success, consumer);
+ }
+
+ public void basicTest(int failure, int retry, int success,
Consumer<List<IndexOperationRequest>> consumer) {
+ clientService.setEvalConsumer(consumer);
+ basicTest(failure, retry, success,
Collections.singletonMap("schema.name", "simple"));
+ }
+
+ public void basicTest(int failure, int retry, int success, Map<String,
String> attr) {
+ try {
+ runner.enqueue(Paths.get(TEST_DIR, "flowFileContentMaps.json"),
attr);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ runner.run();
+
+ runner.assertTransferCount(PutElasticsearchRecord.REL_FAILURE,
failure);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_RETRY, retry);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_SUCCESS,
success);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_FAILED_RECORDS,
0);
+
runner.assertTransferCount(PutElasticsearchRecord.REL_SUCCESSFUL_RECORDS, 0);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_ERROR_RESPONSES,
0);
+
+ if (success > 0) {
+
runner.getFlowFilesForRelationship(PutElasticsearchRecord.REL_SUCCESS).forEach(ff
-> {
+ ff.assertAttributeEquals("elasticsearch.put.success.count",
"0");
+ ff.assertAttributeEquals("elasticsearch.put.error.count",
"0");});
+
+ assertEquals(success,
+ runner.getProvenanceEvents().stream().filter(
+ e ->
ProvenanceEventType.SEND.equals(e.getEventType()) && "1 Elasticsearch _bulk
operation batch(es) [0 error(s), 0 success(es)]".equals(e.getDetails()))
+ .count());
+ }
+ }
+
+ @Test
+ public void simpleTest() {
+ clientService.setEvalParametersConsumer((Map<String, String> params)
-> assertTrue(params.isEmpty()));
+ basicTest(0, 0, 1);
+ }
+
+ @Test
+ public void simpleTestCoercedDefaultTimestamp() {
+ Consumer<List<IndexOperationRequest>> consumer =
(List<IndexOperationRequest> items) ->
+ assertEquals(2L, items.stream().filter(item ->
Long.valueOf(100).equals(item.getFields().get("@timestamp"))).count());
+
+ runner.setProperty(PutElasticsearchRecord.AT_TIMESTAMP, "100");
+ basicTest(0, 0, 1, consumer);
+ }
+
+ @Test
+ public void simpleTestWithRequestParametersAndBulkHeaders() {
+ runner.setProperty("refresh", "true");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"routing", "/routing");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"version", "${version}");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"empty", "${empty}");
+ runner.setProperty("slices", "${slices}");
+ runner.setProperty("another", "${blank}");
+ runner.setVariable("slices", "auto");
+ runner.setVariable("blank", " ");
+ runner.setVariable("version", "/version");
+ runner.assertValid();
+
+ clientService.setEvalParametersConsumer( (Map<String, String> params)
-> {
+ assertEquals(2, params.size());
+ assertEquals("true", params.get("refresh"));
+ assertEquals("auto", params.get("slices"));
+ });
+
+ Consumer<List<IndexOperationRequest>> consumer =
(List<IndexOperationRequest> items) -> {
+ long headerFieldsCount = items.stream().filter(item ->
!item.getHeaderFields().isEmpty()).count();
+ long routingCount = items.stream().filter(item ->
"1".equals(item.getHeaderFields().get("routing"))).count();
+ long versionCount = items.stream().filter(item ->
"external".equals(item.getHeaderFields().get("version"))).count();
+ assertEquals(2, headerFieldsCount);
+ assertEquals(1, routingCount);
+ assertEquals(1, versionCount);
+ };
+
+ basicTest(0, 0, 1, consumer);
+ }
+
+ @Test
+ public void simpleTestWithRequestParametersAndBulkHeadersFlowFileEL() {
+ runner.setProperty("refresh", "true");
+ runner.setProperty("slices", "${slices}");
+ runner.setVariable("blank", " ");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"routing", "/routing");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"version", "${version}");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"empty", "${empty}");
+ runner.assertValid();
+
+ clientService.setEvalParametersConsumer((Map<String, String> params)
-> {
+ assertEquals(2, params.size());
+ assertEquals("true", params.get("refresh"));
+ assertEquals("auto", params.get("slices"));
+ });
+
+ clientService.setEvalConsumer((List<IndexOperationRequest> items) -> {
+ long headerFieldsCount = items.stream().filter(item ->
!item.getHeaderFields().isEmpty()).count();
+ long routingCount = items.stream().filter(item ->
"1".equals(item.getHeaderFields().get("routing"))).count();
+ long versionCount = items.stream().filter(item ->
"external".equals(item.getHeaderFields().get("version"))).count();
+ assertEquals(2, headerFieldsCount);
+ assertEquals(1, routingCount);
+ assertEquals(1, versionCount);
+ });
+
+ Map<String, String> attributes = new LinkedHashMap<>();
+ attributes.put("schema.name", "simple");
+ attributes.put("version", "/version");
+ attributes.put("slices", "auto");
+ attributes.put("blank", " ");
+ basicTest(0, 0, 1, attributes);
+ }
+
+ @Test
+ public void simpleTestWithMockReader() throws Exception{
+ MockRecordParser mockReader = new MockRecordParser();
+ mockReader.addSchemaField("msg", RecordFieldType.STRING);
+ mockReader.addSchemaField("from", RecordFieldType.STRING);
+ mockReader.addRecord("foo", "bar");
+ mockReader.addRecord("biz", "baz");
+
+ runner.addControllerService("mockReader", mockReader);
+ runner.setProperty(PutElasticsearchRecord.RECORD_READER, "mockReader");
+ runner.enableControllerService(mockReader);
+
+ basicTest(0, 0, 1);
+ }
+
+ @Test
+ public void testFatalError() {
+ clientService.setThrowFatalError(true);
+ basicTest(1, 0, 0);
+ }
+
+ @Test
+ public void testRetriable() {
+ clientService.setThrowRetriableError(true);
+ basicTest(0, 1, 0);
+ }
+
+ @Test
+ public void testRecordPathFeatures() throws Exception{
+ String newSchema = Files.readString(Paths.get(TEST_DIR,
"recordPathTestSchema.json"));
+ Map<String, Object> script =
+ JsonUtils.readMap(Files.readString(Paths.get(TEST_DIR,
"script.json")));
+ Map<String, Object> dynamicTemplates =
+ JsonUtils.readMap(Files.readString(Paths.get(TEST_COMMON_DIR,
"dynamicTemplates.json")));
+ clientService.setEvalConsumer((List<IndexOperationRequest> items) -> {
+ long a = items.stream().filter(item ->
"bulk_a".equals(item.getIndex())).count();
+ long b = items.stream().filter(item ->
"bulk_b".equals(item.getIndex())).count();
+ long index = items.stream().filter(item ->
IndexOperationRequest.Operation.Index.equals(item.getOperation())).count();
+ long create = items.stream().filter(item ->
IndexOperationRequest.Operation.Create.equals(item.getOperation())).count();
+ long msg = items.stream().filter(item ->
"Hello".equals(item.getFields().get("msg"))).count();
+ long empties = items.stream().filter(item ->
("".equals(item.getFields().get("msg")))).count();
+ long nulls = items.stream().filter(item -> null ==
item.getFields().get("msg")).count();
+ long timestamp = items.stream().filter(item ->
+
LOCAL_DATE_TIME.format(DateTimeFormatter.ofPattern(RecordFieldType.TIMESTAMP.getDefaultFormat())).equals(item.getFields().get("@timestamp"))).count();
+ long timestampDefault = items.stream().filter(item ->
"test_timestamp".equals(item.getFields().get("@timestamp"))).count();
+ long ts = items.stream().filter(item ->
item.getFields().get("ts") != null).count();
+ long id = items.stream().filter(item ->
item.getFields().get("id") != null).count();
+ long emptyScript = items.stream().filter(item ->
item.getScript().isEmpty()).count();
+ long falseScriptedUpsertCount = items.stream().filter(item ->
!item.isScriptedUpsert()).count();
+ long trueScriptedUpsertCount =
items.stream().filter(IndexOperationRequest::isScriptedUpsert).count();
+ long s = items.stream().filter(item ->
script.equals(item.getScript())).count();
+ long emptyDynamicTemplates = items.stream().filter(item ->
item.getDynamicTemplates().isEmpty()).count();
+ long dt = items.stream().filter(item ->
dynamicTemplates.equals(item.getDynamicTemplates())).count();
+ items.forEach(item -> {
+ assertNotNull(item.getId());
+ assertTrue(item.getId().startsWith("rec-"));
+ assertEquals("message", item.getType()); });
+
+ assertEquals(3, a);
+ assertEquals(3, b);
+ assertEquals(5, index);
+ assertEquals(1, create);
+ assertEquals(4, msg);
+ assertEquals(1, empties);
+ assertEquals(1, nulls);
+ assertEquals(1, timestamp);
+ assertEquals(5, timestampDefault);
+ assertEquals(0, ts);
+ assertEquals(0, id);
+ assertEquals(5, emptyScript);
+ assertEquals(5, falseScriptedUpsertCount);
+ assertEquals(1, trueScriptedUpsertCount);
+ assertEquals(1, s);
+ assertEquals(5, emptyDynamicTemplates);
+ assertEquals(1, dt);
+ });
+
+ registry.addSchema("recordPathTest", AvroTypeUtil.createSchema(new
Schema.Parser().parse(newSchema)));
+
+ runner.removeProperty(PutElasticsearchRecord.INDEX_OP);
+ runner.setProperty(PutElasticsearchRecord.INDEX_OP_RECORD_PATH, "/op");
+ runner.setProperty(PutElasticsearchRecord.ID_RECORD_PATH, "/id");
+ runner.setProperty(PutElasticsearchRecord.INDEX_RECORD_PATH, "/index");
+ runner.setProperty(PutElasticsearchRecord.TYPE_RECORD_PATH, "/type");
+ runner.setProperty(PutElasticsearchRecord.AT_TIMESTAMP_RECORD_PATH,
"/ts");
+ runner.setProperty(PutElasticsearchRecord.SCRIPT_RECORD_PATH,
"/script");
+ runner.setProperty(PutElasticsearchRecord.SCRIPTED_UPSERT_RECORD_PATH,
"/scripted_upsert");
+
runner.setProperty(PutElasticsearchRecord.DYNAMIC_TEMPLATES_RECORD_PATH,
"/dynamic_templates");
+ runner.enqueue(Paths.get(TEST_DIR, "1_flowFileContents.json"),
Collections.singletonMap("schema.name", "recordPathTest"));
+
+ runner.run();
+ runner.assertTransferCount(PutElasticsearchRecord.REL_SUCCESS, 1);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_FAILURE, 0);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_RETRY, 0);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_FAILED_RECORDS,
0);
+
runner.assertTransferCount(PutElasticsearchRecord.REL_SUCCESSFUL_RECORDS, 0);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_ERROR_RESPONSES,
0);
+
+ runner.clearTransferState();
Review Comment:
N.B. there are several test methods in this class (and probably others) that
should be considered for such refactoring - suggest searching for any instance
of `clearTransferState` and considering whether the test(s) should be refactored
##########
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractPaginatedJsonQueryElasticsearchTest.java:
##########
@@ -0,0 +1,350 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License") you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.processors.elasticsearch;
+
+import org.apache.nifi.processors.elasticsearch.api.AggregationResultsFormat;
+import org.apache.nifi.processors.elasticsearch.api.PaginationType;
+import org.apache.nifi.processors.elasticsearch.api.ResultOutputStrategy;
+import org.apache.nifi.processors.elasticsearch.api.SearchResultsFormat;
+import org.apache.nifi.provenance.ProvenanceEventType;
+import org.apache.nifi.util.MockFlowFile;
+import org.apache.nifi.util.TestRunner;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public abstract class AbstractPaginatedJsonQueryElasticsearchTest extends
AbstractJsonQueryElasticsearchTest<AbstractPaginatedJsonQueryElasticsearch> {
+ private static final String TEST_DIR =
"src/test/resources/AbstractPaginatedJsonQueryElasticsearchTest";
+ private static final String MATCH_ALL;
Review Comment:
```suggestion
private static final String MATCH_ALL;
```
##########
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/AbstractPaginatedJsonQueryElasticsearchTest.java:
##########
@@ -0,0 +1,350 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License") you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.processors.elasticsearch;
+
+import org.apache.nifi.processors.elasticsearch.api.AggregationResultsFormat;
+import org.apache.nifi.processors.elasticsearch.api.PaginationType;
+import org.apache.nifi.processors.elasticsearch.api.ResultOutputStrategy;
+import org.apache.nifi.processors.elasticsearch.api.SearchResultsFormat;
+import org.apache.nifi.provenance.ProvenanceEventType;
+import org.apache.nifi.util.MockFlowFile;
+import org.apache.nifi.util.TestRunner;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public abstract class AbstractPaginatedJsonQueryElasticsearchTest extends
AbstractJsonQueryElasticsearchTest<AbstractPaginatedJsonQueryElasticsearch> {
+ private static final String TEST_DIR =
"src/test/resources/AbstractPaginatedJsonQueryElasticsearchTest";
+ private static final String MATCH_ALL;
+ private static final String MATCH_ALL_WITH_SORT_BY_MESSAGE;
+ private static final String MATCH_ALL_WITH_SORT_BY_MSG;
+
+ static {
+ try {
+ MATCH_ALL =
Files.readString(Paths.get("src/test/resources/common/matchAllQuery.json"));
+ MATCH_ALL_WITH_SORT_BY_MESSAGE =
Files.readString(Paths.get(TEST_DIR, "matchAllWithSortByMessageQuery.json"));
+ MATCH_ALL_WITH_SORT_BY_MSG =
Files.readString(Paths.get(TEST_DIR,"matchAllWithSortByMsgQueryWithoutSize.json"));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
Review Comment:
Probably better to put these into a `@BeforeAll` method like they're loaded
elsewhere, simply call the parent's `super.setUpBeforeClass()` to load common
files too
##########
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecordTest.java:
##########
@@ -0,0 +1,782 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License") you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.processors.elasticsearch;
+
+import org.apache.avro.Schema;
+import org.apache.nifi.avro.AvroTypeUtil;
+import org.apache.nifi.elasticsearch.IndexOperationRequest;
+import org.apache.nifi.elasticsearch.IndexOperationResponse;
+import org.apache.nifi.json.JsonRecordSetWriter;
+import org.apache.nifi.json.JsonTreeReader;
+import org.apache.nifi.processors.elasticsearch.mock.MockBulkLoadClientService;
+import org.apache.nifi.provenance.ProvenanceEventType;
+import org.apache.nifi.schema.access.SchemaAccessUtils;
+import org.apache.nifi.serialization.RecordReaderFactory;
+import org.apache.nifi.serialization.record.MockRecordParser;
+import org.apache.nifi.serialization.record.MockSchemaRegistry;
+import org.apache.nifi.serialization.record.RecordFieldType;
+import org.apache.nifi.util.MockFlowFile;
+import org.apache.nifi.util.StringUtils;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class PutElasticsearchRecordTest extends
AbstractPutElasticsearchTest<PutElasticsearchRecord> {
+ private static final int DATE_YEAR = 2020;
+ private static final int DATE_MONTH = 11;
+ private static final int DATE_DAY = 27;
+ private static final int TIME_HOUR = 12;
+ private static final int TIME_MINUTE = 55;
+ private static final int TIME_SECOND = 23;
+ private static final LocalDateTime LOCAL_DATE_TIME =
LocalDateTime.of(DATE_YEAR, DATE_MONTH, DATE_DAY, TIME_HOUR, TIME_MINUTE,
TIME_SECOND);
+ private static final LocalDate LOCAL_DATE = LocalDate.of(DATE_YEAR,
DATE_MONTH, DATE_DAY);
+ private static final LocalTime LOCAL_TIME = LocalTime.of(TIME_HOUR,
TIME_MINUTE, TIME_SECOND);
+ private static final String TEST_DIR =
"src/test/resources/PutElasticsearchRecordTest";
+ private static final String TEST_COMMON_DIR = "src/test/resources/common";
+ private static String simpleSchema;
+ private MockBulkLoadClientService clientService;
+ private MockSchemaRegistry registry;
+ private TestRunner runner;
+
+ @Override
+ public Class<? extends AbstractPutElasticsearch> getTestProcessor() {
+ return PutElasticsearchRecord.class;
+ }
+
+ @BeforeAll
+ public static void setUpBeforeClass() throws Exception {
+ simpleSchema = Files.readString(Paths.get(TEST_DIR,
"simpleSchema.json"));
+ }
+
+ @BeforeEach
+ public void setup() throws Exception {
+ clientService = new MockBulkLoadClientService();
+ clientService.setResponse(new IndexOperationResponse(1500));
+ registry = new MockSchemaRegistry();
+ registry.addSchema("simple", AvroTypeUtil.createSchema(new
Schema.Parser().parse(simpleSchema)));
+ RecordReaderFactory reader = new JsonTreeReader();
+ runner = TestRunners.newTestRunner(getTestProcessor());
+ runner.addControllerService("registry", registry);
+ runner.addControllerService("reader", reader);
+ runner.addControllerService("clientService", clientService);
+ runner.setProperty(reader, SchemaAccessUtils.SCHEMA_REGISTRY,
"registry");
+ runner.setProperty(reader, SchemaAccessUtils.SCHEMA_ACCESS_STRATEGY,
SchemaAccessUtils.SCHEMA_NAME_PROPERTY);
+ runner.setProperty(PutElasticsearchRecord.RECORD_READER, "reader");
+ runner.setProperty(PutElasticsearchRecord.INDEX_OP,
IndexOperationRequest.Operation.Index.getValue());
+ runner.setProperty(PutElasticsearchRecord.INDEX, "test_index");
+ runner.setProperty(PutElasticsearchRecord.TYPE, "test_type");
+ runner.setProperty(PutElasticsearchRecord.AT_TIMESTAMP,
"test_timestamp");
+ runner.setProperty(PutElasticsearchRecord.CLIENT_SERVICE,
"clientService");
+ runner.setProperty(PutElasticsearchRecord.NOT_FOUND_IS_SUCCESSFUL,
"true");
+ runner.enableControllerService(registry);
+ runner.enableControllerService(reader);
+ runner.enableControllerService(clientService);
+
+ runner.assertValid();
+ }
+
+ public void basicTest(int failure, int retry, int success) {
+ Consumer<List<IndexOperationRequest>> consumer =
(List<IndexOperationRequest> items) -> {
+ long timestampDefaultCount = items.stream().filter(item ->
"test_timestamp".equals(item.getFields().get("@timestamp"))).count();
+ long indexCount = items.stream().filter(item ->
"test_index".equals(item.getIndex())).count();
+ long typeCount = items.stream().filter(item ->
"test_type".equals(item.getType())).count();
+ long opCount = items.stream().filter(item ->
IndexOperationRequest.Operation.Index.equals(item.getOperation())).count();
+ long emptyScriptCount = items.stream().filter(item ->
item.getScript().isEmpty()).count();
+ long falseScriptedUpsertCount = items.stream().filter(item ->
!item.isScriptedUpsert()).count();
+ long emptyDynamicTemplatesCount = items.stream().filter(item ->
item.getDynamicTemplates().isEmpty()).count();
+ long emptyHeaderFields = items.stream().filter(item ->
item.getHeaderFields().isEmpty()).count();
+ assertEquals(2, timestampDefaultCount);
+ assertEquals(2, indexCount);
+ assertEquals(2, typeCount);
+ assertEquals(2, opCount);
+ assertEquals(2, emptyScriptCount);
+ assertEquals(2, falseScriptedUpsertCount);
+ assertEquals(2, emptyDynamicTemplatesCount);
+ assertEquals(2, emptyHeaderFields);
+ };
+
+ basicTest(failure, retry, success, consumer);
+ }
+
+ public void basicTest(int failure, int retry, int success,
Consumer<List<IndexOperationRequest>> consumer) {
+ clientService.setEvalConsumer(consumer);
+ basicTest(failure, retry, success,
Collections.singletonMap("schema.name", "simple"));
+ }
+
+ public void basicTest(int failure, int retry, int success, Map<String,
String> attr) {
+ try {
+ runner.enqueue(Paths.get(TEST_DIR, "flowFileContentMaps.json"),
attr);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ runner.run();
+
+ runner.assertTransferCount(PutElasticsearchRecord.REL_FAILURE,
failure);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_RETRY, retry);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_SUCCESS,
success);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_FAILED_RECORDS,
0);
+
runner.assertTransferCount(PutElasticsearchRecord.REL_SUCCESSFUL_RECORDS, 0);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_ERROR_RESPONSES,
0);
+
+ if (success > 0) {
+
runner.getFlowFilesForRelationship(PutElasticsearchRecord.REL_SUCCESS).forEach(ff
-> {
+ ff.assertAttributeEquals("elasticsearch.put.success.count",
"0");
+ ff.assertAttributeEquals("elasticsearch.put.error.count",
"0");});
+
+ assertEquals(success,
+ runner.getProvenanceEvents().stream().filter(
+ e ->
ProvenanceEventType.SEND.equals(e.getEventType()) && "1 Elasticsearch _bulk
operation batch(es) [0 error(s), 0 success(es)]".equals(e.getDetails()))
+ .count());
+ }
+ }
+
+ @Test
+ public void simpleTest() {
+ clientService.setEvalParametersConsumer((Map<String, String> params)
-> assertTrue(params.isEmpty()));
+ basicTest(0, 0, 1);
+ }
+
+ @Test
+ public void simpleTestCoercedDefaultTimestamp() {
+ Consumer<List<IndexOperationRequest>> consumer =
(List<IndexOperationRequest> items) ->
+ assertEquals(2L, items.stream().filter(item ->
Long.valueOf(100).equals(item.getFields().get("@timestamp"))).count());
+
+ runner.setProperty(PutElasticsearchRecord.AT_TIMESTAMP, "100");
+ basicTest(0, 0, 1, consumer);
+ }
+
+ @Test
+ public void simpleTestWithRequestParametersAndBulkHeaders() {
+ runner.setProperty("refresh", "true");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"routing", "/routing");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"version", "${version}");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"empty", "${empty}");
+ runner.setProperty("slices", "${slices}");
+ runner.setProperty("another", "${blank}");
+ runner.setVariable("slices", "auto");
+ runner.setVariable("blank", " ");
+ runner.setVariable("version", "/version");
+ runner.assertValid();
+
+ clientService.setEvalParametersConsumer( (Map<String, String> params)
-> {
+ assertEquals(2, params.size());
+ assertEquals("true", params.get("refresh"));
+ assertEquals("auto", params.get("slices"));
+ });
+
+ Consumer<List<IndexOperationRequest>> consumer =
(List<IndexOperationRequest> items) -> {
+ long headerFieldsCount = items.stream().filter(item ->
!item.getHeaderFields().isEmpty()).count();
+ long routingCount = items.stream().filter(item ->
"1".equals(item.getHeaderFields().get("routing"))).count();
+ long versionCount = items.stream().filter(item ->
"external".equals(item.getHeaderFields().get("version"))).count();
+ assertEquals(2, headerFieldsCount);
+ assertEquals(1, routingCount);
+ assertEquals(1, versionCount);
+ };
+
+ basicTest(0, 0, 1, consumer);
+ }
+
+ @Test
+ public void simpleTestWithRequestParametersAndBulkHeadersFlowFileEL() {
+ runner.setProperty("refresh", "true");
+ runner.setProperty("slices", "${slices}");
+ runner.setVariable("blank", " ");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"routing", "/routing");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"version", "${version}");
+ runner.setProperty(AbstractPutElasticsearch.BULK_HEADER_PREFIX +
"empty", "${empty}");
+ runner.assertValid();
+
+ clientService.setEvalParametersConsumer((Map<String, String> params)
-> {
+ assertEquals(2, params.size());
+ assertEquals("true", params.get("refresh"));
+ assertEquals("auto", params.get("slices"));
+ });
+
+ clientService.setEvalConsumer((List<IndexOperationRequest> items) -> {
+ long headerFieldsCount = items.stream().filter(item ->
!item.getHeaderFields().isEmpty()).count();
+ long routingCount = items.stream().filter(item ->
"1".equals(item.getHeaderFields().get("routing"))).count();
+ long versionCount = items.stream().filter(item ->
"external".equals(item.getHeaderFields().get("version"))).count();
+ assertEquals(2, headerFieldsCount);
+ assertEquals(1, routingCount);
+ assertEquals(1, versionCount);
+ });
+
+ Map<String, String> attributes = new LinkedHashMap<>();
+ attributes.put("schema.name", "simple");
+ attributes.put("version", "/version");
+ attributes.put("slices", "auto");
+ attributes.put("blank", " ");
+ basicTest(0, 0, 1, attributes);
+ }
+
+ @Test
+ public void simpleTestWithMockReader() throws Exception{
+ MockRecordParser mockReader = new MockRecordParser();
+ mockReader.addSchemaField("msg", RecordFieldType.STRING);
+ mockReader.addSchemaField("from", RecordFieldType.STRING);
+ mockReader.addRecord("foo", "bar");
+ mockReader.addRecord("biz", "baz");
+
+ runner.addControllerService("mockReader", mockReader);
+ runner.setProperty(PutElasticsearchRecord.RECORD_READER, "mockReader");
+ runner.enableControllerService(mockReader);
+
+ basicTest(0, 0, 1);
+ }
+
+ @Test
+ public void testFatalError() {
+ clientService.setThrowFatalError(true);
+ basicTest(1, 0, 0);
+ }
+
+ @Test
+ public void testRetriable() {
+ clientService.setThrowRetriableError(true);
+ basicTest(0, 1, 0);
+ }
+
+ @Test
+ public void testRecordPathFeatures() throws Exception{
+ String newSchema = Files.readString(Paths.get(TEST_DIR,
"recordPathTestSchema.json"));
+ Map<String, Object> script =
+ JsonUtils.readMap(Files.readString(Paths.get(TEST_DIR,
"script.json")));
+ Map<String, Object> dynamicTemplates =
+ JsonUtils.readMap(Files.readString(Paths.get(TEST_COMMON_DIR,
"dynamicTemplates.json")));
+ clientService.setEvalConsumer((List<IndexOperationRequest> items) -> {
+ long a = items.stream().filter(item ->
"bulk_a".equals(item.getIndex())).count();
+ long b = items.stream().filter(item ->
"bulk_b".equals(item.getIndex())).count();
+ long index = items.stream().filter(item ->
IndexOperationRequest.Operation.Index.equals(item.getOperation())).count();
+ long create = items.stream().filter(item ->
IndexOperationRequest.Operation.Create.equals(item.getOperation())).count();
+ long msg = items.stream().filter(item ->
"Hello".equals(item.getFields().get("msg"))).count();
+ long empties = items.stream().filter(item ->
("".equals(item.getFields().get("msg")))).count();
+ long nulls = items.stream().filter(item -> null ==
item.getFields().get("msg")).count();
+ long timestamp = items.stream().filter(item ->
+
LOCAL_DATE_TIME.format(DateTimeFormatter.ofPattern(RecordFieldType.TIMESTAMP.getDefaultFormat())).equals(item.getFields().get("@timestamp"))).count();
+ long timestampDefault = items.stream().filter(item ->
"test_timestamp".equals(item.getFields().get("@timestamp"))).count();
+ long ts = items.stream().filter(item ->
item.getFields().get("ts") != null).count();
+ long id = items.stream().filter(item ->
item.getFields().get("id") != null).count();
+ long emptyScript = items.stream().filter(item ->
item.getScript().isEmpty()).count();
+ long falseScriptedUpsertCount = items.stream().filter(item ->
!item.isScriptedUpsert()).count();
+ long trueScriptedUpsertCount =
items.stream().filter(IndexOperationRequest::isScriptedUpsert).count();
+ long s = items.stream().filter(item ->
script.equals(item.getScript())).count();
+ long emptyDynamicTemplates = items.stream().filter(item ->
item.getDynamicTemplates().isEmpty()).count();
+ long dt = items.stream().filter(item ->
dynamicTemplates.equals(item.getDynamicTemplates())).count();
+ items.forEach(item -> {
+ assertNotNull(item.getId());
+ assertTrue(item.getId().startsWith("rec-"));
+ assertEquals("message", item.getType()); });
+
+ assertEquals(3, a);
+ assertEquals(3, b);
+ assertEquals(5, index);
+ assertEquals(1, create);
+ assertEquals(4, msg);
+ assertEquals(1, empties);
+ assertEquals(1, nulls);
+ assertEquals(1, timestamp);
+ assertEquals(5, timestampDefault);
+ assertEquals(0, ts);
+ assertEquals(0, id);
+ assertEquals(5, emptyScript);
+ assertEquals(5, falseScriptedUpsertCount);
+ assertEquals(1, trueScriptedUpsertCount);
+ assertEquals(1, s);
+ assertEquals(5, emptyDynamicTemplates);
+ assertEquals(1, dt);
+ });
+
+ registry.addSchema("recordPathTest", AvroTypeUtil.createSchema(new
Schema.Parser().parse(newSchema)));
+
+ runner.removeProperty(PutElasticsearchRecord.INDEX_OP);
+ runner.setProperty(PutElasticsearchRecord.INDEX_OP_RECORD_PATH, "/op");
+ runner.setProperty(PutElasticsearchRecord.ID_RECORD_PATH, "/id");
+ runner.setProperty(PutElasticsearchRecord.INDEX_RECORD_PATH, "/index");
+ runner.setProperty(PutElasticsearchRecord.TYPE_RECORD_PATH, "/type");
+ runner.setProperty(PutElasticsearchRecord.AT_TIMESTAMP_RECORD_PATH,
"/ts");
+ runner.setProperty(PutElasticsearchRecord.SCRIPT_RECORD_PATH,
"/script");
+ runner.setProperty(PutElasticsearchRecord.SCRIPTED_UPSERT_RECORD_PATH,
"/scripted_upsert");
+
runner.setProperty(PutElasticsearchRecord.DYNAMIC_TEMPLATES_RECORD_PATH,
"/dynamic_templates");
+ runner.enqueue(Paths.get(TEST_DIR, "1_flowFileContents.json"),
Collections.singletonMap("schema.name", "recordPathTest"));
+
+ runner.run();
+ runner.assertTransferCount(PutElasticsearchRecord.REL_SUCCESS, 1);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_FAILURE, 0);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_RETRY, 0);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_FAILED_RECORDS,
0);
+
runner.assertTransferCount(PutElasticsearchRecord.REL_SUCCESSFUL_RECORDS, 0);
+ runner.assertTransferCount(PutElasticsearchRecord.REL_ERROR_RESPONSES,
0);
+
+ runner.clearTransferState();
Review Comment:
It's probably worth taking this opportunity to split up these tests rather
than keeping the really large `Test` scenarios that run the processor multiple
times, with transfer state clearning in between - it would be easit to
understand where failures are happening if we had everything in separate tests
Hopefully most of these can use a common `private` method that does the
common setup/assertions, and simply set the test-specific properties/assertion
logic
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
