From c36bcb4dd0d042ea328d8d919cb505864b50e2a1 Mon Sep 17 00:00:00 2001 From: Benjamin Trent Date: Thu, 30 Apr 2020 10:51:32 -0400 Subject: [PATCH] [ML] fixing file structure finder multiline merge max for delimited formats (#56023) (#56035) This commit correctly sets the maxLinesPerRow in the CsvPreference for delimited files given the file structure finder settings. Previously, it was silently ignored. --- .../DelimitedFileStructureFinderFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/filestructurefinder/DelimitedFileStructureFinderFactory.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/filestructurefinder/DelimitedFileStructureFinderFactory.java index e413bde60c3..fc316dd283f 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/filestructurefinder/DelimitedFileStructureFinderFactory.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/filestructurefinder/DelimitedFileStructureFinderFactory.java @@ -71,7 +71,8 @@ public class DelimitedFileStructureFinderFactory implements FileStructureFinderF public FileStructureFinder createFromSample(List explanation, String sample, String charsetName, Boolean hasByteOrderMarker, int lineMergeSizeLimit, FileStructureOverrides overrides, TimeoutChecker timeoutChecker) throws IOException { + CsvPreference adjustedCsvPreference = new CsvPreference.Builder(csvPreference).maxLinesPerRow(lineMergeSizeLimit).build(); return DelimitedFileStructureFinder.makeDelimitedFileStructureFinder(explanation, sample, charsetName, hasByteOrderMarker, - csvPreference, trimFields, overrides, timeoutChecker); + adjustedCsvPreference, trimFields, overrides, timeoutChecker); } }