Repository: kylin Updated Branches: refs/heads/master 206789289 -> c1f5ed88c
minor, add a simple DataTypeTest Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c1f5ed88 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c1f5ed88 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c1f5ed88 Branch: refs/heads/master Commit: c1f5ed88c9f24220a1b75891b7801a7d69dbfd69 Parents: 2067892 Author: Li Yang <liy...@apache.org> Authored: Sun Oct 29 08:24:39 2017 +0800 Committer: Li Yang <liy...@apache.org> Committed: Sun Oct 29 08:24:39 2017 +0800 ---------------------------------------------------------------------- .../metadata/datatype/BigDecimalSerializer.java | 3 +- .../metadata/datatype/BooleanSerializer.java | 5 +- .../metadata/datatype/DataTypeSerializer.java | 8 +-- .../metadata/datatype/DateTimeSerializer.java | 5 +- .../metadata/datatype/DoubleSerializer.java | 1 + .../kylin/metadata/datatype/Int4Serializer.java | 5 +- .../metadata/datatype/Long8Serializer.java | 5 +- .../kylin/metadata/datatype/LongSerializer.java | 5 +- .../metadata/datatype/StringSerializer.java | 1 + .../kylin/metadata/datatype/DataTypeTest.java | 51 ++++++++++++++++++++ 10 files changed, 74 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/c1f5ed88/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BigDecimalSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BigDecimalSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BigDecimalSerializer.java index b5043f5..ba1c4ff 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BigDecimalSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BigDecimalSerializer.java @@ -27,9 +27,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author yangli9 - * */ +@SuppressWarnings("serial") public class BigDecimalSerializer extends DataTypeSerializer<BigDecimal> { private static final Logger logger = LoggerFactory.getLogger(BigDecimalSerializer.class); http://git-wip-us.apache.org/repos/asf/kylin/blob/c1f5ed88/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java index 3d485d2..bcbbe49 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java @@ -18,11 +18,12 @@ package org.apache.kylin.metadata.datatype; +import java.nio.ByteBuffer; + import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.BooleanUtils; -import java.nio.ByteBuffer; - +@SuppressWarnings("serial") public class BooleanSerializer extends DataTypeSerializer<Long> { public final static String[] TRUE_VALUE_SET = { "true", "t", "on", "yes" }; http://git-wip-us.apache.org/repos/asf/kylin/blob/c1f5ed88/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataTypeSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataTypeSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataTypeSerializer.java index 2de38c0..daa03c1 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataTypeSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DataTypeSerializer.java @@ -18,17 +18,19 @@ package org.apache.kylin.metadata.datatype; -import com.google.common.collect.Maps; -import org.apache.kylin.common.util.BytesSerializer; - import java.io.IOException; import java.io.ObjectInputStream; import java.nio.ByteBuffer; import java.util.Map; +import org.apache.kylin.common.util.BytesSerializer; + +import com.google.common.collect.Maps; + /** * Note: the implementations MUST be thread-safe. */ +@SuppressWarnings("serial") abstract public class DataTypeSerializer<T> implements BytesSerializer<T>, java.io.Serializable { final static Map<String, Class<?>> implementations = Maps.newHashMap(); http://git-wip-us.apache.org/repos/asf/kylin/blob/c1f5ed88/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DateTimeSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DateTimeSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DateTimeSerializer.java index 5101766..c1ae3ee 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DateTimeSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DateTimeSerializer.java @@ -18,10 +18,11 @@ package org.apache.kylin.metadata.datatype; -import org.apache.kylin.common.util.DateFormat; - import java.nio.ByteBuffer; +import org.apache.kylin.common.util.DateFormat; + +@SuppressWarnings("serial") public class DateTimeSerializer extends DataTypeSerializer<Long> { public DateTimeSerializer(DataType type) { http://git-wip-us.apache.org/repos/asf/kylin/blob/c1f5ed88/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DoubleSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DoubleSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DoubleSerializer.java index 20cfff3..d3677bf 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DoubleSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/DoubleSerializer.java @@ -22,6 +22,7 @@ import java.nio.ByteBuffer; /** */ +@SuppressWarnings("serial") public class DoubleSerializer extends DataTypeSerializer<Double> { public DoubleSerializer(DataType type) { http://git-wip-us.apache.org/repos/asf/kylin/blob/c1f5ed88/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Int4Serializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Int4Serializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Int4Serializer.java index 0e82e11..0f032ff 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Int4Serializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Int4Serializer.java @@ -18,12 +18,13 @@ package org.apache.kylin.metadata.datatype; -import org.apache.kylin.common.util.BytesUtil; - import java.nio.ByteBuffer; +import org.apache.kylin.common.util.BytesUtil; + /** */ +@SuppressWarnings("serial") public class Int4Serializer extends DataTypeSerializer<Integer> { public Int4Serializer(DataType type) { http://git-wip-us.apache.org/repos/asf/kylin/blob/c1f5ed88/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Long8Serializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Long8Serializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Long8Serializer.java index 7dd5aa7..2c86e6d 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Long8Serializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/Long8Serializer.java @@ -18,12 +18,13 @@ package org.apache.kylin.metadata.datatype; -import org.apache.kylin.common.util.BytesUtil; - import java.nio.ByteBuffer; +import org.apache.kylin.common.util.BytesUtil; + /** */ +@SuppressWarnings("serial") public class Long8Serializer extends DataTypeSerializer<Long> { public Long8Serializer(DataType type) { http://git-wip-us.apache.org/repos/asf/kylin/blob/c1f5ed88/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/LongSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/LongSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/LongSerializer.java index 605dcd7..9f72a82 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/LongSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/LongSerializer.java @@ -18,12 +18,13 @@ package org.apache.kylin.metadata.datatype; -import org.apache.kylin.common.util.BytesUtil; - import java.nio.ByteBuffer; +import org.apache.kylin.common.util.BytesUtil; + /** */ +@SuppressWarnings("serial") public class LongSerializer extends DataTypeSerializer<Long> { public LongSerializer(DataType type) { http://git-wip-us.apache.org/repos/asf/kylin/blob/c1f5ed88/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/StringSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/StringSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/StringSerializer.java index 235808f..a76ce4a 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/StringSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/StringSerializer.java @@ -22,6 +22,7 @@ import java.nio.ByteBuffer; import org.apache.kylin.common.util.BytesUtil; +@SuppressWarnings("serial") public class StringSerializer extends DataTypeSerializer<String> { final DataType type; http://git-wip-us.apache.org/repos/asf/kylin/blob/c1f5ed88/core-metadata/src/test/java/org/apache/kylin/metadata/datatype/DataTypeTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/metadata/datatype/DataTypeTest.java b/core-metadata/src/test/java/org/apache/kylin/metadata/datatype/DataTypeTest.java new file mode 100644 index 0000000..5d6300d --- /dev/null +++ b/core-metadata/src/test/java/org/apache/kylin/metadata/datatype/DataTypeTest.java @@ -0,0 +1,51 @@ +/* + * 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.kylin.metadata.datatype; + +import org.apache.kylin.common.util.LocalFileMetadataTestCase; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +public class DataTypeTest extends LocalFileMetadataTestCase { + + @Before + public void setUp() throws Exception { + this.createTestMetadata(); + } + + @After + public void after() throws Exception { + this.cleanupTestMetadata(); + } + + @Test + public void testBasics() { + { + DataType t = DataType.getType("char(2)"); + Assert.assertEquals("char", t.getName()); + Assert.assertEquals(2, t.getPrecision()); + } + { + DataType t = DataType.getType("string"); + Assert.assertEquals("varchar", t.getName()); + } + } +}
