tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hyun...@apache.org
Subject git commit: TAJO-253: Clean up tajo-default.xml in test resource. (hyunsik)
Date Mon, 14 Oct 2013 15:53:27 GMT
Updated Branches:
  refs/heads/master 98b4d3150 -> 660606beb


TAJO-253: Clean up tajo-default.xml in test resource. (hyunsik)


Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/660606be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/660606be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/660606be

Branch: refs/heads/master
Commit: 660606beb6865e0a74cfb67cda076db107576a22
Parents: 98b4d31
Author: Hyunsik Choi <hyunsik@apache.org>
Authored: Tue Oct 15 00:53:06 2013 +0900
Committer: Hyunsik Choi <hyunsik@apache.org>
Committed: Tue Oct 15 00:53:06 2013 +0900

----------------------------------------------------------------------
 CHANGES.txt                                            |  2 ++
 .../src/main/resources/tajo-default.xml                |  2 +-
 .../test/java/org/apache/tajo/TajoTestingCluster.java  |  1 +
 .../java/org/apache/tajo/client/TestTajoClient.java    |  4 ++--
 .../java/org/apache/tajo/engine/eval/TestEvalTree.java |  2 +-
 .../org/apache/tajo/engine/eval/TestEvalTreeUtil.java  |  2 +-
 .../tajo/engine/planner/TestLogicalOptimizer.java      | 11 +++--------
 .../apache/tajo/engine/planner/TestLogicalPlan.java    |  2 +-
 .../apache/tajo/engine/planner/TestLogicalPlanner.java | 13 ++++---------
 .../apache/tajo/engine/planner/TestPlannerUtil.java    | 11 +++--------
 .../apache/tajo/master/TestExecutionBlockCursor.java   |  2 +-
 .../java/org/apache/tajo/master/TestGlobalPlanner.java |  2 +-
 .../src/test/resources/tajo-default.xml                | 13 +------------
 13 files changed, 22 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0c0b1fe..50625bd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -52,6 +52,8 @@ Release 0.2.0 - unreleased
 
   IMPROVEMENTS
 
+    TAJO-253: Clean up tajo-default.xml in test resource. (hyunsik)
+
     TAJO-239: Improving web UI. (Keuntae Park via hyunsik)
 
     TAJO-232: Rename join operators and add other join operators to

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/main/resources/tajo-default.xml
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/resources/tajo-default.xml b/tajo-core/tajo-core-backend/src/main/resources/tajo-default.xml
index bf52919..ac17805 100644
--- a/tajo-core/tajo-core-backend/src/main/resources/tajo-default.xml
+++ b/tajo-core/tajo-core-backend/src/main/resources/tajo-default.xml
@@ -27,7 +27,7 @@
 
   <property>
     <name>tajo.rootdir</name>
-    <value>file:///tmp/tajo-${user.name}</value>
+    <value>/tajo</value>
     <description>A base for other temporary directories.</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/TajoTestingCluster.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/TajoTestingCluster.java
