TAJO-1496: Remove legacy CSVFile. (jinho) Closes #638
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/6d852081 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/6d852081 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/6d852081 Branch: refs/heads/index_support Commit: 6d852081e082803e833fd87e8b96aa51bf5e642b Parents: 83228ce Author: Jinho Kim <[email protected]> Authored: Wed Jul 22 18:45:40 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Wed Jul 22 18:45:40 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 + .../org/apache/tajo/catalog/CatalogUtil.java | 18 +- .../org/apache/tajo/catalog/DDLBuilder.java | 2 +- .../src/main/proto/CatalogProtos.proto | 9 +- .../org/apache/tajo/catalog/TestTableDesc.java | 4 +- .../org/apache/tajo/catalog/TestTableMeta.java | 18 +- .../tajo/catalog/store/HiveCatalogStore.java | 3 +- .../tajo/catalog/store/HiveCatalogUtil.java | 4 +- .../catalog/store/TestHiveCatalogStore.java | 12 +- .../org/apache/tajo/catalog/TestCatalog.java | 24 +- .../java/org/apache/tajo/BuiltinStorages.java | 1 - .../apache/tajo/storage/StorageConstants.java | 6 - .../java/org/apache/tajo/benchmark/TPCH.java | 2 +- .../apache/tajo/engine/parser/SQLAnalyzer.java | 6 +- .../engine/planner/global/GlobalPlanner.java | 4 +- .../planner/physical/PhysicalPlanUtil.java | 4 +- .../apache/tajo/master/exec/QueryExecutor.java | 7 +- .../java/org/apache/tajo/querymaster/Stage.java | 2 +- .../org/apache/tajo/BackendTestingUtil.java | 2 +- .../java/org/apache/tajo/QueryTestCaseBase.java | 2 +- .../org/apache/tajo/TajoTestingCluster.java | 2 +- .../apache/tajo/cli/tools/TestDDLBuilder.java | 2 +- .../org/apache/tajo/cli/tsql/TestTajoCli.java | 5 +- .../apache/tajo/engine/eval/ExprTestBase.java | 2 +- .../tajo/engine/eval/TestEvalTreeUtil.java | 2 +- .../engine/planner/TestLogicalOptimizer.java | 6 +- .../tajo/engine/planner/TestLogicalPlanner.java | 12 +- .../tajo/engine/planner/TestPlannerUtil.java | 6 +- .../planner/physical/TestBNLJoinExec.java | 4 +- .../planner/physical/TestBSTIndexExec.java | 2 +- .../planner/physical/TestExternalSortExec.java | 2 +- .../physical/TestFullOuterHashJoinExec.java | 8 +- .../physical/TestFullOuterMergeJoinExec.java | 10 +- .../planner/physical/TestHashAntiJoinExec.java | 4 +- .../planner/physical/TestHashJoinExec.java | 4 +- .../planner/physical/TestHashSemiJoinExec.java | 4 +- .../physical/TestLeftOuterHashJoinExec.java | 8 +- .../planner/physical/TestMergeJoinExec.java | 4 +- .../engine/planner/physical/TestNLJoinExec.java | 4 +- .../planner/physical/TestPhysicalPlanner.java | 10 +- .../physical/TestRightOuterHashJoinExec.java | 6 +- .../physical/TestRightOuterMergeJoinExec.java | 10 +- .../engine/planner/physical/TestSortExec.java | 2 +- .../apache/tajo/engine/query/TestCTASQuery.java | 2 +- .../tajo/engine/query/TestCreateTable.java | 4 +- .../tajo/engine/query/TestHBaseTable.java | 36 +- .../tajo/engine/query/TestInsertQuery.java | 2 +- .../query/TestJoinOnPartitionedTables.java | 9 +- .../tajo/engine/query/TestTablePartitions.java | 32 +- .../org/apache/tajo/jdbc/TestResultSet.java | 2 +- .../tajo/master/TestExecutionBlockCursor.java | 2 +- .../queries/TestAlterTable/table1_ddl.sql | 2 +- .../queries/TestAlterTable/table2_ddl.sql | 2 +- .../queries/TestCTASQuery/CtasWithOptions.sql | 2 +- .../quoted_identifier_mixed_chars_ddl_1.sql | 2 +- .../quoted_identifier_mixed_chars_ddl_2.sql | 2 +- .../quoted_identifier_non_ascii_ddl.sql | 2 +- .../queries/TestCreateTable/table1_ddl.sql | 2 +- ...stInsertOverwriteLocationWithCompression.sql | 2 +- .../testInsertOverwriteWithCompression_ddl.sql | 4 +- .../TestJoinQuery/create_customer_large_ddl.sql | 2 +- .../TestJoinQuery/create_lineitem_large_ddl.sql | 2 +- .../TestJoinQuery/create_orders_large_ddl.sql | 2 +- .../queries/TestJoinQuery/oj_table1_ddl.sql | 4 +- .../queries/TestJoinQuery/oj_table2_ddl.sql | 4 +- .../queries/TestJoinQuery/table1_int4_ddl.sql | 4 +- .../queries/TestJoinQuery/table1_int8_ddl.sql | 4 +- .../queries/TestNetTypes/table1_ddl.sql | 4 +- .../queries/TestNetTypes/table2_ddl.sql | 4 +- .../multibytes_delimiter_table1_ddl.sql | 4 +- .../multibytes_delimiter_table2_ddl.sql | 4 +- .../create_table_with_asc_desc_keys.sql | 2 +- .../create_table_with_date_ddl.sql | 4 +- .../TestTablePartitions/lineitemspecial_ddl.sql | 2 +- .../TestTajoJdbc/create_table_with_date_ddl.sql | 4 +- .../queries/TestTruncateTable/table2_ddl.sql | 2 +- .../queries/default/create_table_12.sql | 2 +- .../results/TestTajoCli/testDescTable.result | 4 +- .../testDescTableForNestedSchema.result | 4 +- .../results/TestTajoDump/testDump1.result | 4 +- .../results/TestTajoDump/testDump2.result | 4 +- .../testBuildDDLForBaseTable.result | 4 +- .../testBuildDDLForExternalTable.result | 4 +- .../testBuildDDLQuotedTableName1.result | 4 +- .../testBuildDDLQuotedTableName2.result | 4 +- .../main/sphinx/backup_and_restore/catalog.rst | 2 +- tajo-docs/src/main/sphinx/getting_started.rst | 2 +- tajo-docs/src/main/sphinx/index/how_to_use.rst | 2 +- tajo-docs/src/main/sphinx/tsql/meta_command.rst | 2 +- .../org/apache/tajo/plan/LogicalPlanner.java | 13 +- .../org/apache/tajo/plan/TablePropertyUtil.java | 2 +- .../tajo/plan/logical/PersistentStoreNode.java | 2 +- .../org/apache/tajo/plan/TestLogicalNode.java | 6 +- .../src/main/resources/storage-default.xml | 18 +- .../src/test/resources/storage-default.xml | 63 +- .../tajo/storage/hbase/HBaseFragment.java | 7 +- .../java/org/apache/tajo/storage/CSVFile.java | 571 ------------------- .../tajo/storage/CompressedSplitLineReader.java | 182 ------ .../org/apache/tajo/storage/LineReader.java | 559 ------------------ .../apache/tajo/storage/SplitLineReader.java | 39 -- .../tajo/storage/fragment/FileFragment.java | 7 +- .../tajo/storage/TestCompressionStorages.java | 17 +- .../apache/tajo/storage/TestFileSystems.java | 2 +- .../apache/tajo/storage/TestFileTablespace.java | 6 +- .../apache/tajo/storage/TestMergeScanner.java | 4 +- .../org/apache/tajo/storage/TestStorages.java | 5 +- .../apache/tajo/storage/index/TestBSTIndex.java | 1 - .../index/TestSingleCSVFileBSTIndex.java | 14 +- .../src/test/resources/storage-default.xml | 18 +- 109 files changed, 299 insertions(+), 1691 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index aef8235..21799d2 100644 --- a/CHANGES +++ b/CHANGES @@ -399,6 +399,8 @@ Release 0.11.0 - unreleased SUB TASKS + TAJO-1496: Remove legacy CSVFile. (jinho) + TAJO-1691: Refactor visitors and planner to throw TajoException. (hyunsik) TAJO-1525: Implement INTERSECT [ALL] physical operator. (Contributed http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java index b668d05..b7244b0 100644 --- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java +++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java @@ -21,6 +21,7 @@ package org.apache.tajo.catalog; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import org.apache.hadoop.fs.Path; +import org.apache.tajo.BuiltinStorages; import org.apache.tajo.DataTypeUtil; import org.apache.tajo.TajoConstants; import org.apache.tajo.catalog.partition.PartitionDesc; @@ -55,8 +56,6 @@ import static org.apache.tajo.common.TajoDataTypes.Type; public class CatalogUtil { - public static final String TEXTFILE_NAME = "TEXT"; - /** * Normalize an identifier. Normalization means a translation from a identifier to be a refined identifier name. * @@ -284,17 +283,22 @@ public class CatalogUtil { return sb.toString(); } + + public static String getBackwardCompitablityStoreType(String storeType) { + return getStoreTypeString(getStoreType(storeType)); + } + public static String getStoreTypeString(final StoreType type) { if (type == StoreType.TEXTFILE) { - return TEXTFILE_NAME; + return BuiltinStorages.TEXT; } else { return type.name(); } } public static StoreType getStoreType(final String typeStr) { - if (typeStr.equalsIgnoreCase(StoreType.CSV.name())) { - return StoreType.CSV; + if (typeStr.equalsIgnoreCase("CSV")) { + return StoreType.TEXTFILE; } else if (typeStr.equalsIgnoreCase(StoreType.RAW.name())) { return StoreType.RAW; } else if (typeStr.equalsIgnoreCase(StoreType.ROWFILE.name())) { @@ -307,7 +311,7 @@ public class CatalogUtil { return StoreType.SEQUENCEFILE; } else if (typeStr.equalsIgnoreCase(StoreType.AVRO.name())) { return StoreType.AVRO; - } else if (typeStr.equalsIgnoreCase(TEXTFILE_NAME)) { + } else if (typeStr.equalsIgnoreCase(BuiltinStorages.TEXT)) { return StoreType.TEXTFILE; } else if (typeStr.equalsIgnoreCase(StoreType.JSON.name())) { return StoreType.JSON; @@ -942,7 +946,7 @@ public class CatalogUtil { */ public static KeyValueSet newDefaultProperty(String storeType) { KeyValueSet options = new KeyValueSet(); - if (storeType.equalsIgnoreCase("CSV") || storeType.equalsIgnoreCase("TEXT")) { + if (storeType.equalsIgnoreCase(BuiltinStorages.TEXT)) { options.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); } else if (storeType.equalsIgnoreCase("JSON")) { options.set(StorageConstants.TEXT_SERDE_CLASS, "org.apache.tajo.storage.json.JsonLineSerDe"); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/DDLBuilder.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/DDLBuilder.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/DDLBuilder.java index 62dd894..f313aa5 100644 --- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/DDLBuilder.java +++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/DDLBuilder.java @@ -87,7 +87,7 @@ public class DDLBuilder { } private static void buildUsingClause(StringBuilder sb, TableMeta meta) { - sb.append(" USING " + meta.getStoreType()); + sb.append(" USING " + CatalogUtil.getBackwardCompitablityStoreType(meta.getStoreType())); } private static void buildWithClause(StringBuilder sb, TableMeta meta) { http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto index d0cf238..cb8c403 100644 --- a/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto +++ b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto @@ -27,7 +27,7 @@ import "PrimitiveProtos.proto"; enum StoreType { MEM = 0; - CSV = 1; + TEXTFILE = 1; RAW = 2; RCFILE = 3; ROWFILE = 4; @@ -35,10 +35,9 @@ enum StoreType { PARQUET = 7; SEQUENCEFILE = 8; AVRO = 9; - TEXTFILE = 10; - JSON = 11; - HBASE = 12; - SYSTEM = 13; + JSON = 10; + HBASE = 11; + SYSTEM = 12; } enum OrderType { http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableDesc.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableDesc.java b/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableDesc.java index 41a0832..b3d343d 100644 --- a/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableDesc.java +++ b/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableDesc.java @@ -44,7 +44,7 @@ public class TestTableDesc { schema = new Schema(); schema.addColumn("name", Type.BLOB); schema.addColumn("addr", Type.TEXT); - info = CatalogUtil.newTableMeta("CSV"); + info = CatalogUtil.newTableMeta("TEXT"); path = new Path(CommonTestingUtil.getTestDir(), "table1"); desc = new TableDesc("table1", schema, info, path.toUri()); stats = new TableStats(); @@ -70,7 +70,7 @@ public class TestTableDesc { Schema schema = new Schema(); schema.addColumn("name", Type.BLOB); schema.addColumn("addr", Type.TEXT); - TableMeta info = CatalogUtil.newTableMeta("CSV"); + TableMeta info = CatalogUtil.newTableMeta("TEXT"); testClone(info); Path path = new Path(CommonTestingUtil.getTestDir(), "tajo"); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/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 56c2ad2..9087262 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 @@ -18,8 +18,8 @@ package org.apache.tajo.catalog; +import org.apache.tajo.BuiltinStorages; import org.apache.tajo.catalog.json.CatalogGsonHelper; -import org.apache.tajo.catalog.proto.CatalogProtos.StoreType; import org.apache.tajo.catalog.proto.CatalogProtos.TableProto; import org.apache.tajo.common.TajoDataTypes.Type; import org.apache.tajo.rpc.protocolrecords.PrimitiveProtos; @@ -33,7 +33,7 @@ public class TestTableMeta { @Before public void setUp() { - meta = CatalogUtil.newTableMeta("CSV"); + meta = CatalogUtil.newTableMeta("TEXT"); } @Test @@ -41,7 +41,7 @@ public class TestTableMeta { Schema schema1 = new Schema(); schema1.addColumn("name", Type.BLOB); schema1.addColumn("addr", Type.TEXT); - TableMeta meta1 = CatalogUtil.newTableMeta("CSV"); + TableMeta meta1 = CatalogUtil.newTableMeta("TEXT"); TableMeta meta2 = new TableMeta(meta1.getProto()); assertEquals(meta1, meta2); @@ -52,7 +52,7 @@ public class TestTableMeta { Schema schema1 = new Schema(); schema1.addColumn("name", Type.BLOB); schema1.addColumn("addr", Type.TEXT); - TableMeta meta1 = CatalogUtil.newTableMeta("CSV"); + TableMeta meta1 = CatalogUtil.newTableMeta("TEXT"); TableMeta meta2 = (TableMeta) meta1.clone(); assertEquals(meta1.getStoreType(), meta2.getStoreType()); @@ -64,7 +64,7 @@ public class TestTableMeta { Schema schema1 = new Schema(); schema1.addColumn("name", Type.BLOB); schema1.addColumn("addr", Type.TEXT); - TableMeta meta1 = CatalogUtil.newTableMeta("CSV"); + TableMeta meta1 = CatalogUtil.newTableMeta("TEXT"); TableMeta meta2 = (TableMeta) meta1.clone(); @@ -73,7 +73,7 @@ public class TestTableMeta { @Test public void testGetStorageType() { - assertEquals("CSV", meta.getStoreType()); + assertEquals("TEXT", meta.getStoreType()); } @Test @@ -81,7 +81,7 @@ public class TestTableMeta { Schema schema2 = new Schema(); schema2.addColumn("name", Type.BLOB); schema2.addColumn("addr", Type.TEXT); - TableMeta meta2 = CatalogUtil.newTableMeta("CSV"); + TableMeta meta2 = CatalogUtil.newTableMeta("TEXT"); assertTrue(meta.equals(meta2)); @@ -96,7 +96,7 @@ public class TestTableMeta { int MAX_COUNT = 17; - TableMeta meta1 = CatalogUtil.newTableMeta(StoreType.CSV.toString()); + TableMeta meta1 = CatalogUtil.newTableMeta(BuiltinStorages.TEXT); 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(BuiltinStorages.TEXT); builder.setParams(optionBuilder); TableMeta meta2 = new TableMeta(builder.build()); assertTrue(meta1.equals(meta2)); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java index daba8ba..8a08b77 100644 --- a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java +++ b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java @@ -489,8 +489,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore { table.putToParameters(serdeConstants.SERIALIZATION_NULL_FORMAT, StringEscapeUtils.unescapeJava(tableDesc.getMeta().getOption(StorageConstants.RCFILE_NULL))); } - } else if (tableDesc.getMeta().getStoreType().equalsIgnoreCase(BuiltinStorages.CSV) - || tableDesc.getMeta().getStoreType().equals(CatalogProtos.StoreType.TEXTFILE)) { + } else if (tableDesc.getMeta().getStoreType().equals(BuiltinStorages.TEXT)) { sd.getSerdeInfo().setSerializationLib(org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.class.getName()); sd.setInputFormat(org.apache.hadoop.mapred.TextInputFormat.class.getName()); sd.setOutputFormat(org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat.class.getName()); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogUtil.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogUtil.java b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogUtil.java index ef7d4bd..5ae5969 100644 --- a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogUtil.java +++ b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogUtil.java @@ -25,9 +25,9 @@ import org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat; import org.apache.hadoop.hive.ql.io.RCFileOutputFormat; import org.apache.hadoop.hive.ql.metadata.Table; import org.apache.hadoop.hive.serde.serdeConstants; +import org.apache.tajo.BuiltinStorages; import org.apache.tajo.catalog.exception.CatalogException; import org.apache.tajo.catalog.proto.CatalogProtos; -import org.apache.tajo.catalog.CatalogUtil; import org.apache.tajo.common.TajoDataTypes; import org.apache.tajo.exception.ExceptionUtil; import org.apache.thrift.TException; @@ -113,7 +113,7 @@ public class HiveCatalogUtil { String outputFormatClass = fileFormatArrary[fileFormatArrary.length-1]; if(outputFormatClass.equals(HiveIgnoreKeyTextOutputFormat.class.getSimpleName())) { - return CatalogUtil.TEXTFILE_NAME; + return BuiltinStorages.TEXT; } else if(outputFormatClass.equals(HiveSequenceFileOutputFormat.class.getSimpleName())) { return CatalogProtos.StoreType.SEQUENCEFILE.name(); } else if(outputFormatClass.equals(RCFileOutputFormat.class.getSimpleName())) { http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java index 1a8282a..b3af179 100644 --- a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java +++ b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java @@ -85,7 +85,7 @@ public class TestHiveCatalogStore { @Test public void testTableUsingTextFile() throws Exception { - TableMeta meta = new TableMeta("CSV", new KeyValueSet()); + TableMeta meta = new TableMeta("TEXT", new KeyValueSet()); org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema(); schema.addColumn("c_custkey", TajoDataTypes.Type.INT4); @@ -177,7 +177,7 @@ public class TestHiveCatalogStore { KeyValueSet options = new KeyValueSet(); options.set(StorageConstants.TEXT_DELIMITER, StringEscapeUtils.escapeJava("\u0002")); options.set(StorageConstants.TEXT_NULL, StringEscapeUtils.escapeJava("\u0003")); - TableMeta meta = new TableMeta("CSV", options); + TableMeta meta = new TableMeta("TEXT", options); org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema(); schema.addColumn("s_suppkey", TajoDataTypes.Type.INT4); @@ -220,7 +220,7 @@ public class TestHiveCatalogStore { @Test public void testAddTableByPartition() throws Exception { - TableMeta meta = new TableMeta("CSV", new KeyValueSet()); + TableMeta meta = new TableMeta("TEXT", new KeyValueSet()); org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema(); schema.addColumn("n_name", TajoDataTypes.Type.TEXT); @@ -332,7 +332,7 @@ public class TestHiveCatalogStore { @Test public void testGetAllTableNames() throws Exception{ - TableMeta meta = new TableMeta("CSV", new KeyValueSet()); + TableMeta meta = new TableMeta("TEXT", new KeyValueSet()); org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema(); schema.addColumn("n_name", TajoDataTypes.Type.TEXT); schema.addColumn("n_regionkey", TajoDataTypes.Type.INT4); @@ -360,7 +360,7 @@ public class TestHiveCatalogStore { @Test public void testDeleteTable() throws Exception { - TableMeta meta = new TableMeta("CSV", new KeyValueSet()); + TableMeta meta = new TableMeta("TEXT", new KeyValueSet()); org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema(); schema.addColumn("n_name", TajoDataTypes.Type.TEXT); schema.addColumn("n_regionkey", TajoDataTypes.Type.INT4); @@ -472,7 +472,7 @@ public class TestHiveCatalogStore { public void testDataTypeCompatibility() throws Exception { String tableName = CatalogUtil.normalizeIdentifier("testDataTypeCompatibility"); - TableMeta meta = new TableMeta("CSV", new KeyValueSet()); + TableMeta meta = new TableMeta("TEXT", new KeyValueSet()); org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema(); schema.addColumn("col1", TajoDataTypes.Type.INT4); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java index 6020e83..40b731e 100644 --- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java +++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java @@ -264,7 +264,7 @@ public class TestCatalog { TableDesc table = new TableDesc( CatalogUtil.buildFQName(databaseName, tableName), schema1, - new TableMeta("CSV", new KeyValueSet()), + new TableMeta("TEXT", new KeyValueSet()), path.toUri(), true); return table; } @@ -317,7 +317,7 @@ public class TestCatalog { TableDesc table = new TableDesc( CatalogUtil.buildFQName(databaseName, tableName), schema, - new TableMeta("CSV", new KeyValueSet()), + new TableMeta("TEXT", new KeyValueSet()), path.toUri(), true); assertTrue(catalog.createTable(table)); @@ -331,7 +331,7 @@ public class TestCatalog { table = new TableDesc( CatalogUtil.buildFQName(databaseName, tableName), schema, - new TableMeta("CSV", new KeyValueSet()), + new TableMeta("TEXT", new KeyValueSet()), path.toUri(), true); assertTrue(catalog.createTable(table)); @@ -421,7 +421,7 @@ public class TestCatalog { TableDesc meta = new TableDesc( CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "getTable"), schema1, - "CSV", + "TEXT", new KeyValueSet(), path.toUri()); @@ -441,7 +441,7 @@ public class TestCatalog { TableDesc tableDesc = new TableDesc( CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, tableName), schema, - "CSV", + "TEXT", new KeyValueSet(), path.toUri()); @@ -561,7 +561,7 @@ public class TestCatalog { String tableName = "indexed"; - TableMeta meta = CatalogUtil.newTableMeta("CSV"); + TableMeta meta = CatalogUtil.newTableMeta("TEXT"); return new TableDesc( CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, tableName), schema, meta, new Path(CommonTestingUtil.getTestDir(), "indexed").toUri()); @@ -732,7 +732,7 @@ public class TestCatalog { String tableName = CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "addedtable"); KeyValueSet opts = new KeyValueSet(); opts.set("file.delimiter", ","); - TableMeta meta = CatalogUtil.newTableMeta("CSV", opts); + TableMeta meta = CatalogUtil.newTableMeta("TEXT", opts); Schema partSchema = new Schema(); @@ -772,7 +772,7 @@ public class TestCatalog { String tableName = CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "addedtable"); KeyValueSet opts = new KeyValueSet(); opts.set("file.delimiter", ","); - TableMeta meta = CatalogUtil.newTableMeta("CSV", opts); + TableMeta meta = CatalogUtil.newTableMeta("TEXT", opts); Schema partSchema = new Schema(); partSchema.addColumn("id", Type.INT4); @@ -810,7 +810,7 @@ public class TestCatalog { String tableName = CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "addedtable"); KeyValueSet opts = new KeyValueSet(); opts.set("file.delimiter", ","); - TableMeta meta = CatalogUtil.newTableMeta("CSV", opts); + TableMeta meta = CatalogUtil.newTableMeta("TEXT", opts); Schema partSchema = new Schema(); partSchema.addColumn("id", Type.INT4); @@ -847,7 +847,7 @@ public class TestCatalog { String tableName = CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "addedtable"); KeyValueSet opts = new KeyValueSet(); opts.set("file.delimiter", ","); - TableMeta meta = CatalogUtil.newTableMeta("CSV", opts); + TableMeta meta = CatalogUtil.newTableMeta("TEXT", opts); Schema partSchema = new Schema(); partSchema.addColumn("id", Type.INT4); @@ -884,7 +884,7 @@ public class TestCatalog { String tableName = CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "addedtable"); KeyValueSet opts = new KeyValueSet(); opts.set("file.delimiter", ","); - TableMeta meta = CatalogUtil.newTableMeta("CSV", opts); + TableMeta meta = CatalogUtil.newTableMeta("TEXT", opts); Schema partSchema = new Schema(); partSchema.addColumn("id", Type.INT4); @@ -1004,7 +1004,7 @@ public class TestCatalog { TableDesc setPropertyDesc = catalog.getTableDesc("default","mynewcooltable"); KeyValueSet options = new KeyValueSet(); options.set("timezone", "GMT+9"); // Seoul, Korea - setPropertyDesc.setMeta(new TableMeta("CSV", options)); + setPropertyDesc.setMeta(new TableMeta("TEXT", options)); String prevTimeZone = setPropertyDesc.getMeta().getOption("timezone"); String newTimeZone = "GMT-7"; // Silicon Valley, California catalog.alterTable(createMockAlterTableSetProperty(newTimeZone)); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java b/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java index 318270c..6f1b7c6 100644 --- a/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java +++ b/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java @@ -19,7 +19,6 @@ package org.apache.tajo; public class BuiltinStorages { - public static final String CSV = "CSV"; public static final String TEXT = "TEXT"; public static final String JSON = "JSON"; public static final String RAW = "RAW"; http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-common/src/main/java/org/apache/tajo/storage/StorageConstants.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/storage/StorageConstants.java b/tajo-common/src/main/java/org/apache/tajo/storage/StorageConstants.java index f68e138..7158596 100644 --- a/tajo-common/src/main/java/org/apache/tajo/storage/StorageConstants.java +++ b/tajo-common/src/main/java/org/apache/tajo/storage/StorageConstants.java @@ -18,8 +18,6 @@ package org.apache.tajo.storage; -import org.apache.tajo.TajoConstants; - import java.net.URI; public class StorageConstants { @@ -42,10 +40,6 @@ public class StorageConstants { // Text file properties ------------------------------------------------- @Deprecated - public static final String CSVFILE_DELIMITER = "csvfile.delimiter"; - @Deprecated - public static final String CSVFILE_NULL = "csvfile.null"; - @Deprecated public static final String CSVFILE_SERDE = "csvfile.serde"; public static final String TEXT_DELIMITER = "text.delimiter"; http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java b/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java index dd3a43b..91a3b66 100644 --- a/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java +++ b/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java @@ -207,7 +207,7 @@ public class TPCH extends BenchmarkSet { } public void loadTable(String tableName) throws SQLException { - TableMeta meta = CatalogUtil.newTableMeta("CSV"); + TableMeta meta = CatalogUtil.newTableMeta("TEXT"); meta.putOption(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); PartitionMethodDesc partitionMethodDesc = null; http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java b/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java index e433e4f..d99a5cf 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java @@ -1623,12 +1623,8 @@ public class SQLAnalyzer extends SQLParserBaseVisitor<Expr> { public Map<String, String> escapeTableMeta(Map<String, String> map) { Map<String, String> params = new HashMap<String, String>(); for (Map.Entry<String, String> entry : map.entrySet()) { - if (entry.getKey().equals(StorageConstants.CSVFILE_DELIMITER) - || entry.getKey().equals(StorageConstants.TEXT_DELIMITER)) { //backward compatibility + if (entry.getKey().equals(StorageConstants.TEXT_DELIMITER)) { params.put(StorageConstants.TEXT_DELIMITER, StringUtils.unicodeEscapedDelimiter(entry.getValue())); - } else if (entry.getKey().equals(StorageConstants.CSVFILE_NULL) - || entry.getKey().equals(StorageConstants.TEXT_NULL)) { //backward compatibility - params.put(StorageConstants.TEXT_NULL, entry.getValue()); } else { params.put(entry.getKey(), entry.getValue()); } http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java index 8c63ffd..d9712c9 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java @@ -163,7 +163,7 @@ public class GlobalPlanner { private static void setFinalOutputChannel(DataChannel outputChannel, Schema outputSchema) { outputChannel.setShuffleType(NONE_SHUFFLE); outputChannel.setShuffleOutputNum(1); - outputChannel.setStoreType("CSV"); + outputChannel.setStoreType("TEXT"); outputChannel.setSchema(outputSchema); } @@ -994,7 +994,7 @@ public class GlobalPlanner { for (DataChannel dataChannel : masterPlan.getIncomingChannels(execBlock.getId())) { // This data channel will be stored in staging directory, but RawFile, default file type, does not support // distributed file system. It needs to change the file format for distributed file system. - dataChannel.setStoreType("CSV"); + dataChannel.setStoreType("TEXT"); ExecutionBlock subBlock = masterPlan.getExecBlock(dataChannel.getSrcId()); ProjectionNode copy = PlannerUtil.clone(plan, node); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java index deda498..1e90d04 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java @@ -209,7 +209,7 @@ public class PhysicalPlanUtil { */ private static void setNullCharForTextSerializer(TableMeta meta, String nullChar) { String storeType = meta.getStoreType(); - if (storeType.equalsIgnoreCase("CSV")) { + if (storeType.equalsIgnoreCase("TEXT")) { meta.putOption(StorageConstants.TEXT_NULL, nullChar); } else if (storeType.equalsIgnoreCase("TEXT")) { meta.putOption(StorageConstants.TEXT_NULL, nullChar); @@ -228,7 +228,7 @@ public class PhysicalPlanUtil { */ public static boolean containsNullChar(TableMeta meta) { String storeType = meta.getStoreType(); - if (storeType.equalsIgnoreCase("CSV")) { + if (storeType.equalsIgnoreCase("TEXT")) { return meta.containsOption(StorageConstants.TEXT_NULL); } else if (storeType.equalsIgnoreCase("TEXT")) { return meta.containsOption(StorageConstants.TEXT_NULL); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java index d3530a0..b6e5806 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java @@ -24,10 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.tajo.QueryId; -import org.apache.tajo.QueryIdFactory; -import org.apache.tajo.SessionVars; -import org.apache.tajo.TajoConstants; +import org.apache.tajo.*; import org.apache.tajo.catalog.CatalogService; import org.apache.tajo.catalog.Schema; import org.apache.tajo.catalog.TableDesc; @@ -454,7 +451,7 @@ public class QueryExecutor { List<CatalogProtos.ColumnProto> columns = new ArrayList<CatalogProtos.ColumnProto>(); CatalogProtos.TableDescProto tableDescProto = CatalogProtos.TableDescProto.newBuilder() .setTableName(nodeUniqName) - .setMeta(CatalogProtos.TableProto.newBuilder().setStoreType("CSV").build()) + .setMeta(CatalogProtos.TableProto.newBuilder().setStoreType(BuiltinStorages.TEXT).build()) .setSchema(CatalogProtos.SchemaProto.newBuilder().addAllFields(columns).build()) .setStats(stats.getProto()) .build(); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java index 50b45a8..4256582 100644 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java @@ -742,7 +742,7 @@ public class Stage implements EventHandler<StageEvent> { String storeType = PlannerUtil.getStoreType(masterPlan.getLogicalPlan()); if (storeType == null) { // get default or store type - storeType = "CSV"; + storeType = "TEXT"; } schema = channel.getSchema(); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java b/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java index 5df1122..050c7b4 100644 --- a/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java +++ b/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java @@ -41,7 +41,7 @@ public class BackendTestingUtil { mockupSchema = new Schema(); mockupSchema.addColumn("deptname", Type.TEXT); mockupSchema.addColumn("score", Type.INT4); - mockupMeta = CatalogUtil.newTableMeta("CSV"); + mockupMeta = CatalogUtil.newTableMeta("TEXT"); } public static void writeTmpTable(TajoConf conf, Path tablePath) http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java b/tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java index 4e9fb8a..3fcb15e 100644 --- a/tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java +++ b/tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java @@ -834,7 +834,7 @@ public class QueryTestCaseBase { * CREATE EXTERNAL TABLE ${0} ( * t_timestamp TIMESTAMP, * t_date DATE - * ) USING CSV LOCATION ${table.path} + * ) USING TEXT LOCATION ${table.path} * </pre> * * @param ddlFileName A file name, containing a data definition statement. http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java b/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java index 25b306f..71ef0ea 100644 --- a/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java +++ b/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java @@ -676,7 +676,7 @@ public class TajoTestingCluster { out.close(); } } - TableMeta meta = CatalogUtil.newTableMeta("CSV", tableOption); + TableMeta meta = CatalogUtil.newTableMeta("TEXT", tableOption); client.createExternalTable(tableName, schema, tablePath.toUri(), meta); } finally { client.close(); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/cli/tools/TestDDLBuilder.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/cli/tools/TestDDLBuilder.java b/tajo-core/src/test/java/org/apache/tajo/cli/tools/TestDDLBuilder.java index aac5f90..06a54c4 100644 --- a/tajo-core/src/test/java/org/apache/tajo/cli/tools/TestDDLBuilder.java +++ b/tajo-core/src/test/java/org/apache/tajo/cli/tools/TestDDLBuilder.java @@ -41,7 +41,7 @@ public class TestDDLBuilder { schema1.addColumn("name", TajoDataTypes.Type.BLOB); schema1.addColumn("addr", TajoDataTypes.Type.TEXT); - meta1 = CatalogUtil.newTableMeta("CSV"); + meta1 = CatalogUtil.newTableMeta("TEXT"); meta1.putOption(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); meta1.putOption(StorageConstants.COMPRESSION_CODEC, GzipCodec.class.getName()); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/cli/tsql/TestTajoCli.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/cli/tsql/TestTajoCli.java b/tajo-core/src/test/java/org/apache/tajo/cli/tsql/TestTajoCli.java index 5005670..e744631 100644 --- a/tajo-core/src/test/java/org/apache/tajo/cli/tsql/TestTajoCli.java +++ b/tajo-core/src/test/java/org/apache/tajo/cli/tsql/TestTajoCli.java @@ -35,10 +35,7 @@ import org.apache.tajo.conf.TajoConf; import org.apache.tajo.storage.StorageUtil; import org.apache.tajo.storage.TablespaceManager; import org.apache.tajo.util.FileUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.*; import org.junit.rules.TestName; import java.io.*; http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java b/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java index 350a4ad..7629711 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java @@ -266,7 +266,7 @@ public class ExprTestBase { vtuple.put(i, lazyTuple.get(i)); } } - cat.createTable(new TableDesc(qualifiedTableName, inputSchema,"CSV", + cat.createTable(new TableDesc(qualifiedTableName, inputSchema,"TEXT", new KeyValueSet(), CommonTestingUtil.getTestDir().toUri())); } http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java b/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java index 37d665e..c08ea87 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java @@ -103,7 +103,7 @@ public class TestEvalTreeUtil { schema.addColumn("score", TajoDataTypes.Type.INT4); schema.addColumn("age", TajoDataTypes.Type.INT4); - TableMeta meta = CatalogUtil.newTableMeta("CSV"); + TableMeta meta = CatalogUtil.newTableMeta("TEXT"); TableDesc desc = new TableDesc( CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "people"), schema, meta, CommonTestingUtil.getTestDir().toUri()); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java index ae3fd11..10e7e37 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java @@ -79,7 +79,7 @@ public class TestLogicalOptimizer { schema3.addColumn("score", Type.INT4); schema3.addColumn("phone", Type.INT4); - TableMeta meta = CatalogUtil.newTableMeta("CSV"); + TableMeta meta = CatalogUtil.newTableMeta("TEXT"); TableDesc people = new TableDesc( CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "employee"), schema, meta, CommonTestingUtil.getTestDir().toUri()); @@ -87,13 +87,13 @@ public class TestLogicalOptimizer { TableDesc student = new TableDesc( - CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, "CSV", new KeyValueSet(), + CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, "TEXT", new KeyValueSet(), CommonTestingUtil.getTestDir().toUri()); catalog.createTable(student); TableDesc score = new TableDesc( - CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, "CSV", new KeyValueSet(), + CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, "TEXT", new KeyValueSet(), CommonTestingUtil.getTestDir().toUri()); catalog.createTable(score); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java index d383662..097e232 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java @@ -100,19 +100,19 @@ public class TestLogicalPlanner { schema3.addColumn("deptname", Type.TEXT); schema3.addColumn("score", Type.INT4); - TableMeta meta = CatalogUtil.newTableMeta("CSV"); + TableMeta meta = CatalogUtil.newTableMeta("TEXT"); TableDesc people = new TableDesc( CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "employee"), schema, meta, CommonTestingUtil.getTestDir().toUri()); catalog.createTable(people); TableDesc student = new TableDesc( - CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, "CSV", new KeyValueSet(), + CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, "TEXT", new KeyValueSet(), CommonTestingUtil.getTestDir().toUri()); catalog.createTable(student); TableDesc score = new TableDesc( - CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, "CSV", new KeyValueSet(), + CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, "TEXT", new KeyValueSet(), CommonTestingUtil.getTestDir().toUri()); catalog.createTable(score); @@ -129,7 +129,7 @@ public class TestLogicalPlanner { tpch.loadSchemas(); tpch.loadOutSchema(); for (String table : tpchTables) { - TableMeta m = CatalogUtil.newTableMeta("CSV"); + TableMeta m = CatalogUtil.newTableMeta("TEXT"); TableDesc d = CatalogUtil.newTableDesc( CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, table), tpch.getSchema(table), m, CommonTestingUtil.getTestDir()); @@ -994,7 +994,7 @@ public class TestLogicalPlanner { assertEquals(Type.INT8, def.getColumn(2).getDataType().getType()); assertEquals("score", def.getColumn(3).getSimpleName()); assertEquals(Type.FLOAT4, def.getColumn(3).getDataType().getType()); - assertTrue("CSV".equalsIgnoreCase(createTable.getStorageType())); + assertTrue("TEXT".equalsIgnoreCase(createTable.getStorageType())); assertEquals("file://tmp/data", createTable.getUri().toString()); assertTrue(createTable.hasOptions()); assertEquals("|", createTable.getOptions().get("csv.delimiter")); @@ -1269,7 +1269,7 @@ public class TestLogicalPlanner { TableDesc desc = null; try { - desc = new TableDesc(qualifiedTableName, schema, "CSV", new KeyValueSet(), + desc = new TableDesc(qualifiedTableName, schema, "TEXT", new KeyValueSet(), CommonTestingUtil.getTestDir().toUri()); } catch (Exception e) { throw new RuntimeException(e); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java index 530045c..6c4d82d 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java @@ -85,7 +85,7 @@ public class TestPlannerUtil { schema3.addColumn("deptname", Type.TEXT); schema3.addColumn("score", CatalogUtil.newSimpleDataType(Type.INT4)); - TableMeta meta = CatalogUtil.newTableMeta("CSV"); + TableMeta meta = CatalogUtil.newTableMeta("TEXT"); TableDesc people = new TableDesc( CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "employee"), schema, meta, CommonTestingUtil.getTestDir().toUri()); @@ -93,13 +93,13 @@ public class TestPlannerUtil { TableDesc student = new TableDesc( - CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, "CSV", + CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, "TEXT", new KeyValueSet(), CommonTestingUtil.getTestDir().toUri()); catalog.createTable(student); TableDesc score = new TableDesc( - CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, "CSV", + CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, "TEXT", new KeyValueSet(), CommonTestingUtil.getTestDir().toUri()); catalog.createTable(score); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java index dfee911..71bad20 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java @@ -85,7 +85,7 @@ public class TestBNLJoinExec { schema.addColumn("memid", Type.INT4); schema.addColumn("deptname", Type.TEXT); - TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta employeeMeta = CatalogUtil.newTableMeta("TEXT"); Path employeePath = new Path(testDir, "employee.csv"); Appender appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(employeeMeta, schema, employeePath); @@ -107,7 +107,7 @@ public class TestBNLJoinExec { peopleSchema.addColumn("fk_memid", Type.INT4); peopleSchema.addColumn("name", Type.TEXT); peopleSchema.addColumn("age", Type.INT4); - TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta peopleMeta = CatalogUtil.newTableMeta("TEXT"); Path peoplePath = new Path(testDir, "people.csv"); appender = ((FileTablespace) TablespaceManager.getLocalFs()).getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java index e577881..036ca78 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java @@ -111,7 +111,7 @@ public class TestBSTIndexExec { writer.open(); long offset; - meta = CatalogUtil.newTableMeta("CSV"); + meta = CatalogUtil.newTableMeta("TEXT"); tablePath = StorageUtil.concatPath(workDir, "employee", "table.csv"); fs = tablePath.getFileSystem(conf); fs.mkdirs(tablePath.getParent()); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java index 9c6e570..4ae880f 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java @@ -81,7 +81,7 @@ public class TestExternalSortExec { schema.addColumn("empid", Type.INT4); schema.addColumn("deptname", Type.TEXT); - TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta employeeMeta = CatalogUtil.newTableMeta("TEXT"); Path employeePath = new Path(testDir, "employee.csv"); Appender appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(employeeMeta, schema, employeePath); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java index 189d68a..5901c49 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java @@ -106,7 +106,7 @@ public class TestFullOuterHashJoinExec { dep3Schema.addColumn("loc_id", Type.INT4); - TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta dep3Meta = CatalogUtil.newTableMeta("TEXT"); Path dep3Path = new Path(testDir, "dep3.csv"); Appender appender1 = ((FileTablespace) TablespaceManager.getLocalFs()).getAppender(dep3Meta, dep3Schema, dep3Path); appender1.init(); @@ -135,7 +135,7 @@ public class TestFullOuterHashJoinExec { job3Schema.addColumn("job_title", Type.TEXT); - TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta job3Meta = CatalogUtil.newTableMeta("TEXT"); Path job3Path = new Path(testDir, "job3.csv"); Appender appender2 = ((FileTablespace) TablespaceManager.getLocalFs()).getAppender(job3Meta, job3Schema, job3Path); appender2.init(); @@ -174,7 +174,7 @@ public class TestFullOuterHashJoinExec { emp3Schema.addColumn("job_id", Type.INT4); - TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta emp3Meta = CatalogUtil.newTableMeta("TEXT"); Path emp3Path = new Path(testDir, "emp3.csv"); Appender appender3 = ((FileTablespace) TablespaceManager.getLocalFs()).getAppender(emp3Meta, emp3Schema, emp3Path); appender3.init(); @@ -226,7 +226,7 @@ public class TestFullOuterHashJoinExec { phone3Schema.addColumn("phone_number", Type.TEXT); - TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta phone3Meta = CatalogUtil.newTableMeta("TEXT"); Path phone3Path = new Path(testDir, "phone3.csv"); Appender appender5 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(phone3Meta, phone3Schema, phone3Path); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java index 668a7aa..ec2aa04 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java @@ -110,7 +110,7 @@ public class TestFullOuterMergeJoinExec { dep3Schema.addColumn("loc_id", Type.INT4); - TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta dep3Meta = CatalogUtil.newTableMeta("TEXT"); Path dep3Path = new Path(testDir, "dep3.csv"); Appender appender1 = ((FileTablespace) TablespaceManager.getLocalFs()).getAppender(dep3Meta, dep3Schema, dep3Path); appender1.init(); @@ -148,7 +148,7 @@ public class TestFullOuterMergeJoinExec { dep4Schema.addColumn("loc_id", Type.INT4); - TableMeta dep4Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta dep4Meta = CatalogUtil.newTableMeta("TEXT"); Path dep4Path = new Path(testDir, "dep4.csv"); Appender appender4 = ((FileTablespace) TablespaceManager.getLocalFs()).getAppender(dep4Meta, dep4Schema, dep4Path); appender4.init(); @@ -179,7 +179,7 @@ public class TestFullOuterMergeJoinExec { job3Schema.addColumn("job_title", Type.TEXT); - TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta job3Meta = CatalogUtil.newTableMeta("TEXT"); Path job3Path = new Path(testDir, "job3.csv"); Appender appender2 = ((FileTablespace) TablespaceManager.getLocalFs()).getAppender(job3Meta, job3Schema, job3Path); appender2.init(); @@ -218,7 +218,7 @@ public class TestFullOuterMergeJoinExec { emp3Schema.addColumn("job_id", Type.INT4); - TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta emp3Meta = CatalogUtil.newTableMeta("TEXT"); Path emp3Path = new Path(testDir, "emp3.csv"); Appender appender3 = ((FileTablespace) TablespaceManager.getLocalFs()).getAppender(emp3Meta, emp3Schema, emp3Path); appender3.init(); @@ -270,7 +270,7 @@ public class TestFullOuterMergeJoinExec { phone3Schema.addColumn("phone_number", Type.TEXT); - TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta phone3Meta = CatalogUtil.newTableMeta("TEXT"); Path phone3Path = new Path(testDir, "phone3.csv"); Appender appender5 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(phone3Meta, phone3Schema, phone3Path); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java index 8745024..292c414 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java @@ -82,7 +82,7 @@ public class TestHashAntiJoinExec { employeeSchema.addColumn("memid", Type.INT4); employeeSchema.addColumn("deptname", Type.TEXT); - TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta employeeMeta = CatalogUtil.newTableMeta("TEXT"); Path employeePath = new Path(testDir, "employee.csv"); Appender appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(employeeMeta, employeeSchema, employeePath); @@ -108,7 +108,7 @@ public class TestHashAntiJoinExec { peopleSchema.addColumn("fk_memid", Type.INT4); peopleSchema.addColumn("name", Type.TEXT); peopleSchema.addColumn("age", Type.INT4); - TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta peopleMeta = CatalogUtil.newTableMeta("TEXT"); Path peoplePath = new Path(testDir, "people.csv"); appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(peopleMeta, peopleSchema, peoplePath); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java index bcee24c..4550db9 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java @@ -84,7 +84,7 @@ public class TestHashJoinExec { employeeSchema.addColumn("memid", Type.INT4); employeeSchema.addColumn("deptname", Type.TEXT); - TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta employeeMeta = CatalogUtil.newTableMeta("TEXT"); Path employeePath = new Path(testDir, "employee.csv"); Appender appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(employeeMeta, employeeSchema, employeePath); @@ -107,7 +107,7 @@ public class TestHashJoinExec { peopleSchema.addColumn("fk_memid", Type.INT4); peopleSchema.addColumn("name", Type.TEXT); peopleSchema.addColumn("age", Type.INT4); - TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta peopleMeta = CatalogUtil.newTableMeta("TEXT"); Path peoplePath = new Path(testDir, "people.csv"); appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(peopleMeta, peopleSchema, peoplePath); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java index 4c10174..3880585 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java @@ -82,7 +82,7 @@ public class TestHashSemiJoinExec { employeeSchema.addColumn("memid", Type.INT4); employeeSchema.addColumn("deptname", Type.TEXT); - TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta employeeMeta = CatalogUtil.newTableMeta("TEXT"); Path employeePath = new Path(testDir, "employee.csv"); Appender appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(employeeMeta, employeeSchema, employeePath); @@ -108,7 +108,7 @@ public class TestHashSemiJoinExec { peopleSchema.addColumn("fk_memid", Type.INT4); peopleSchema.addColumn("name", Type.TEXT); peopleSchema.addColumn("age", Type.INT4); - TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta peopleMeta = CatalogUtil.newTableMeta("TEXT"); Path peoplePath = new Path(testDir, "people.csv"); appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(peopleMeta, peopleSchema, peoplePath); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java index 376ecc5..76e38e4 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java @@ -104,7 +104,7 @@ public class TestLeftOuterHashJoinExec { dep3Schema.addColumn("loc_id", Type.INT4); - TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta dep3Meta = CatalogUtil.newTableMeta("TEXT"); Path dep3Path = new Path(testDir, "dep3.csv"); Appender appender1 = ((FileTablespace) TablespaceManager.getLocalFs()).getAppender(dep3Meta, dep3Schema, dep3Path); appender1.init(); @@ -133,7 +133,7 @@ public class TestLeftOuterHashJoinExec { job3Schema.addColumn("job_title", Type.TEXT); - TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta job3Meta = CatalogUtil.newTableMeta("TEXT"); Path job3Path = new Path(testDir, "job3.csv"); Appender appender2 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(job3Meta, job3Schema, job3Path); @@ -173,7 +173,7 @@ public class TestLeftOuterHashJoinExec { emp3Schema.addColumn("job_id", Type.INT4); - TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta emp3Meta = CatalogUtil.newTableMeta("TEXT"); Path emp3Path = new Path(testDir, "emp3.csv"); Appender appender3 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(emp3Meta, emp3Schema, emp3Path); @@ -226,7 +226,7 @@ public class TestLeftOuterHashJoinExec { phone3Schema.addColumn("phone_number", Type.TEXT); - TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta phone3Meta = CatalogUtil.newTableMeta("TEXT"); Path phone3Path = new Path(testDir, "phone3.csv"); Appender appender5 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(phone3Meta, phone3Schema, phone3Path); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java index 40eb463..2c26cc2 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java @@ -83,7 +83,7 @@ public class TestMergeJoinExec { employeeSchema.addColumn("memid", Type.INT4); employeeSchema.addColumn("deptname", Type.TEXT); - TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta employeeMeta = CatalogUtil.newTableMeta("TEXT"); Path employeePath = new Path(testDir, "employee.csv"); Appender appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(employeeMeta, employeeSchema, employeePath); @@ -112,7 +112,7 @@ public class TestMergeJoinExec { peopleSchema.addColumn("fk_memid", Type.INT4); peopleSchema.addColumn("name", Type.TEXT); peopleSchema.addColumn("age", Type.INT4); - TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta peopleMeta = CatalogUtil.newTableMeta("TEXT"); Path peoplePath = new Path(testDir, "people.csv"); appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(peopleMeta, peopleSchema, peoplePath); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java index 0fc51e9..d7968fe 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java @@ -81,7 +81,7 @@ public class TestNLJoinExec { schema.addColumn("memid", Type.INT4); schema.addColumn("deptname", Type.TEXT); - TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta employeeMeta = CatalogUtil.newTableMeta("TEXT"); Path employeePath = new Path(testDir, "employee.csv"); Appender appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(employeeMeta, schema, employeePath); @@ -105,7 +105,7 @@ public class TestNLJoinExec { peopleSchema.addColumn("fk_memid", Type.INT4); peopleSchema.addColumn("name", Type.TEXT); peopleSchema.addColumn("age", Type.INT4); - TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta peopleMeta = CatalogUtil.newTableMeta("TEXT"); Path peoplePath = new Path(testDir, "people.csv"); appender = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(peopleMeta, peopleSchema, peoplePath); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java index 6521242..dae2351 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java @@ -117,7 +117,7 @@ public class TestPhysicalPlanner { scoreSchema.addColumn("score", Type.INT4); scoreSchema.addColumn("nullable", Type.TEXT); - TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta employeeMeta = CatalogUtil.newTableMeta("TEXT"); Path employeePath = new Path(testDir, "employee.csv"); @@ -138,7 +138,7 @@ public class TestPhysicalPlanner { catalog.createTable(employee); Path scorePath = new Path(testDir, "score"); - TableMeta scoreMeta = CatalogUtil.newTableMeta("CSV", new KeyValueSet()); + TableMeta scoreMeta = CatalogUtil.newTableMeta("TEXT", new KeyValueSet()); appender = sm.getAppender(scoreMeta, scoreSchema, scorePath); appender.init(); score = new TableDesc( @@ -434,7 +434,7 @@ public class TestPhysicalPlanner { LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalNode rootNode = optimizer.optimize(plan); - TableMeta outputMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta outputMeta = CatalogUtil.newTableMeta("TEXT"); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode); @@ -503,7 +503,7 @@ public class TestPhysicalPlanner { long totalNum = 0; for (FileStatus status : fs.listStatus(ctx.getOutputPath().getParent())) { Scanner scanner = ((FileTablespace) TablespaceManager.getLocalFs()).getFileScanner( - CatalogUtil.newTableMeta("CSV"), + CatalogUtil.newTableMeta("TEXT"), rootNode.getOutSchema(), status.getPath()); @@ -741,7 +741,7 @@ public class TestPhysicalPlanner { long expectedFileNum = (long) Math.ceil(fileVolumSum / (float)StorageUnit.MB); assertEquals(expectedFileNum, fileStatuses.length); } - TableMeta outputMeta = CatalogUtil.newTableMeta("CSV"); + TableMeta outputMeta = CatalogUtil.newTableMeta("TEXT"); Scanner scanner = new MergeScanner(conf, rootNode.getOutSchema(), outputMeta, TUtil.newList(fragments)); scanner.init(); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java index eefc02a..fe36602 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java @@ -98,7 +98,7 @@ public class TestRightOuterHashJoinExec { dep3Schema.addColumn("loc_id", Type.INT4); - TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta dep3Meta = CatalogUtil.newTableMeta("TEXT"); Path dep3Path = new Path(testDir, "dep3.csv"); Appender appender1 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(dep3Meta, dep3Schema, dep3Path); @@ -128,7 +128,7 @@ public class TestRightOuterHashJoinExec { job3Schema.addColumn("job_title", Type.TEXT); - TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta job3Meta = CatalogUtil.newTableMeta("TEXT"); Path job3Path = new Path(testDir, "job3.csv"); Appender appender2 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(job3Meta, job3Schema, job3Path); @@ -168,7 +168,7 @@ public class TestRightOuterHashJoinExec { emp3Schema.addColumn("job_id", Type.INT4); - TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta emp3Meta = CatalogUtil.newTableMeta("TEXT"); Path emp3Path = new Path(testDir, "emp3.csv"); Appender appender3 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(emp3Meta, emp3Schema, emp3Path); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java index 9bc6ab3..9a5a85f 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java @@ -109,7 +109,7 @@ public class TestRightOuterMergeJoinExec { dep3Schema.addColumn("loc_id", Type.INT4); - TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta dep3Meta = CatalogUtil.newTableMeta("TEXT"); Path dep3Path = new Path(testDir, "dep3.csv"); Appender appender1 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(dep3Meta, dep3Schema, dep3Path); @@ -148,7 +148,7 @@ public class TestRightOuterMergeJoinExec { dep4Schema.addColumn("loc_id", Type.INT4); - TableMeta dep4Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta dep4Meta = CatalogUtil.newTableMeta("TEXT"); Path dep4Path = new Path(testDir, "dep4.csv"); Appender appender4 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(dep4Meta, dep4Schema, dep4Path); @@ -180,7 +180,7 @@ public class TestRightOuterMergeJoinExec { job3Schema.addColumn("job_title", Type.TEXT); - TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta job3Meta = CatalogUtil.newTableMeta("TEXT"); Path job3Path = new Path(testDir, "job3.csv"); Appender appender2 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(job3Meta, job3Schema, job3Path); @@ -220,7 +220,7 @@ public class TestRightOuterMergeJoinExec { emp3Schema.addColumn("job_id", Type.INT4); - TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta emp3Meta = CatalogUtil.newTableMeta("TEXT"); Path emp3Path = new Path(testDir, "emp3.csv"); Appender appender3 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(emp3Meta, emp3Schema, emp3Path); @@ -273,7 +273,7 @@ public class TestRightOuterMergeJoinExec { phone3Schema.addColumn("phone_number", Type.TEXT); - TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV"); + TableMeta phone3Meta = CatalogUtil.newTableMeta("TEXT"); Path phone3Path = new Path(testDir, "phone3.csv"); Appender appender5 = ((FileTablespace) TablespaceManager.getLocalFs()) .getAppender(phone3Meta, phone3Schema, phone3Path); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java index 625fbec..743c51d 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java @@ -82,7 +82,7 @@ public class TestSortExec { schema.addColumn("empid", Type.INT4); schema.addColumn("deptname", Type.TEXT); - employeeMeta = CatalogUtil.newTableMeta("CSV"); + employeeMeta = CatalogUtil.newTableMeta("TEXT"); tablePath = StorageUtil.concatPath(workDir, "employee", "table1"); sm.getFileSystem().mkdirs(tablePath.getParent()); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java index 2758d7d..f327c85 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java @@ -248,7 +248,7 @@ public class TestCTASQuery extends QueryTestCaseBase { TableDesc desc = client.getTableDesc(CatalogUtil.normalizeIdentifier(res2.getMetaData().getTableName(1))); assertNotNull(desc); - assertTrue("CSV".equalsIgnoreCase(desc.getMeta().getStoreType())); + assertTrue("TEXT".equalsIgnoreCase(desc.getMeta().getStoreType())); KeyValueSet options = desc.getMeta().getOptions(); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java index dfdf09a..08aabf4 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java @@ -486,7 +486,7 @@ public class TestCreateTable extends QueryTestCaseBase { executeString("DROP TABLE table2"); // Table with non-default meta options - executeString("CREATE TABLE table1 (c1 int, c2 text) USING csv WITH ('csvfile.delimiter'='|','compression.codec'='org.apache.hadoop.io.compress.DeflateCodec');").close(); + executeString("CREATE TABLE table1 (c1 int, c2 text) USING text WITH ('text.delimiter'='|','compression.codec'='org.apache.hadoop.io.compress.DeflateCodec');").close(); executeString("CREATE TABLE table2 LIKE table1"); testMsg = "testCreateTableLike1: Table with non-default meta options test failed"; assertTrue(testMsg, isClonedTable("table1","table2")); @@ -552,7 +552,7 @@ public class TestCreateTable extends QueryTestCaseBase { executeString("DROP TABLE table2"); // Table with non-default meta options - executeString("CREATE TABLE table1 (c1 int, c2 varchar) USING csv WITH ('csvfile.delimiter'='|','compression.codec'='org.apache.hadoop.io.compress.DeflateCodec');").close(); + executeString("CREATE TABLE table1 (c1 int, c2 varchar) USING text WITH ('text.delimiter'='|','compression.codec'='org.apache.hadoop.io.compress.DeflateCodec');").close(); executeString("CREATE TABLE table2 LIKE table1"); testMsg = "testCreateTableLike1: Table with non-default meta options test failed"; assertTrue(testMsg, isClonedTable("table1","table2")); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java index 569111c..7adb237 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java @@ -735,8 +735,8 @@ public class TestHBaseTable extends QueryTestCaseBase { // create test table KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.TEXT_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.TEXT); @@ -791,8 +791,8 @@ public class TestHBaseTable extends QueryTestCaseBase { // create test table KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.TEXT_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.TEXT); @@ -849,8 +849,8 @@ public class TestHBaseTable extends QueryTestCaseBase { // create test table KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.TEXT_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.TEXT); @@ -907,8 +907,8 @@ public class TestHBaseTable extends QueryTestCaseBase { // create test table KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.TEXT_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id1", Type.TEXT); @@ -964,8 +964,8 @@ public class TestHBaseTable extends QueryTestCaseBase { // create test table KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.TEXT_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.INT4); @@ -1020,8 +1020,8 @@ public class TestHBaseTable extends QueryTestCaseBase { // create test table KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.TEXT_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("rk", Type.TEXT); @@ -1109,8 +1109,8 @@ public class TestHBaseTable extends QueryTestCaseBase { // create test table KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.TEXT_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.INT4); @@ -1181,8 +1181,8 @@ public class TestHBaseTable extends QueryTestCaseBase { public void testCTAS() throws Exception { // create test table KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.TEXT_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.TEXT); @@ -1302,8 +1302,8 @@ public class TestHBaseTable extends QueryTestCaseBase { try { // create test table KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.TEXT_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.TEXT); http://git-wip-us.apache.org/repos/asf/tajo/blob/6d852081/tajo-core/src/test/java/org/apache/tajo/engine/query/TestInsertQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestInsertQuery.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestInsertQuery.java index 7a671d8..d0088a5 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestInsertQuery.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestInsertQuery.java @@ -689,7 +689,7 @@ public class TestInsertQuery extends QueryTestCaseBase { public final void testInsertOverwritePathWithNonFromQuery() throws Exception { ResultSet res = executeString("insert overwrite into location " + "'/tajo-data/testInsertOverwritePathWithNonFromQuery' " + - "USING csv WITH ('csvfile.delimiter'='|','compression.codec'='org.apache.hadoop.io.compress.DeflateCodec') " + + "USING csv WITH ('text.delimiter'='|','compression.codec'='org.apache.hadoop.io.compress.DeflateCodec') " + "select 1::INT4, 2.1::FLOAT4, 'test'"); res.close();
