Repository: tajo Updated Branches: refs/heads/master 0603b49dd -> ddfc3f330
http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java index b59c495..9501556 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinQuery.java @@ -49,39 +49,39 @@ public class TestJoinQuery extends QueryTestCaseBase { public TestJoinQuery(String joinOption) { super(TajoConstants.DEFAULT_DATABASE_NAME); - testingCluster.setAllTajoDaemonConfValue(ConfVars.DIST_QUERY_BROADCAST_JOIN_AUTO.varname, - ConfVars.DIST_QUERY_BROADCAST_JOIN_AUTO.defaultVal); - testingCluster.setAllTajoDaemonConfValue(ConfVars.DIST_QUERY_BROADCAST_JOIN_THRESHOLD.varname, - ConfVars.DIST_QUERY_BROADCAST_JOIN_THRESHOLD.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$TEST_BROADCAST_JOIN_ENABLED.varname, + ConfVars.$TEST_BROADCAST_JOIN_ENABLED.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$DIST_QUERY_BROADCAST_JOIN_THRESHOLD.varname, + ConfVars.$DIST_QUERY_BROADCAST_JOIN_THRESHOLD.defaultVal); testingCluster.setAllTajoDaemonConfValue( - ConfVars.EXECUTOR_INNER_JOIN_INMEMORY_HASH_THRESHOLD.varname, - ConfVars.EXECUTOR_INNER_JOIN_INMEMORY_HASH_THRESHOLD.defaultVal); + ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.varname, + ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.defaultVal); - testingCluster.setAllTajoDaemonConfValue(ConfVars.EXECUTOR_OUTER_JOIN_INMEMORY_HASH_THRESHOLD.varname, - ConfVars.EXECUTOR_OUTER_JOIN_INMEMORY_HASH_THRESHOLD.defaultVal); - testingCluster.setAllTajoDaemonConfValue(ConfVars.EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.varname, - ConfVars.EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.varname, + ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.varname, + ConfVars.$EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.defaultVal); if (joinOption.indexOf("NoBroadcast") >= 0) { - testingCluster.setAllTajoDaemonConfValue(ConfVars.DIST_QUERY_BROADCAST_JOIN_AUTO.varname, "false"); - testingCluster.setAllTajoDaemonConfValue(ConfVars.DIST_QUERY_BROADCAST_JOIN_THRESHOLD.varname, "-1"); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$TEST_BROADCAST_JOIN_ENABLED.varname, "false"); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$DIST_QUERY_BROADCAST_JOIN_THRESHOLD.varname, "-1"); } if (joinOption.indexOf("Hash") >= 0) { testingCluster.setAllTajoDaemonConfValue( - ConfVars.EXECUTOR_INNER_JOIN_INMEMORY_HASH_THRESHOLD.varname, String.valueOf(256 * 1048576)); - testingCluster.setAllTajoDaemonConfValue(ConfVars.EXECUTOR_OUTER_JOIN_INMEMORY_HASH_THRESHOLD.varname, + ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.varname, String.valueOf(256 * 1048576)); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.varname, String.valueOf(256 * 1048576)); - testingCluster.setAllTajoDaemonConfValue(ConfVars.EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.varname, + testingCluster.setAllTajoDaemonConfValue(ConfVars.$EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.varname, String.valueOf(256 * 1048576)); } if (joinOption.indexOf("Sort") >= 0) { testingCluster.setAllTajoDaemonConfValue( - ConfVars.EXECUTOR_INNER_JOIN_INMEMORY_HASH_THRESHOLD.varname, String.valueOf(1)); - testingCluster.setAllTajoDaemonConfValue(ConfVars.EXECUTOR_OUTER_JOIN_INMEMORY_HASH_THRESHOLD.varname, + ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.varname, String.valueOf(1)); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.varname, String.valueOf(1)); - testingCluster.setAllTajoDaemonConfValue(ConfVars.EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.varname, + testingCluster.setAllTajoDaemonConfValue(ConfVars.$EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.varname, String.valueOf(1)); } } @@ -98,19 +98,19 @@ public class TestJoinQuery extends QueryTestCaseBase { @AfterClass public static void classTearDown() { - testingCluster.setAllTajoDaemonConfValue(ConfVars.DIST_QUERY_BROADCAST_JOIN_AUTO.varname, - ConfVars.DIST_QUERY_BROADCAST_JOIN_AUTO.defaultVal); - testingCluster.setAllTajoDaemonConfValue(ConfVars.DIST_QUERY_BROADCAST_JOIN_THRESHOLD.varname, - ConfVars.DIST_QUERY_BROADCAST_JOIN_THRESHOLD.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$TEST_BROADCAST_JOIN_ENABLED.varname, + ConfVars.$TEST_BROADCAST_JOIN_ENABLED.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$DIST_QUERY_BROADCAST_JOIN_THRESHOLD.varname, + ConfVars.$DIST_QUERY_BROADCAST_JOIN_THRESHOLD.defaultVal); testingCluster.setAllTajoDaemonConfValue( - ConfVars.EXECUTOR_INNER_JOIN_INMEMORY_HASH_THRESHOLD.varname, - ConfVars.EXECUTOR_INNER_JOIN_INMEMORY_HASH_THRESHOLD.defaultVal); + ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.varname, + ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.defaultVal); - testingCluster.setAllTajoDaemonConfValue(ConfVars.EXECUTOR_OUTER_JOIN_INMEMORY_HASH_THRESHOLD.varname, - ConfVars.EXECUTOR_OUTER_JOIN_INMEMORY_HASH_THRESHOLD.defaultVal); - testingCluster.setAllTajoDaemonConfValue(ConfVars.EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.varname, - ConfVars.EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.varname, + ConfVars.$EXECUTOR_HASH_JOIN_SIZE_THRESHOLD.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.varname, + ConfVars.$EXECUTOR_GROUPBY_INMEMORY_HASH_THRESHOLD.defaultVal); } @Test @@ -392,8 +392,8 @@ public class TestJoinQuery extends QueryTestCaseBase { public final void testLeftOuterJoinWithEmptySubquery1() throws Exception { // Empty Null Supplying table KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.INT4); @@ -405,7 +405,7 @@ public class TestJoinQuery extends QueryTestCaseBase { TajoTestingCluster.createTable("table12", schema, tableOptions, data, 2); try { - testingCluster.setAllTajoDaemonConfValue(ConfVars.TESTCASE_MIN_TASK_NUM.varname, "2"); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$TEST_MIN_TASK_NUM.varname, "2"); ResultSet res = executeString("select a.id, b.id from table11 a " + "left outer join (" + @@ -423,8 +423,8 @@ public class TestJoinQuery extends QueryTestCaseBase { assertEquals(expected, resultSetToString(res)); cleanupQuery(res); } finally { - testingCluster.setAllTajoDaemonConfValue(ConfVars.TESTCASE_MIN_TASK_NUM.varname, - ConfVars.TESTCASE_MIN_TASK_NUM.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$TEST_MIN_TASK_NUM.varname, + ConfVars.$TEST_MIN_TASK_NUM.defaultVal); executeString("DROP TABLE table11 PURGE").close(); executeString("DROP TABLE table12 PURGE").close(); } @@ -434,8 +434,8 @@ public class TestJoinQuery extends QueryTestCaseBase { public final void testLeftOuterJoinWithEmptySubquery2() throws Exception { //Empty Preserved Row table KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.INT4); @@ -447,7 +447,7 @@ public class TestJoinQuery extends QueryTestCaseBase { TajoTestingCluster.createTable("table12", schema, tableOptions, data, 2); try { - testingCluster.setAllTajoDaemonConfValue(ConfVars.TESTCASE_MIN_TASK_NUM.varname, "2"); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$TEST_MIN_TASK_NUM.varname, "2"); ResultSet res = executeString("select a.id, b.id from " + "(select table12.id, table12.name, lineitem.l_shipdate " + @@ -461,8 +461,8 @@ public class TestJoinQuery extends QueryTestCaseBase { assertEquals(expected, resultSetToString(res)); cleanupQuery(res); } finally { - testingCluster.setAllTajoDaemonConfValue(ConfVars.TESTCASE_MIN_TASK_NUM.varname, - ConfVars.TESTCASE_MIN_TASK_NUM.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$TEST_MIN_TASK_NUM.varname, + ConfVars.$TEST_MIN_TASK_NUM.defaultVal); executeString("DROP TABLE table11 PURGE"); executeString("DROP TABLE table12 PURGE"); } @@ -923,8 +923,8 @@ public class TestJoinQuery extends QueryTestCaseBase { private void createOuterJoinTestTable() throws Exception { KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.INT4); @@ -1057,8 +1057,8 @@ public class TestJoinQuery extends QueryTestCaseBase { @Test public void testJoinWithDifferentShuffleKey() throws Exception { KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.INT4); @@ -1077,8 +1077,8 @@ public class TestJoinQuery extends QueryTestCaseBase { } TajoTestingCluster.createTable("large_table", schema, tableOptions, data.toArray(new String[]{})); - int originConfValue = conf.getIntVar(ConfVars.DIST_QUERY_JOIN_PARTITION_VOLUME); - testingCluster.setAllTajoDaemonConfValue(ConfVars.DIST_QUERY_JOIN_PARTITION_VOLUME.varname, "1"); + int originConfValue = conf.getIntVar(ConfVars.$DIST_QUERY_JOIN_PARTITION_VOLUME); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$DIST_QUERY_JOIN_PARTITION_VOLUME.varname, "1"); ResultSet res = executeString( "select count(b.id) " + "from (select id, count(*) as cnt from large_table group by id) a " + @@ -1094,7 +1094,7 @@ public class TestJoinQuery extends QueryTestCaseBase { assertEquals(expected, resultSetToString(res)); } finally { - testingCluster.setAllTajoDaemonConfValue(ConfVars.DIST_QUERY_JOIN_PARTITION_VOLUME.varname, "" + originConfValue); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$DIST_QUERY_JOIN_PARTITION_VOLUME.varname, "" + originConfValue); cleanupQuery(res); executeString("DROP TABLE large_table PURGE").close(); } http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/query/TestNullValues.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestNullValues.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestNullValues.java index f41b0ab..de75ca7 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestNullValues.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestNullValues.java @@ -53,7 +53,7 @@ public class TestNullValues { "3|filled|0.2" }; KeyValueSet opts = new KeyValueSet(); - opts.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + opts.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); ResultSet res = TajoTestingCluster .run(table, schemas, opts, new String[][]{data}, "select * from nulltable1 where col3 is null"); @@ -80,7 +80,7 @@ public class TestNullValues { "3|filled|" }; KeyValueSet opts = new KeyValueSet(); - opts.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + opts.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); ResultSet res = TajoTestingCluster .run(table, schemas, opts, new String[][]{data}, "select * from nulltable2 where col1 is not null"); @@ -115,7 +115,7 @@ public class TestNullValues { ",,,43578,19,13,6,3581,2557,1024" }; KeyValueSet opts = new KeyValueSet(); - opts.put(StorageConstants.CSVFILE_DELIMITER, ","); + opts.set(StorageConstants.CSVFILE_DELIMITER, ","); ResultSet res = TajoTestingCluster .run(table, schemas, opts, new String[][]{data}, "select * from nulltable3 where col1 is null and col2 is null and col3 is null and col4 = 43578"); @@ -148,8 +148,8 @@ public class TestNullValues { ",\\N,,43578" }; KeyValueSet opts = new KeyValueSet(); - opts.put(StorageConstants.CSVFILE_DELIMITER, ","); - opts.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + opts.set(StorageConstants.CSVFILE_DELIMITER, ","); + opts.set(StorageConstants.CSVFILE_NULL, "\\\\N"); ResultSet res = TajoTestingCluster .run(table, schemas, opts, new String[][]{data}, "select * from nulltable4 where col1 is null and col2 is null and col3 is null and col5 is null and col4 = 43578"); @@ -253,8 +253,8 @@ public class TestNullValues { "4|d|4.0|\\N" }; KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); ResultSet res = TajoTestingCluster .run(table, schemas, tableOptions, new String[][]{data}, query); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSelectQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSelectQuery.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSelectQuery.java index 50d274d..5528b21 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSelectQuery.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSelectQuery.java @@ -432,8 +432,8 @@ public class TestSelectQuery extends QueryTestCaseBase { @Test public final void testNowInMultipleTasks() throws Exception { KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.INT4); @@ -442,7 +442,7 @@ public class TestSelectQuery extends QueryTestCaseBase { TajoTestingCluster.createTable("table11", schema, tableOptions, data, 2); try { - testingCluster.setAllTajoDaemonConfValue(ConfVars.TESTCASE_MIN_TASK_NUM.varname, "2"); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$TEST_MIN_TASK_NUM.varname, "2"); ResultSet res = executeString("select concat(substr(to_char(now(),'yyyymmddhh24miss'), 1, 14), 'aaa'), sleep(1) from table11"); @@ -474,8 +474,8 @@ public class TestSelectQuery extends QueryTestCaseBase { } assertEquals(5, numRecords); } finally { - testingCluster.setAllTajoDaemonConfValue(ConfVars.TESTCASE_MIN_TASK_NUM.varname, - ConfVars.TESTCASE_MIN_TASK_NUM.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$TEST_MIN_TASK_NUM.varname, + ConfVars.$TEST_MIN_TASK_NUM.defaultVal); executeString("DROP TABLE table11 PURGE"); } } http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java index a520e56..c7f6406 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java @@ -181,10 +181,10 @@ public class TestSortQuery extends QueryTestCaseBase { @Test public final void testSortNullColumn() throws Exception { try { - testingCluster.setAllTajoDaemonConfValue(ConfVars.TESTCASE_MIN_TASK_NUM.varname, "2"); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$TEST_MIN_TASK_NUM.varname, "2"); KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.INT4); @@ -214,7 +214,7 @@ public class TestSortQuery extends QueryTestCaseBase { cleanupQuery(res); } finally { - testingCluster.setAllTajoDaemonConfValue(ConfVars.TESTCASE_MIN_TASK_NUM.varname, "0"); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$TEST_MIN_TASK_NUM.varname, "0"); executeString("DROP TABLE nullsort PURGE;").close(); } } http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/jdbc/TestResultSet.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/jdbc/TestResultSet.java b/tajo-core/src/test/java/org/apache/tajo/jdbc/TestResultSet.java index 7ca94c9..38908db 100644 --- a/tajo-core/src/test/java/org/apache/tajo/jdbc/TestResultSet.java +++ b/tajo-core/src/test/java/org/apache/tajo/jdbc/TestResultSet.java @@ -153,7 +153,7 @@ public class TestResultSet { "2014-01-01|01:00:00|2014-01-01 01:00:00" }; KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); res = TajoTestingCluster .run(table, schemas, tableOptions, new String[][]{data}, query); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java b/tajo-core/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java index 4b76cb8..6bbf63b 100644 --- a/tajo-core/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java +++ b/tajo-core/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java @@ -61,7 +61,7 @@ public class TestExecutionBlockCursor { util.startCatalogCluster(); conf = util.getConfiguration(); - conf.set(TajoConf.ConfVars.DIST_QUERY_BROADCAST_JOIN_AUTO.varname, "false"); + conf.set(TajoConf.ConfVars.$TEST_BROADCAST_JOIN_ENABLED.varname, "false"); catalog = util.getMiniCatalogCluster().getCatalog(); catalog.createTablespace(DEFAULT_TABLESPACE_NAME, "hdfs://localhost:!234/warehouse"); @@ -107,9 +107,9 @@ public class TestExecutionBlockCursor { "join supplier on s_nationkey = n_nationkey " + "join partsupp on s_suppkey = ps_suppkey " + "join part on p_partkey = ps_partkey and p_type like '%BRASS' and p_size = 15"); - LogicalPlan logicalPlan = logicalPlanner.createPlan(LocalTajoTestingUtility.createDummySession(), context); + LogicalPlan logicalPlan = logicalPlanner.createPlan(LocalTajoTestingUtility.createDummyContext(conf), context); optimizer.optimize(logicalPlan); - QueryContext queryContext = new QueryContext(); + QueryContext queryContext = new QueryContext(conf); MasterPlan plan = new MasterPlan(LocalTajoTestingUtility.newQueryId(), queryContext, logicalPlan); planner.build(plan); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java b/tajo-core/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java index 0ce7746..b6ac551 100644 --- a/tajo-core/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java +++ b/tajo-core/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java @@ -112,9 +112,9 @@ public class TestGlobalPlanner { private MasterPlan buildPlan(String sql) throws PlanningException, IOException { Expr expr = sqlAnalyzer.parse(sql); - LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummySession(), expr); + LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummyContext(util.getConfiguration()), expr); optimizer.optimize(plan); - QueryContext context = new QueryContext(); + QueryContext context = new QueryContext(util.getConfiguration()); MasterPlan masterPlan = new MasterPlan(LocalTajoTestingUtility.newQueryId(), context, plan); globalPlanner.build(masterPlan); return masterPlan; http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/master/querymaster/TestQueryUnitStatusUpdate.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/master/querymaster/TestQueryUnitStatusUpdate.java b/tajo-core/src/test/java/org/apache/tajo/master/querymaster/TestQueryUnitStatusUpdate.java index e340953..b4be00b 100644 --- a/tajo-core/src/test/java/org/apache/tajo/master/querymaster/TestQueryUnitStatusUpdate.java +++ b/tajo-core/src/test/java/org/apache/tajo/master/querymaster/TestQueryUnitStatusUpdate.java @@ -44,7 +44,7 @@ public class TestQueryUnitStatusUpdate extends QueryTestCaseBase { @BeforeClass public static void setUp() throws Exception { - conf.set(TajoConf.ConfVars.DIST_QUERY_BROADCAST_JOIN_AUTO.varname, "false"); + conf.set(TajoConf.ConfVars.$TEST_BROADCAST_JOIN_ENABLED.varname, "false"); } @Test http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/worker/TestRangeRetrieverHandler.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/worker/TestRangeRetrieverHandler.java b/tajo-core/src/test/java/org/apache/tajo/worker/TestRangeRetrieverHandler.java index 5375749..5f8efe7 100644 --- a/tajo-core/src/test/java/org/apache/tajo/worker/TestRangeRetrieverHandler.java +++ b/tajo-core/src/test/java/org/apache/tajo/worker/TestRangeRetrieverHandler.java @@ -143,12 +143,12 @@ public class TestRangeRetrieverHandler { FileFragment[] frags = StorageManager.splitNG(conf, "default.employee", employeeMeta, tableDir, Integer.MAX_VALUE); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), new FileFragment[] {frags[0]}, testDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(SORT_QUERY[0]); - LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummySession(), expr); + LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummyContext(conf), expr); LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); @@ -267,12 +267,12 @@ public class TestRangeRetrieverHandler { FileFragment[] frags = sm.splitNG(conf, "default.employee", meta, tablePath, Integer.MAX_VALUE); TaskAttemptContext - ctx = new TaskAttemptContext(conf, new QueryContext(), + ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), new FileFragment[] {frags[0]}, testDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(SORT_QUERY[1]); - LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummySession(), expr); + LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummyContext(conf), expr); LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result b/tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result new file mode 100644 index 0000000..c294407 --- /dev/null +++ b/tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result @@ -0,0 +1,36 @@ +Available Session Variables: + +\set SESSION_EXPIRY_TIME [int value] - session expiry time (secs) +\set CLI_COLUMNS [int value] - Sets the width for the wrapped format +\set CLI_FORMATTER_CLASS [text value] - Sets the output format class to display results +\set CLI_NULL_CHAR [text value] - Sets the string to be printed in place of a null value. +\set CLI_PAGE_ROWS [int value] - Sets the number of rows for paging +\set CLI_PAGING_ENABLED [true or false] - Enable paging of result display +\set CLI_DISPLAY_ERROR_TRACE [true or false] - Enable display of error trace +\set ON_ERROR_STOP [true or false] - tsql will exist if an error occurs. +\set TZ [text value] - Sets timezone +\set DATE_ORDER [text value] - date order (default is YMD) +\set LANG [text value] - Language +\set LC_ALL [text value] - String sort order +\set LC_COLLATE [text value] - String sort order +\set LC_CTYPE [text value] - Character classification (What is a letter? Its upper-case equivalent?) +\set LC_MESSAGES [text value] - Language of messages +\set LC_MONETARY [text value] - Formatting of currency amounts +\set LC_NUMERIC [text value] - Formatting of numbers +\set LC_TIME [text value] - Formatting of dates and times +\set BROADCAST_TABLE_SIZE_LIMIT [long value] - limited size (bytes) of broadcast table +\set JOIN_TASK_INPUT_SIZE [int value] - join task input size (mb) +\set SORT_TASK_INPUT_SIZE [int value] - sort task input size (mb) +\set GROUPBY_TASK_INPUT_SIZE [int value] - group by task input size (mb) +\set JOIN_PER_SHUFFLE_SIZE [int value] - shuffle output size for join (mb) +\set GROUPBY_PER_SHUFFLE_SIZE [int value] - shuffle output size for sort (mb) +\set TABLE_PARTITION_PER_SHUFFLE_SIZE [int value] - shuffle output size for partition table write (mb) +\set EXTSORT_BUFFER_SIZE [long value] - sort buffer size for external sort (mb) +\set HASH_JOIN_SIZE_LIMIT [long value] - limited size for hash join (mb) +\set INNER_HASH_JOIN_SIZE_LIMIT [long value] - limited size for hash inner join (mb) +\set OUTER_HASH_JOIN_SIZE_LIMIT [long value] - limited size for hash outer join (mb) +\set HASH_GROUPBY_SIZE_LIMIT [long value] - limited size for hash groupby (mb) +\set MAX_OUTPUT_FILE_SIZE [int value] - Maximum per-output file size (mb). 0 means infinite. +\set NULL_CHAR [text value] - null char of text file output +\set ARITHABORT [true or false] - If true, a running query will be terminated when an overflow or divide-by-zero occurs. +\set DEBUG_ENABLED [true or false] - (debug only) debug mode enabled \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/resources/results/TestTajoCli/testSelectResultWithNullTrueDeprecated.result ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/resources/results/TestTajoCli/testSelectResultWithNullTrueDeprecated.result b/tajo-core/src/test/resources/results/TestTajoCli/testSelectResultWithNullTrueDeprecated.result new file mode 100644 index 0000000..36ea548 --- /dev/null +++ b/tajo-core/src/test/resources/results/TestTajoCli/testSelectResultWithNullTrueDeprecated.result @@ -0,0 +1,9 @@ +Warning: deprecated to directly use config key in TajoConf.ConfVars. Please execute '\help set'. +c_custkey, o_orderkey, o_orderstatus +------------------------------- +1, 1, O +2, 2, O +3, 3, F +4, testnull, testnull +5, testnull, testnull +(5 rows, , 30 B selected) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/resources/results/TestTajoCli/testStopWhenErrorDeprecated.result ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/resources/results/TestTajoCli/testStopWhenErrorDeprecated.result b/tajo-core/src/test/resources/results/TestTajoCli/testStopWhenErrorDeprecated.result new file mode 100644 index 0000000..5c49139 --- /dev/null +++ b/tajo-core/src/test/resources/results/TestTajoCli/testStopWhenErrorDeprecated.result @@ -0,0 +1,6 @@ +Warning: deprecated to directly use config key in TajoConf.ConfVars. Please execute '\help set'. +?count +------------------------------- +5 +(1 rows, , 2 B selected) +ERROR: relation "default.lineitem2" does not exist http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-storage/src/main/java/org/apache/tajo/storage/Appender.java ---------------------------------------------------------------------- diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/Appender.java b/tajo-storage/src/main/java/org/apache/tajo/storage/Appender.java index ed6ea34..5b42cbd 100644 --- a/tajo-storage/src/main/java/org/apache/tajo/storage/Appender.java +++ b/tajo-storage/src/main/java/org/apache/tajo/storage/Appender.java @@ -30,7 +30,7 @@ public interface Appender extends Closeable { void addTuple(Tuple t) throws IOException; void flush() throws IOException; - + void close() throws IOException; void enableStats(); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-storage/src/main/java/org/apache/tajo/storage/CSVFile.java ---------------------------------------------------------------------- diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/CSVFile.java b/tajo-storage/src/main/java/org/apache/tajo/storage/CSVFile.java index 8e26ec6..2113794 100644 --- a/tajo-storage/src/main/java/org/apache/tajo/storage/CSVFile.java +++ b/tajo-storage/src/main/java/org/apache/tajo/storage/CSVFile.java @@ -84,7 +84,9 @@ public class CSVFile { this.delimiter = StringEscapeUtils.unescapeJava(this.meta.getOption(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER)).charAt(0); this.columnNum = schema.size(); - String nullCharacters = StringEscapeUtils.unescapeJava(this.meta.getOption(StorageConstants.CSVFILE_NULL)); + + String nullCharacters = StringEscapeUtils.unescapeJava(this.meta.getOption(StorageConstants.CSVFILE_NULL, + NullDatum.DEFAULT_TEXT)); if (StringUtils.isEmpty(nullCharacters)) { nullChars = NullDatum.get().asTextBytes(); } else { @@ -107,8 +109,8 @@ public class CSVFile { isShuffle = false; } - String codecName = this.meta.getOption(StorageConstants.COMPRESSION_CODEC); - if(!StringUtils.isEmpty(codecName)){ + if(this.meta.containsOption(StorageConstants.COMPRESSION_CODEC)) { + String codecName = this.meta.getOption(StorageConstants.COMPRESSION_CODEC); codecFactory = new CompressionCodecFactory(conf); codec = codecFactory.getCodecByClassName(codecName); compressor = CodecPool.getCompressor(codec); @@ -262,7 +264,8 @@ public class CSVFile { String delim = meta.getOption(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); this.delimiter = StringEscapeUtils.unescapeJava(delim).charAt(0); - String nullCharacters = StringEscapeUtils.unescapeJava(meta.getOption(StorageConstants.CSVFILE_NULL)); + String nullCharacters = StringEscapeUtils.unescapeJava(meta.getOption(StorageConstants.CSVFILE_NULL, + NullDatum.DEFAULT_TEXT)); if (StringUtils.isEmpty(nullCharacters)) { nullChars = NullDatum.get().asTextBytes(); } else { http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-storage/src/main/java/org/apache/tajo/storage/StorageUtil.java ---------------------------------------------------------------------- diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/StorageUtil.java b/tajo-storage/src/main/java/org/apache/tajo/storage/StorageUtil.java index 5b2d711..07fa16b 100644 --- a/tajo-storage/src/main/java/org/apache/tajo/storage/StorageUtil.java +++ b/tajo-storage/src/main/java/org/apache/tajo/storage/StorageUtil.java @@ -114,18 +114,18 @@ public class StorageUtil extends StorageConstants { public static KeyValueSet newPhysicalProperties(CatalogProtos.StoreType type) { KeyValueSet options = new KeyValueSet(); if (CatalogProtos.StoreType.CSV == type) { - options.put(CSVFILE_DELIMITER, DEFAULT_FIELD_DELIMITER); + options.set(CSVFILE_DELIMITER, DEFAULT_FIELD_DELIMITER); } else if (CatalogProtos.StoreType.RCFILE == type) { - options.put(RCFILE_SERDE, DEFAULT_BINARY_SERDE); + options.set(RCFILE_SERDE, DEFAULT_BINARY_SERDE); } else if (CatalogProtos.StoreType.SEQUENCEFILE == type) { - options.put(SEQUENCEFILE_SERDE, DEFAULT_TEXT_SERDE); - options.put(SEQUENCEFILE_DELIMITER, DEFAULT_FIELD_DELIMITER); + options.set(SEQUENCEFILE_SERDE, DEFAULT_TEXT_SERDE); + options.set(SEQUENCEFILE_DELIMITER, DEFAULT_FIELD_DELIMITER); } else if (type == CatalogProtos.StoreType.PARQUET) { - options.put(ParquetOutputFormat.BLOCK_SIZE, PARQUET_DEFAULT_BLOCK_SIZE); - options.put(ParquetOutputFormat.PAGE_SIZE, PARQUET_DEFAULT_PAGE_SIZE); - options.put(ParquetOutputFormat.COMPRESSION, PARQUET_DEFAULT_COMPRESSION_CODEC_NAME); - options.put(ParquetOutputFormat.ENABLE_DICTIONARY, PARQUET_DEFAULT_IS_DICTIONARY_ENABLED); - options.put(ParquetOutputFormat.VALIDATION, PARQUET_DEFAULT_IS_VALIDATION_ENABLED); + options.set(ParquetOutputFormat.BLOCK_SIZE, PARQUET_DEFAULT_BLOCK_SIZE); + options.set(ParquetOutputFormat.PAGE_SIZE, PARQUET_DEFAULT_PAGE_SIZE); + options.set(ParquetOutputFormat.COMPRESSION, PARQUET_DEFAULT_COMPRESSION_CODEC_NAME); + options.set(ParquetOutputFormat.ENABLE_DICTIONARY, PARQUET_DEFAULT_IS_DICTIONARY_ENABLED); + options.set(ParquetOutputFormat.VALIDATION, PARQUET_DEFAULT_IS_VALIDATION_ENABLED); } return options; http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-storage/src/main/java/org/apache/tajo/storage/avro/AvroUtil.java ---------------------------------------------------------------------- diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/avro/AvroUtil.java b/tajo-storage/src/main/java/org/apache/tajo/storage/avro/AvroUtil.java index 962c63d..c15d20b 100644 --- a/tajo-storage/src/main/java/org/apache/tajo/storage/avro/AvroUtil.java +++ b/tajo-storage/src/main/java/org/apache/tajo/storage/avro/AvroUtil.java @@ -31,15 +31,20 @@ import org.apache.tajo.catalog.TableMeta; public class AvroUtil { public static Schema getAvroSchema(TableMeta meta, Configuration conf) throws IOException { - String schemaLiteral = meta.getOption(StorageConstants.AVRO_SCHEMA_LITERAL); - String schemaUrl = meta.getOption(StorageConstants.AVRO_SCHEMA_URL); - if (schemaLiteral == null && schemaUrl == null) { + + + boolean isSchemaLiteral = meta.containsOption(StorageConstants.AVRO_SCHEMA_LITERAL); + boolean isSchemaUrl = meta.containsOption(StorageConstants.AVRO_SCHEMA_URL); + if (!isSchemaLiteral && !isSchemaUrl) { throw new RuntimeException("No Avro schema for table."); } - if (schemaLiteral != null) { - return new Schema.Parser().parse(schemaLiteral); + if (isSchemaLiteral) { + String schema = meta.getOption(StorageConstants.AVRO_SCHEMA_LITERAL); + return new Schema.Parser().parse(schema); } - Path schemaPath = new Path(schemaUrl); + + String schemaURL = meta.getOption(StorageConstants.AVRO_SCHEMA_URL); + Path schemaPath = new Path(schemaURL); FileSystem fs = schemaPath.getFileSystem(conf); FSDataInputStream inputStream = fs.open(schemaPath); return new Schema.Parser().parse(inputStream); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-storage/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java ---------------------------------------------------------------------- diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java b/tajo-storage/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java index 78498c7..e5507ad 100644 --- a/tajo-storage/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java +++ b/tajo-storage/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java @@ -733,8 +733,8 @@ public class RCFile { isShuffle = false; } - String codecClassname = this.meta.getOption(StorageConstants.COMPRESSION_CODEC); - if (!StringUtils.isEmpty(codecClassname)) { + if (this.meta.containsOption(StorageConstants.COMPRESSION_CODEC)) { + String codecClassname = this.meta.getOption(StorageConstants.COMPRESSION_CODEC); try { Class<? extends CompressionCodec> codecClass = conf.getClassByName( codecClassname).asSubclass(CompressionCodec.class); @@ -745,7 +745,8 @@ public class RCFile { } } - String nullCharacters = StringEscapeUtils.unescapeJava(this.meta.getOption(StorageConstants.RCFILE_NULL)); + String nullCharacters = StringEscapeUtils.unescapeJava(this.meta.getOption(StorageConstants.RCFILE_NULL, + NullDatum.DEFAULT_TEXT)); if (StringUtils.isEmpty(nullCharacters)) { nullChars = NullDatum.get().asTextBytes(); } else { @@ -1193,7 +1194,8 @@ public class RCFile { rowId = new LongWritable(); readBytes = 0; - String nullCharacters = StringEscapeUtils.unescapeJava(meta.getOption(StorageConstants.RCFILE_NULL)); + String nullCharacters = StringEscapeUtils.unescapeJava(meta.getOption(StorageConstants.RCFILE_NULL, + NullDatum.DEFAULT_TEXT)); if (StringUtils.isEmpty(nullCharacters)) { nullChars = NullDatum.get().asTextBytes(); } else { http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-storage/src/main/java/org/apache/tajo/storage/sequencefile/SequenceFileAppender.java ---------------------------------------------------------------------- diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/sequencefile/SequenceFileAppender.java b/tajo-storage/src/main/java/org/apache/tajo/storage/sequencefile/SequenceFileAppender.java index 86d902a..f5cef62 100644 --- a/tajo-storage/src/main/java/org/apache/tajo/storage/sequencefile/SequenceFileAppender.java +++ b/tajo-storage/src/main/java/org/apache/tajo/storage/sequencefile/SequenceFileAppender.java @@ -97,7 +97,8 @@ public class SequenceFileAppender extends FileAppender { this.delimiter = StringEscapeUtils.unescapeJava(this.meta.getOption(StorageConstants.SEQUENCEFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER)).charAt(0); this.columnNum = schema.size(); - String nullCharacters = StringEscapeUtils.unescapeJava(this.meta.getOption(StorageConstants.SEQUENCEFILE_NULL)); + String nullCharacters = StringEscapeUtils.unescapeJava(this.meta.getOption(StorageConstants.SEQUENCEFILE_NULL, + NullDatum.DEFAULT_TEXT)); if (StringUtils.isEmpty(nullCharacters)) { nullChars = NullDatum.get().asTextBytes(); } else { @@ -108,8 +109,8 @@ public class SequenceFileAppender extends FileAppender { throw new FileNotFoundException(path.toString()); } - String codecName = this.meta.getOption(StorageConstants.COMPRESSION_CODEC); - if(!StringUtils.isEmpty(codecName)){ + if(this.meta.containsOption(StorageConstants.COMPRESSION_CODEC)) { + String codecName = this.meta.getOption(StorageConstants.COMPRESSION_CODEC); codecFactory = new CompressionCodecFactory(conf); codec = codecFactory.getCodecByClassName(codecName); } else { @@ -119,7 +120,8 @@ public class SequenceFileAppender extends FileAppender { } try { - String serdeClass = this.meta.getOption(StorageConstants.SEQUENCEFILE_SERDE, TextSerializerDeserializer.class.getName()); + String serdeClass = this.meta.getOption(StorageConstants.SEQUENCEFILE_SERDE, + TextSerializerDeserializer.class.getName()); serde = (SerializerDeserializer) Class.forName(serdeClass).newInstance(); } catch (Exception e) { LOG.error(e.getMessage(), e); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-storage/src/main/java/org/apache/tajo/storage/sequencefile/SequenceFileScanner.java ---------------------------------------------------------------------- diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/sequencefile/SequenceFileScanner.java b/tajo-storage/src/main/java/org/apache/tajo/storage/sequencefile/SequenceFileScanner.java index 3c39841..b0ef67d 100644 --- a/tajo-storage/src/main/java/org/apache/tajo/storage/sequencefile/SequenceFileScanner.java +++ b/tajo-storage/src/main/java/org/apache/tajo/storage/sequencefile/SequenceFileScanner.java @@ -25,7 +25,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.io.*; -import org.apache.hadoop.util.ReflectionUtils; import org.apache.tajo.catalog.Column; import org.apache.tajo.catalog.Schema; import org.apache.tajo.catalog.TableMeta; @@ -35,7 +34,6 @@ import org.apache.tajo.datum.NullDatum; import org.apache.tajo.storage.*; import org.apache.tajo.storage.fragment.FileFragment; import org.apache.tajo.util.BytesUtils; -import org.apache.tajo.util.ReflectionUtil; import java.io.IOException; @@ -86,7 +84,8 @@ public class SequenceFileScanner extends FileScanner { reader = new SequenceFile.Reader(fs, fragment.getPath(), conf); - String nullCharacters = StringEscapeUtils.unescapeJava(this.meta.getOption(StorageConstants.SEQUENCEFILE_NULL)); + String nullCharacters = StringEscapeUtils.unescapeJava(this.meta.getOption(StorageConstants.SEQUENCEFILE_NULL, + NullDatum.DEFAULT_TEXT)); if (StringUtils.isEmpty(nullCharacters)) { nullChars = NullDatum.get().asTextBytes(); } else { http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-storage/src/main/java/org/apache/tajo/storage/v2/RCFileScanner.java ---------------------------------------------------------------------- diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/v2/RCFileScanner.java b/tajo-storage/src/main/java/org/apache/tajo/storage/v2/RCFileScanner.java index 5d2f861..c8e19dd 100644 --- a/tajo-storage/src/main/java/org/apache/tajo/storage/v2/RCFileScanner.java +++ b/tajo-storage/src/main/java/org/apache/tajo/storage/v2/RCFileScanner.java @@ -70,7 +70,7 @@ public class RCFileScanner extends FileScannerV2 { key = new LongWritable(); column = new BytesRefArrayWritable(); - String nullCharacters = StringEscapeUtils.unescapeJava(this.meta.getOption(NULL)); + String nullCharacters = StringEscapeUtils.unescapeJava(this.meta.getOption(NULL, NullDatum.DEFAULT_TEXT)); if (StringUtils.isEmpty(nullCharacters)) { nullChars = NullDatum.get().asTextBytes(); } else {
