honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-08 22:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ingest: date processor should not fail if timestamp is specified as json number

Browse Source 
Closes #26967
This commit is contained in:
Martijn van Groningen 2017-10-12 15:04:48 +02:00
parent 35984a616e
commit 141d1b62e9
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/DateIndexNameProcessor.java
View File

@ -63,7 +63,12 @@ public final class DateIndexNameProcessor extends AbstractProcessor {
@Override @Override
public void execute(IngestDocument ingestDocument) throws Exception { public void execute(IngestDocument ingestDocument) throws Exception {
// Date can be specified as a string or long: // Date can be specified as a string or long:
String date = Objects.toString(ingestDocument.getFieldValue(field, Object.class)); Object obj = ingestDocument.getFieldValue(field, Object.class);
String date = null;
if (obj != null) {
// Not use Objects.toString(...) here, because null gets changed to "null" which may confuse some date parsers
date = obj.toString();
}
DateTime dateTime = null; DateTime dateTime = null;
Exception lastException = null; Exception lastException = null;

9
modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/DateProcessor.java
View File

@ -30,10 +30,10 @@ import org.joda.time.DateTimeZone;
import org.joda.time.format.ISODateTimeFormat; import org.joda.time.format.ISODateTimeFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.IllformedLocaleException;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.function.Function; import java.util.function.Function;
public final class DateProcessor extends AbstractProcessor { public final class DateProcessor extends AbstractProcessor {
@ -64,7 +64,12 @@ public final class DateProcessor extends AbstractProcessor {
@Override @Override
public void execute(IngestDocument ingestDocument) { public void execute(IngestDocument ingestDocument) {
String value = ingestDocument.getFieldValue(field, String.class); Object obj = ingestDocument.getFieldValue(field, Object.class);
String value = null;
if (obj != null) {
// Not use Objects.toString(...) here, because null gets changed to "null" which may confuse some date parsers
value = obj.toString();
}
DateTime dateTime = null; DateTime dateTime = null;
Exception lastException = null; Exception lastException = null;

6
modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorTests.java
View File

@ -134,6 +134,12 @@ public class DateProcessorTests extends ESTestCase {
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document); IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document);
dateProcessor.execute(ingestDocument); dateProcessor.execute(ingestDocument);
assertThat(ingestDocument.getFieldValue("date_as_date", String.class), equalTo("1970-01-01T00:16:40.500Z")); assertThat(ingestDocument.getFieldValue("date_as_date", String.class), equalTo("1970-01-01T00:16:40.500Z"));
document = new HashMap<>();
document.put("date_as_string", 1000500L);
ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document);
dateProcessor.execute(ingestDocument);
assertThat(ingestDocument.getFieldValue("date_as_date", String.class), equalTo("1970-01-01T00:16:40.500Z"));
} }
public void testUnix() { public void testUnix() {