github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ML] Don't quote numbers when importing CSV in file data viz (#39579)

Browse source 
Invokes Papa Parse's dynamic type functionality for CSV columns
where the ES mapping determined by ES's find_file_structure
endpoint was boolean or numeric. This results in JSON documents
that don't unncessarily quote true/false and numbers.

Fixes #39242
This commit is contained in:
David Roberts 2019-06-26 09:07:39 +01:00 • committed by GitHub
parent 484351bdac
commit a63c35bde1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

31
x-pack/legacy/plugins/ml/public/file_datavisualizer/components/import_view/importer/csv_importer.js
View file

@ -5,6 +5,7 @@
*/ */
import { ES_FIELD_TYPES } from '../../../../../common/constants/field_types';
import { Importer } from './importer'; import { Importer } from './importer';
import Papa from 'papaparse'; import Papa from 'papaparse';
@ -18,17 +19,20 @@ export class CsvImporter extends Importer {
this.hasHeaderRow = results.has_header_row; this.hasHeaderRow = results.has_header_row;
this.columnNames = results.column_names; this.columnNames = results.column_names;
this.shouldTrimFields = (results.should_trim_fields || false); this.shouldTrimFields = (results.should_trim_fields || false);
this.mappings = results.mappings;
} }
async read(csv) { async read(csv) {
try { try {
const transform = this.shouldTrimFields ? (f => f.trim()) : (f => f); const transform = this.shouldTrimFields ? (f => f.trim()) : (f => f);
const dynamicTyping = (c => shouldUseDynamicType(this.columnNames, this.mappings, c));
const config = { const config = {
header: false, header: false,
skipEmptyLines: 'greedy', skipEmptyLines: 'greedy',
delimiter: this.delimiter, delimiter: this.delimiter,
quoteChar: this.quote, quoteChar: this.quote,
transform, transform,
dynamicTyping,
}; };
const parserOutput = Papa.parse(csv, config); const parserOutput = Papa.parse(csv, config);
@ -58,13 +62,38 @@ export class CsvImporter extends Importer {
} }
} }
// parse numeric and boolean fields - treat everything else as a string
function shouldUseDynamicType(columnNames, mappings, columnNumber) {
if (columnNumber >= columnNames.length) {
return false;
}
const columnMapping = mappings[columnNames[columnNumber]];
if (columnMapping === undefined || columnMapping.type === undefined) {
return false;
}
switch (columnMapping.type) {
case ES_FIELD_TYPES.BOOLEAN:
case ES_FIELD_TYPES.LONG:
case ES_FIELD_TYPES.INTEGER:
case ES_FIELD_TYPES.SHORT:
case ES_FIELD_TYPES.BYTE:
case ES_FIELD_TYPES.DOUBLE:
case ES_FIELD_TYPES.FLOAT:
case ES_FIELD_TYPES.HALF_FLOAT:
case ES_FIELD_TYPES.SCALED_FLOAT:
return true;
default:
return false;
}
}
function formatToJson(data, columnNames) { function formatToJson(data, columnNames) {
const docArray = []; const docArray = [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
const line = {}; const line = {};
for (let c = 0; c < columnNames.length; c++) { for (let c = 0; c < columnNames.length; c++) {
const col = columnNames[c]; const col = columnNames[c];
if (data[i][c] !== undefined && data[i][c] !== '') { if (data[i][c] !== null && data[i][c] !== '') {
line[col] = data[i][c]; line[col] = data[i][c];
} }
} }