b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/TajoTestingCluster.java
index 6bd990a..4602fcb 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/TajoTestingCluster.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/TajoTestingCluster.java
@@ -260,6 +260,7 @@ public class TajoTestingCluster {
     c.setVar(ConfVars.CATALOG_ADDRESS, "localhost:0");
     c.set(CatalogConstants.STORE_CLASS, "org.apache.tajo.catalog.store.MemStore");
     c.set(CatalogConstants.JDBC_URI, "jdbc:derby:" + testBuildDir.getAbsolutePath() + "/db");
+    c.setVar(ConfVars.TASK_LOCAL_DIR, "file://" + testBuildDir.getAbsolutePath() + "/tajo-localdir");
 
     LOG.info("derby repository is set to "+conf.get(CatalogConstants.JDBC_URI));
 

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/client/TestTajoClient.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/client/TestTajoClient.java
b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/client/TestTajoClient.java
index 61518e0..c732e11 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/client/TestTajoClient.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/client/TestTajoClient.java
@@ -117,7 +117,7 @@ public class TestTajoClient {
     TajoConf conf = cluster.getConfiguration();
     final String tableName = "testCreateAndDropExternalTableByExecuteQuery";
 
-    BackendTestingUtil.writeTmpTable(conf, "file:///tmp", tableName, false);
+    BackendTestingUtil.writeTmpTable(conf, CommonTestingUtil.getTestDir(), tableName, false);
     Path tablePath = writeTmpTable(tableName);
     assertFalse(tajo.existTable(tableName));
 
@@ -158,7 +158,7 @@ public class TestTajoClient {
   public final void testDDLByExecuteQuery() throws IOException, ServiceException {
     TajoConf conf = cluster.getConfiguration();
     final String tableName = "testDDLByExecuteQuery";
-    BackendTestingUtil.writeTmpTable(conf, "file:///tmp", tableName, false);
+    BackendTestingUtil.writeTmpTable(conf, CommonTestingUtil.getTestDir(), tableName, false);
 
     assertFalse(tajo.existTable(tableName));
     String sql =

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestEvalTree.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestEvalTree.java
b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestEvalTree.java
index 1fbd022..41d10b7 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestEvalTree.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestEvalTree.java
@@ -66,7 +66,7 @@ public class TestEvalTree {
     schema.addColumn("age", INT4);
 
     TableMeta meta = CatalogUtil.newTableMeta(schema, StoreType.CSV);
-    TableDesc desc = new TableDescImpl("people", meta, new Path("file:///"));
+    TableDesc desc = new TableDescImpl("people", meta, new Path("/"));
     cat.addTable(desc);
 
     FunctionDesc funcMeta = new FunctionDesc("test_sum", TestSum.class, FunctionType.GENERAL,

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
index a561a8c..a95510d 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
@@ -73,7 +73,7 @@ public class TestEvalTreeUtil {
     schema.addColumn("age", TajoDataTypes.Type.INT4);
 
     TableMeta meta = CatalogUtil.newTableMeta(schema, StoreType.CSV);
-    TableDesc desc = new TableDescImpl("people", meta, new Path("file:///"));
+    TableDesc desc = new TableDescImpl("people", meta, new Path("/"));
     catalog.addTable(desc);
 
     FunctionDesc funcMeta = new FunctionDesc("test_sum", TestSum.class,

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java
b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java
index 382ecf5..1043770 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java
@@ -67,18 +67,13 @@ public class TestLogicalOptimizer {
     schema3.addColumn("phone", Type.INT4);
 
     TableMeta meta = CatalogUtil.newTableMeta(schema, StoreType.CSV);
-    TableDesc people = new TableDescImpl("employee", meta,
-        new Path("file:///"));
+    TableDesc people = new TableDescImpl("employee", meta, new Path("/"));
     catalog.addTable(people);
 
-    TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV,
-        new Options(),
-        new Path("file:///"));
+    TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV, new Options(),
new Path("/"));
     catalog.addTable(student);
 
-    TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV,
-        new Options(),
-        new Path("file:///"));
+    TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV, new Options(), new
Path("/"));
     catalog.addTable(score);
 
     FunctionDesc funcDesc = new FunctionDesc("sumtest", SumInt.class, FunctionType.GENERAL,

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlan.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlan.java
b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlan.java
index 9b8307d..e58cd98 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlan.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlan.java
@@ -71,7 +71,7 @@ public class TestLogicalPlan {
       TableStat stat = new TableStat();
       stat.setNumBytes(tableVolumns[i]);
       m.setStat(stat);
-      TableDesc d = CatalogUtil.newTableDesc(tpchTables[i], m, new Path("file:///"));
+      TableDesc d = CatalogUtil.newTableDesc(tpchTables[i], m, new Path("/"));
       catalog.addTable(d);
     }
     planner = new LogicalPlanner(catalog);

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
index 989e3ce..e850d26 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
@@ -76,18 +76,13 @@ public class TestLogicalPlanner {
     schema3.addColumn("score", Type.INT4);
 
     TableMeta meta = CatalogUtil.newTableMeta(schema, StoreType.CSV);
-    TableDesc people = new TableDescImpl("employee", meta,
-        new Path("file:///"));
+    TableDesc people = new TableDescImpl("employee", meta, new Path("/"));
     catalog.addTable(people);
 
-    TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV,
-        new Options(),
-        new Path("file:///"));
+    TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV, new Options(),
new Path("/"));
     catalog.addTable(student);
 
-    TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV,
-        new Options(),
-        new Path("file:///"));
+    TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV, new Options(), new
Path("/"));
     catalog.addTable(score);
 
     FunctionDesc funcDesc = new FunctionDesc("sumtest", SumInt.class, FunctionType.AGGREGATION,
@@ -104,7 +99,7 @@ public class TestLogicalPlanner {
     tpch.loadOutSchema();
     for (String table : tpchTables) {
       TableMeta m = CatalogUtil.newTableMeta(tpch.getSchema(table), StoreType.CSV);
-      TableDesc d = CatalogUtil.newTableDesc(table, m, new Path("file:///"));
+      TableDesc d = CatalogUtil.newTableDesc(table, m, new Path("/"));
       catalog.addTable(d);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java
b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java
index 3fce9d2..857c791 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java
@@ -67,18 +67,13 @@ public class TestPlannerUtil {
     schema3.addColumn("score", CatalogUtil.newSimpleDataType(Type.INT4));
 
     TableMeta meta = CatalogUtil.newTableMeta(schema, StoreType.CSV);
-    TableDesc people = new TableDescImpl("employee", meta,
-        new Path("file:///"));
+    TableDesc people = new TableDescImpl("employee", meta, new Path("/"));
     catalog.addTable(people);
 
-    TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV, 
-        new Options(),
-        new Path("file:///"));
+    TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV, new Options(),
new Path("/"));
     catalog.addTable(student);
 
-    TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV,
-        new Options(),
-        new Path("file:///"));
+    TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV, new Options(), new
Path("/"));
     catalog.addTable(score);
 
     FunctionDesc funcDesc = new FunctionDesc("sumtest", SumInt.class, FunctionType.AGGREGATION,

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java
b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java
index 0424200..4632a97 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java
@@ -63,7 +63,7 @@ public class TestExecutionBlockCursor {
     for (String table : tpch.getTableNames()) {
       TableMeta m = CatalogUtil.newTableMeta(tpch.getSchema(table), CatalogProtos.StoreType.CSV);
       m.setStat(new TableStat());
-      TableDesc d = CatalogUtil.newTableDesc(table, m, new Path("file:///"));
+      TableDesc d = CatalogUtil.newTableDesc(table, m, new Path("/"));
       catalog.addTable(d);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java
b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java
index bc616c6..4a91af3 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java
@@ -75,7 +75,7 @@ public class TestGlobalPlanner {
       stat.setNumBytes(volumes[i]);
       m.setStat(stat);
 
-      TableDesc d = CatalogUtil.newTableDesc(tables[i], m, new Path("file:///"));
+      TableDesc d = CatalogUtil.newTableDesc(tables[i], m, new Path("/"));
       catalog.addTable(d);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/660606be/tajo-core/tajo-core-backend/src/test/resources/tajo-default.xml
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/resources/tajo-default.xml b/tajo-core/tajo-core-backend/src/test/resources/tajo-default.xml
index a7a7f64..20573d3 100644
--- a/tajo-core/tajo-core-backend/src/test/resources/tajo-default.xml
+++ b/tajo-core/tajo-core-backend/src/test/resources/tajo-default.xml
@@ -27,7 +27,7 @@
 
   <property>
     <name>tajo.rootdir</name>
-    <value>file:///tmp/tajo-${user.name}</value>
+    <value>/tajo</value>
     <description>A base for other temporary directories.</description>
   </property>
 
@@ -37,18 +37,7 @@
   </property>
 
   <property>
-    <name>tajo.task.localdir</name>
-    <value>/tmp/tajo-localdir</value>
-  </property>
-
-  <property>
     <name>tajo.resource.manager</name>
     <value>org.apache.tajo.master.rm.TajoWorkerResourceManager</value>
   </property>
-
-  <property>
-    <name>tajo.master.manager.addr</name>
-    <value>127.0.0.1:0</value>
-  </property>
-
 </configuration>


Mime
View raw message