Repository: metamodel Updated Branches: refs/heads/master f6f1808fd -> 8383dede2
Bugfix for MM-120 & MM-121. Fixes #9 Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/8383dede Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/8383dede Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/8383dede Branch: refs/heads/master Commit: 8383dede26b950fccccc8954ad478d948dd4a20d Parents: f6f1808 Author: Alberto Rodriguez <[email protected]> Authored: Wed Mar 18 08:32:30 2015 +0100 Committer: Alberto Rodriguez <[email protected]> Committed: Wed Mar 18 08:32:30 2015 +0100 ---------------------------------------------------------------------- .../elasticsearch/ElasticSearchMetaDataParser.java | 4 +++- .../ElasticSearchMetaDataParserTest.java | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/8383dede/elasticsearch/src/main/java/org/apache/metamodel/elasticsearch/ElasticSearchMetaDataParser.java ---------------------------------------------------------------------- diff --git a/elasticsearch/src/main/java/org/apache/metamodel/elasticsearch/ElasticSearchMetaDataParser.java b/elasticsearch/src/main/java/org/apache/metamodel/elasticsearch/ElasticSearchMetaDataParser.java index 760435d..fdab722 100644 --- a/elasticsearch/src/main/java/org/apache/metamodel/elasticsearch/ElasticSearchMetaDataParser.java +++ b/elasticsearch/src/main/java/org/apache/metamodel/elasticsearch/ElasticSearchMetaDataParser.java @@ -81,7 +81,9 @@ public class ElasticSearchMetaDataParser { } else if (metaDataFieldType.equals("float")) { columnType = ColumnType.FLOAT; } else if (metaDataFieldType.equals("boolean")) { - columnType = ColumnType.FLOAT; + columnType = ColumnType.BOOLEAN; + } else if (metaDataFieldType.equals("double")) { + columnType = ColumnType.DOUBLE; } else { columnType = ColumnType.STRING; } http://git-wip-us.apache.org/repos/asf/metamodel/blob/8383dede/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchMetaDataParserTest.java ---------------------------------------------------------------------- diff --git a/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchMetaDataParserTest.java b/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchMetaDataParserTest.java index f8e6430..48a1f06 100644 --- a/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchMetaDataParserTest.java +++ b/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchMetaDataParserTest.java @@ -24,23 +24,32 @@ import org.apache.metamodel.schema.ColumnType; public class ElasticSearchMetaDataParserTest extends TestCase { public void testParseMetadataInfo() throws Exception { - String metaDataInfo = "{message={type=long}, postDate={type=date, format=dateOptionalTime}, anotherDate={type=date, format=dateOptionalTime}, user={type=string}}"; + String metaDataInfo = "{message={type=long}, " + + "postDate={type=date, format=dateOptionalTime}, " + + "anotherDate={type=date, format=dateOptionalTime}, " + + "user={type=string}, " + + "critical={type=boolean}, " + + "income={type=double}}"; ElasticSearchMetaData metaData = ElasticSearchMetaDataParser.parse(metaDataInfo); String[] columnNames = metaData.getColumnNames(); ColumnType[] columnTypes = metaData.getColumnTypes(); - assertTrue(columnNames.length==5); + assertTrue(columnNames.length == 7); assertEquals(columnNames[0], "_id"); assertEquals(columnNames[1], "message"); assertEquals(columnNames[2], "postDate"); assertEquals(columnNames[3], "anotherDate"); assertEquals(columnNames[4], "user"); - assertTrue(columnTypes.length == 5); + assertEquals(columnNames[5], "critical"); + assertEquals(columnNames[6], "income"); + assertTrue(columnTypes.length == 7); assertEquals(columnTypes[0], ColumnType.STRING); assertEquals(columnTypes[1], ColumnType.BIGINT); assertEquals(columnTypes[2], ColumnType.DATE); assertEquals(columnTypes[3], ColumnType.DATE); assertEquals(columnTypes[4], ColumnType.STRING); + assertEquals(columnTypes[5], ColumnType.BOOLEAN); + assertEquals(columnTypes[6], ColumnType.DOUBLE); } }
