Repository: tajo Updated Branches: refs/heads/branch-0.10.1 effc35398 -> 568386dc8
TAJO-1485: Datum 'Char' returned only 1byte. (missing changes) Signed-off-by: Jihoon Son <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/568386dc Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/568386dc Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/568386dc Branch: refs/heads/branch-0.10.1 Commit: 568386dc890ad829314e6c23b0f782e51b821a50 Parents: effc353 Author: DaeMyung Kang <[email protected]> Authored: Thu May 14 17:12:42 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Thu May 14 17:12:42 2015 +0900 ---------------------------------------------------------------------- .../test/java/org/apache/tajo/catalog/TestTableMeta.java | 4 ++-- .../src/test/java/org/apache/tajo/storage/TestStorages.java | 9 +++++---- .../java/org/apache/tajo/storage/parquet/TestReadWrite.java | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/568386dc/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableMeta.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableMeta.java b/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableMeta.java index 3d6b390..9006fb2 100644 --- a/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableMeta.java +++ b/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableMeta.java @@ -96,7 +96,7 @@ public class TestTableMeta { int MAX_COUNT = 17; - TableMeta meta1 = CatalogUtil.newTableMeta(StoreType.CSV.toString()); + TableMeta meta1 = CatalogUtil.newTableMeta(StoreType.CSV); for (int i = 0; i < MAX_COUNT; i++) { meta1.putOption("key"+i, "value"+i); } @@ -108,7 +108,7 @@ public class TestTableMeta { optionBuilder.addKeyval(keyValueBuilder); } TableProto.Builder builder = TableProto.newBuilder(); - builder.setStoreType(StoreType.CSV.toString()); + builder.setStoreType(StoreType.CSV); builder.setParams(optionBuilder); TableMeta meta2 = new TableMeta(builder.build()); assertTrue(meta1.equals(meta2)); http://git-wip-us.apache.org/repos/asf/tajo/blob/568386dc/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java index 6a7cd94..4d4e909 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java @@ -30,6 +30,7 @@ import org.apache.tajo.TajoIdProtos; import org.apache.tajo.catalog.CatalogUtil; import org.apache.tajo.catalog.Schema; import org.apache.tajo.catalog.TableMeta; +import org.apache.tajo.catalog.proto.CatalogProtos.StoreType; import org.apache.tajo.catalog.statistics.TableStats; import org.apache.tajo.common.TajoDataTypes.Type; import org.apache.tajo.conf.TajoConf; @@ -1014,10 +1015,10 @@ public class TestStorages { @Test public final void testInsertFixedCharTypeWithOverSize() throws Exception { - if (storeType.equalsIgnoreCase("CSV") == false && - storeType.equalsIgnoreCase("SEQUENCEFILE") == false && - storeType.equalsIgnoreCase("RCFILE") == false && - storeType.equalsIgnoreCase("PARQUET") == false) { + if (!storeType.equals(StoreType.CSV) && + !storeType.equals(StoreType.SEQUENCEFILE) && + !storeType.equals(StoreType.RCFILE) && + !storeType.equals(StoreType.PARQUET)) { return; } http://git-wip-us.apache.org/repos/asf/tajo/blob/568386dc/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java index 109fed9..af0159e 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java @@ -55,7 +55,7 @@ public class TestReadWrite { List<Column> columns = new ArrayList<Column>(); columns.add(new Column("myboolean", Type.BOOLEAN)); columns.add(new Column("mybit", Type.BIT)); - columns.add(new Column("mychar", Type.CHAR)); + columns.add(new Column("mychar", Type.CHAR, 1)); columns.add(new Column("myint2", Type.INT2)); columns.add(new Column("myint4", Type.INT4)); columns.add(new Column("myint8", Type.INT8));
