You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2013/10/17 13:26:21 UTC
git commit: TAJO-262: Integration test hang on jenkins. (jinho)
Updated Branches:
refs/heads/master 95fa2667b -> f5a18dbfc
TAJO-262: Integration test hang on jenkins. (jinho)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/f5a18dbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/f5a18dbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/f5a18dbf
Branch: refs/heads/master
Commit: f5a18dbfcf420950ff715d7cc25834036cc7d578
Parents: 95fa266
Author: jinossy <ji...@gmail.com>
Authored: Thu Oct 17 20:25:46 2013 +0900
Committer: jinossy <ji...@gmail.com>
Committed: Thu Oct 17 20:25:46 2013 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../org/apache/tajo/catalog/TestTableDesc.java | 28 +++++++++++++-------
.../org/apache/tajo/catalog/TestCatalog.java | 5 ++--
.../org/apache/tajo/catalog/TestDBStore.java | 13 ++++-----
.../org/apache/tajo/TajoTestingCluster.java | 16 ++++++++++-
.../org/apache/tajo/client/TestDDLBuilder.java | 1 -
.../apache/tajo/engine/eval/ExprTestBase.java | 10 ++++---
.../apache/tajo/engine/eval/TestEvalTree.java | 4 +--
.../tajo/engine/eval/TestEvalTreeUtil.java | 4 +--
.../apache/tajo/engine/eval/TestPredicates.java | 10 ++++---
.../tajo/engine/eval/TestSQLExpression.java | 6 +++--
.../function/TestPatternMatchingPredicates.java | 14 +++++-----
.../TestStringOperatorsAndFunctions.java | 20 +++++++-------
.../engine/planner/TestLogicalOptimizer.java | 8 +++---
.../tajo/engine/planner/TestLogicalPlan.java | 8 +++---
.../tajo/engine/planner/TestLogicalPlanner.java | 10 +++----
.../tajo/engine/planner/TestPlannerUtil.java | 8 +++---
.../tajo/engine/query/TestResultSetImpl.java | 6 ++---
.../tajo/master/TestExecutionBlockCursor.java | 10 ++++---
.../apache/tajo/master/TestGlobalPlanner.java | 4 +--
.../org/apache/tajo/storage/TestFragment.java | 15 ++++++-----
.../org/apache/tajo/storage/TestRowFile.java | 5 ++--
22 files changed, 123 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a487e93..c6cdff5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -211,6 +211,8 @@ Release 0.2.0 - unreleased
BUG FIXES
+ TAJO-262: Integration test hang on jenkins. (jinho)
+
TAJO-257: Unit tests occassionally fail. (hyunsik)
TAJO-169: the default TAJO_WORKER_STANDBY_MODE in tajo-env.sh is wrong.
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/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 0471b04..64c967e 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
@@ -21,46 +21,53 @@ package org.apache.tajo.catalog;
import org.apache.hadoop.fs.Path;
import org.apache.tajo.catalog.json.CatalogGsonHelper;
import org.apache.tajo.catalog.proto.CatalogProtos;
+import org.apache.tajo.util.CommonTestingUtil;
import org.junit.Before;
import org.junit.Test;
import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.common.TajoDataTypes.Type;
+import java.io.IOException;
+
import static org.junit.Assert.assertEquals;
public class TestTableDesc {
TableMeta info;
TableDesc desc;
+ Path path;
@Before
- public void setup() {
+ public void setup() throws IOException {
Schema schema = new Schema();
schema.addColumn("name", Type.BLOB);
schema.addColumn("addr", Type.TEXT);
info = CatalogUtil.newTableMeta(schema, StoreType.CSV);
-
- desc = new TableDescImpl("table1", info, new Path("/table1"));
+ path = new Path(CommonTestingUtil.getTestDir(), "table1");
+ desc = new TableDescImpl("table1", info, path);
}
@Test
- public void test() throws CloneNotSupportedException {
+ public void test() throws CloneNotSupportedException, IOException {
Schema schema = new Schema();
schema.addColumn("name", Type.BLOB);
schema.addColumn("addr", Type.TEXT);
TableMeta info = CatalogUtil.newTableMeta(schema, StoreType.CSV);
testClone(info);
- TableDesc desc = new TableDescImpl("table1", info, new Path("/tajo"));
+ Path path = new Path(CommonTestingUtil.getTestDir(), "tajo");
+
+ TableDesc desc = new TableDescImpl("table1", info, path);
assertEquals("table1", desc.getName());
- assertEquals(new Path("/tajo"), desc.getPath());
+ assertEquals(path, desc.getPath());
assertEquals(info, desc.getMeta());
testClone(desc);
}
@Test
- public void testGetProto() throws CloneNotSupportedException {
- TableDesc desc = new TableDescImpl("table1", info, new Path("/tajo"));
+ public void testGetProto() throws CloneNotSupportedException, IOException {
+ Path path = new Path(CommonTestingUtil.getTestDir(), "tajo");
+ TableDesc desc = new TableDescImpl("table1", info, path);
CatalogProtos.TableDescProto proto = (CatalogProtos.TableDescProto) desc.getProto();
TableDesc fromProto = new TableDescImpl(proto);
@@ -68,8 +75,9 @@ public class TestTableDesc {
}
@Test
- public void testToJson() throws CloneNotSupportedException {
- TableDesc desc = new TableDescImpl("table1", info, new Path("/tajo"));
+ public void testToJson() throws CloneNotSupportedException, IOException {
+ Path path = new Path(CommonTestingUtil.getTestDir(), "tajo");
+ TableDesc desc = new TableDescImpl("table1", info, path);
String json = desc.toJson();
TableDesc fromJson = CatalogGsonHelper.fromJson(json, TableDesc.class);
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/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 97824b2..b692597 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
@@ -26,6 +26,7 @@ import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.common.TajoDataTypes;
import org.apache.tajo.common.TajoDataTypes.Type;
import org.apache.tajo.conf.TajoConf;
+import org.apache.tajo.util.CommonTestingUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -68,13 +69,13 @@ public class TestCatalog {
schema1.addColumn(FieldName1, Type.BLOB);
schema1.addColumn(FieldName2, Type.INT4);
schema1.addColumn(FieldName3, Type.INT8);
-
+ Path path = new Path(CommonTestingUtil.getTestDir(), "table1");
TableDesc meta = CatalogUtil.newTableDesc(
"getTable",
schema1,
StoreType.CSV,
new Options(),
- new Path("/table1"));
+ path);
assertFalse(catalog.existsTable("getTable"));
catalog.addTable(meta);
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestDBStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestDBStore.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestDBStore.java
index 183746d..71672be 100644
--- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestDBStore.java
+++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestDBStore.java
@@ -34,6 +34,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import java.io.File;
+import java.io.IOException;
import static org.junit.Assert.*;
@@ -69,7 +70,7 @@ public class TestDBStore {
Options opts = new Options();
opts.put("file.delimiter", ",");
TableMeta meta = CatalogUtil.newTableMeta(schema, StoreType.CSV, opts);
- TableDesc desc = new TableDescImpl(tableName, meta, new Path("/addedtable"));
+ TableDesc desc = new TableDescImpl(tableName, meta, new Path(CommonTestingUtil.getTestDir(), "addedtable"));
assertFalse(store.existTable(tableName));
store.addTable(desc);
assertTrue(store.existTable(tableName));
@@ -99,7 +100,7 @@ public class TestDBStore {
stat.setNumBytes(1023234);
meta.setStat(stat);
- TableDesc desc = new TableDescImpl(tableName, meta, new Path("/gettable"));
+ TableDesc desc = new TableDescImpl(tableName, meta, new Path(CommonTestingUtil.getTestDir(), "gettable"));
store.addTable(desc);
TableDesc retrieved = store.getTable(tableName);
@@ -124,8 +125,8 @@ public class TestDBStore {
for (int i = 0; i < numTables; i++) {
String tableName = "tableA_" + i;
TableMeta meta = CatalogUtil.newTableMeta(schema, StoreType.CSV);
- TableDesc desc = new TableDescImpl(tableName, meta,
- new Path("/tableA_" + i));
+ TableDesc desc = new TableDescImpl(tableName, meta,
+ new Path(CommonTestingUtil.getTestDir(), "tableA_" + i));
store.addTable(desc);
}
@@ -195,7 +196,7 @@ public class TestDBStore {
store.deleteTable(table.getName());
}
- public static TableDesc prepareTable() {
+ public static TableDesc prepareTable() throws IOException {
Schema schema = new Schema();
schema.addColumn("indexed.id", Type.INT4)
.addColumn("indexed.name", Type.TEXT)
@@ -205,7 +206,7 @@ public class TestDBStore {
String tableName = "indexed";
TableMeta meta = CatalogUtil.newTableMeta(schema, StoreType.CSV);
- return new TableDescImpl(tableName, meta, new Path("/indexed"));
+ return new TableDescImpl(tableName, meta, new Path(CommonTestingUtil.getTestDir(), "indexed"));
}
public static void assertSchemaOrder(Schema s1, Schema s2) {
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/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 b4ec3c0..7f0e407 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
@@ -189,6 +189,7 @@ public class TajoTestingCluster {
builder.format(true);
builder.manageNameDfsDirs(true);
builder.manageDataDfsDirs(true);
+ builder.waitSafeMode(true);
this.dfsCluster = builder.build();
// Set this just-started cluser as our filesystem.
@@ -204,6 +205,12 @@ public class TajoTestingCluster {
public void shutdownMiniDFSCluster() throws Exception {
if (this.dfsCluster != null) {
+ try {
+ FileSystem fs = this.dfsCluster.getFileSystem();
+ if (fs != null) fs.close();
+ } catch (IOException e) {
+ System.err.println("error closing file system: " + e);
+ }
// The below throws an exception per dn, AsynchronousCloseException.
this.dfsCluster.shutdown();
}
@@ -477,7 +484,14 @@ public class TajoTestingCluster {
}
if(this.dfsCluster != null) {
- this.dfsCluster.shutdown();
+
+ try {
+ FileSystem fs = this.dfsCluster.getFileSystem();
+ if (fs != null) fs.close();
+ this.dfsCluster.shutdown();
+ } catch (IOException e) {
+ System.err.println("error closing file system: " + e);
+ }
}
if(this.clusterTestBuildDir != null && this.clusterTestBuildDir.exists()) {
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/client/TestDDLBuilder.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/client/TestDDLBuilder.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/client/TestDDLBuilder.java
index d4e31b2..6123f59 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/client/TestDDLBuilder.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/client/TestDDLBuilder.java
@@ -41,7 +41,6 @@ public class TestDDLBuilder {
meta.putOption("csv.delimiter", "|");
meta.putOption(TableMeta.COMPRESSION_CODEC, GzipCodec.class.getName());
-
TableDesc desc = new TableDescImpl("table1", meta, new Path("/table1"));
assertEquals(FileUtil.readTextFile(new File("src/test/results/testBuildDDL.result")), DDLBuilder.buildDDL(desc));
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
index dd1f894..95f024c 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
@@ -18,7 +18,6 @@
package org.apache.tajo.engine.eval;
-import org.apache.hadoop.fs.Path;
import org.apache.tajo.TajoTestingCluster;
import org.apache.tajo.algebra.Expr;
import org.apache.tajo.catalog.*;
@@ -36,9 +35,12 @@ import org.apache.tajo.storage.LazyTuple;
import org.apache.tajo.storage.Tuple;
import org.apache.tajo.storage.VTuple;
import org.apache.tajo.util.Bytes;
+import org.apache.tajo.util.CommonTestingUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import java.io.IOException;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -85,11 +87,11 @@ public class ExprTestBase {
return targets;
}
- public void testSimpleEval(String query, String [] expected) {
+ public void testSimpleEval(String query, String [] expected) throws IOException {
testEval(null, null, null, query, expected);
}
- public void testEval(Schema schema, String tableName, String csvTuple, String query, String [] expected) {
+ public void testEval(Schema schema, String tableName, String csvTuple, String query, String [] expected) throws IOException {
LazyTuple lazyTuple;
VTuple vtuple = null;
Schema inputSchema = null;
@@ -112,7 +114,7 @@ public class ExprTestBase {
vtuple.put(i, lazyTuple.get(i));
}
}
- cat.addTable(new TableDescImpl(tableName, inputSchema, CatalogProtos.StoreType.CSV, new Options(), new Path("/")));
+ cat.addTable(new TableDescImpl(tableName, inputSchema, CatalogProtos.StoreType.CSV, new Options(), CommonTestingUtil.getTestDir()));
}
Target [] targets = null;
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/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 41d10b7..1304de5 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
@@ -18,7 +18,6 @@
package org.apache.tajo.engine.eval;
-import org.apache.hadoop.fs.Path;
import org.apache.tajo.TajoTestingCluster;
import org.apache.tajo.algebra.Expr;
import org.apache.tajo.catalog.*;
@@ -37,6 +36,7 @@ import org.apache.tajo.engine.planner.Target;
import org.apache.tajo.master.TajoMaster;
import org.apache.tajo.storage.Tuple;
import org.apache.tajo.storage.VTuple;
+import org.apache.tajo.util.CommonTestingUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -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("/"));
+ TableDesc desc = new TableDescImpl("people", meta, CommonTestingUtil.getTestDir());
cat.addTable(desc);
FunctionDesc funcMeta = new FunctionDesc("test_sum", TestSum.class, FunctionType.GENERAL,
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/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 a95510d..b4edf6a 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
@@ -19,7 +19,6 @@
package org.apache.tajo.engine.eval;
import com.google.common.collect.Sets;
-import org.apache.hadoop.fs.Path;
import org.apache.tajo.TajoTestingCluster;
import org.apache.tajo.algebra.Expr;
import org.apache.tajo.catalog.*;
@@ -37,6 +36,7 @@ import org.apache.tajo.engine.planner.logical.EvalExprNode;
import org.apache.tajo.engine.planner.logical.NodeType;
import org.apache.tajo.exception.InternalException;
import org.apache.tajo.master.TajoMaster;
+import org.apache.tajo.util.CommonTestingUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -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("/"));
+ TableDesc desc = new TableDescImpl("people", meta, CommonTestingUtil.getTestDir());
catalog.addTable(desc);
FunctionDesc funcMeta = new FunctionDesc("test_sum", TestSum.class,
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestPredicates.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestPredicates.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestPredicates.java
index d678b0b..30bf56f 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestPredicates.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestPredicates.java
@@ -21,12 +21,14 @@ package org.apache.tajo.engine.eval;
import org.apache.tajo.catalog.Schema;
import org.junit.Test;
+import java.io.IOException;
+
import static org.apache.tajo.common.TajoDataTypes.Type.INT4;
import static org.apache.tajo.common.TajoDataTypes.Type.TEXT;
public class TestPredicates extends ExprTestBase {
@Test
- public void testIsNullPredicate() {
+ public void testIsNullPredicate() throws IOException {
Schema schema1 = new Schema();
schema1.addColumn("col1", INT4);
schema1.addColumn("col2", INT4);
@@ -37,7 +39,7 @@ public class TestPredicates extends ExprTestBase {
}
@Test
- public void testIsNullPredicateWithFunction() {
+ public void testIsNullPredicateWithFunction() throws IOException {
Schema schema2 = new Schema();
schema2.addColumn("col1", TEXT);
schema2.addColumn("col2", TEXT);
@@ -49,7 +51,7 @@ public class TestPredicates extends ExprTestBase {
}
@Test
- public void testBetween() {
+ public void testBetween() throws IOException {
Schema schema2 = new Schema();
schema2.addColumn("col1", TEXT);
schema2.addColumn("col2", TEXT);
@@ -73,7 +75,7 @@ public class TestPredicates extends ExprTestBase {
}
@Test
- public void testBetween2() { // for TAJO-249
+ public void testBetween2() throws IOException { // for TAJO-249
Schema schema3 = new Schema();
schema3.addColumn("date_a", INT4);
schema3.addColumn("date_b", INT4);
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestSQLExpression.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestSQLExpression.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestSQLExpression.java
index 21a94f2..7311bff 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestSQLExpression.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/eval/TestSQLExpression.java
@@ -21,12 +21,14 @@ package org.apache.tajo.engine.eval;
import org.apache.tajo.catalog.Schema;
import org.junit.Test;
+import java.io.IOException;
+
import static org.apache.tajo.common.TajoDataTypes.Type.TEXT;
public class TestSQLExpression extends ExprTestBase {
@Test
- public void testCast() {
+ public void testCast() throws IOException {
testSimpleEval("select cast (1 as char)", new String[] {"1"});
testSimpleEval("select cast (119 as char)", new String[] {"1"});
@@ -59,7 +61,7 @@ public class TestSQLExpression extends ExprTestBase {
}
@Test
- public void testCastFromTable() {
+ public void testCastFromTable() throws IOException {
Schema schema = new Schema();
schema.addColumn("col1", TEXT);
schema.addColumn("col2", TEXT);
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestPatternMatchingPredicates.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestPatternMatchingPredicates.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestPatternMatchingPredicates.java
index e404a0b..7d8eba4 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestPatternMatchingPredicates.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestPatternMatchingPredicates.java
@@ -22,12 +22,14 @@ import org.apache.tajo.catalog.Schema;
import org.apache.tajo.engine.eval.ExprTestBase;
import org.junit.Test;
+import java.io.IOException;
+
import static org.apache.tajo.common.TajoDataTypes.Type.TEXT;
public class TestPatternMatchingPredicates extends ExprTestBase {
@Test
- public void testLike() {
+ public void testLike() throws IOException {
Schema schema = new Schema();
schema.addColumn("col1", TEXT);
@@ -56,7 +58,7 @@ public class TestPatternMatchingPredicates extends ExprTestBase {
}
@Test
- public void testILike() {
+ public void testILike() throws IOException {
testSimpleEval("select 'abc' ilike '%c'", new String[]{"t"});
testSimpleEval("select 'abc' ilike 'a%'", new String[]{"t"});
testSimpleEval("select 'abc' ilike '_bc'", new String[]{"t"});
@@ -78,7 +80,7 @@ public class TestPatternMatchingPredicates extends ExprTestBase {
}
@Test
- public void testSimilarToLike() {
+ public void testSimilarToLike() throws IOException {
testSimpleEval("select 'abc' similar to '%c'", new String[]{"t"});
testSimpleEval("select 'abc' similar to 'a%'", new String[]{"t"});
testSimpleEval("select 'abc' similar to '_bc'", new String[]{"t"});
@@ -102,7 +104,7 @@ public class TestPatternMatchingPredicates extends ExprTestBase {
}
@Test
- public void testRegexWithSimilarOperator() {
+ public void testRegexWithSimilarOperator() throws IOException {
testSimpleEval("select 'abc' ~ '.*c'", new String[]{"t"});
testSimpleEval("select 'abc' ~ '.*c$'", new String[]{"t"});
testSimpleEval("select 'aaabc' ~ '([a-z]){3}bc'", new String[]{"t"});
@@ -119,7 +121,7 @@ public class TestPatternMatchingPredicates extends ExprTestBase {
}
@Test
- public void testRegexp() {
+ public void testRegexp() throws IOException {
testSimpleEval("select 'abc' regexp '.*c'", new String[]{"t"});
testSimpleEval("select 'abc' regexp '.*c$'", new String[]{"t"});
@@ -128,7 +130,7 @@ public class TestPatternMatchingPredicates extends ExprTestBase {
}
@Test
- public void testRLike() {
+ public void testRLike() throws IOException {
testSimpleEval("select 'abc' rlike '.*c'", new String[]{"t"});
testSimpleEval("select 'abc' rlike '.*c$'", new String[]{"t"});
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestStringOperatorsAndFunctions.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestStringOperatorsAndFunctions.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestStringOperatorsAndFunctions.java
index 4f13de7..8d259ab 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestStringOperatorsAndFunctions.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/function/TestStringOperatorsAndFunctions.java
@@ -23,6 +23,8 @@ import org.apache.tajo.catalog.Schema;
import org.apache.tajo.engine.eval.ExprTestBase;
import org.junit.Test;
+import java.io.IOException;
+
import static org.apache.tajo.common.TajoDataTypes.Type.FLOAT8;
import static org.apache.tajo.common.TajoDataTypes.Type.INT4;
import static org.apache.tajo.common.TajoDataTypes.Type.TEXT;
@@ -30,7 +32,7 @@ import static org.apache.tajo.common.TajoDataTypes.Type.TEXT;
public class TestStringOperatorsAndFunctions extends ExprTestBase {
@Test
- public void testConcatenateOnLiteral() {
+ public void testConcatenateOnLiteral() throws IOException {
testSimpleEval("select ('abc' || 'def') col1 ", new String[]{"abcdef"});
testSimpleEval("select 'abc' || 'def' as col1 ", new String[]{"abcdef"});
testSimpleEval("select 1 || 'def' as col1 ", new String[]{"1def"});
@@ -38,7 +40,7 @@ public class TestStringOperatorsAndFunctions extends ExprTestBase {
}
@Test
- public void testConcatenateOnExpressions() {
+ public void testConcatenateOnExpressions() throws IOException {
Schema schema = new Schema();
schema.addColumn("col1", TEXT);
schema.addColumn("col2", INT4);
@@ -51,7 +53,7 @@ public class TestStringOperatorsAndFunctions extends ExprTestBase {
}
@Test
- public void testLTrim() {
+ public void testLTrim() throws IOException {
Schema schema = new Schema();
schema.addColumn("col1", TEXT);
schema.addColumn("col2", TEXT);
@@ -72,7 +74,7 @@ public class TestStringOperatorsAndFunctions extends ExprTestBase {
}
@Test
- public void testRTrim() {
+ public void testRTrim() throws IOException {
Schema schema = new Schema();
schema.addColumn("col1", TEXT);
schema.addColumn("col2", TEXT);
@@ -93,7 +95,7 @@ public class TestStringOperatorsAndFunctions extends ExprTestBase {
}
@Test
- public void testTrim() {
+ public void testTrim() throws IOException {
Schema schema = new Schema();
schema.addColumn("col1", TEXT);
schema.addColumn("col2", TEXT);
@@ -114,7 +116,7 @@ public class TestStringOperatorsAndFunctions extends ExprTestBase {
}
@Test
- public void testRegexReplace() {
+ public void testRegexReplace() throws IOException {
testSimpleEval("select regexp_replace('abcdef','bc','--') as col1 ", new String[]{"a--def"});
// TODO - The following tests require the resolution of TAJO-215 (https://issues.apache.org/jira/browse/TAJO-215)
@@ -140,7 +142,7 @@ public class TestStringOperatorsAndFunctions extends ExprTestBase {
}
@Test
- public void testUpper() {
+ public void testUpper() throws IOException {
testSimpleEval("select upper('abcdef') as col1 ", new String[]{"ABCDEF"});
Schema schema = new Schema();
@@ -153,7 +155,7 @@ public class TestStringOperatorsAndFunctions extends ExprTestBase {
}
@Test
- public void testLower() {
+ public void testLower() throws IOException {
testSimpleEval("select lower('ABCdEF') as col1 ", new String[]{"abcdef"});
Schema schema = new Schema();
@@ -166,7 +168,7 @@ public class TestStringOperatorsAndFunctions extends ExprTestBase {
}
@Test
- public void testCharLength() {
+ public void testCharLength() throws IOException {
testSimpleEval("select char_length('123456') as col1 ", new String[]{"6"});
Schema schema = new Schema();
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/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 1043770..8b25cf6 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
@@ -18,7 +18,6 @@
package org.apache.tajo.engine.planner;
-import org.apache.hadoop.fs.Path;
import org.apache.tajo.TajoTestingCluster;
import org.apache.tajo.algebra.Expr;
import org.apache.tajo.catalog.*;
@@ -29,6 +28,7 @@ import org.apache.tajo.engine.function.builtin.SumInt;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.engine.planner.logical.*;
import org.apache.tajo.master.TajoMaster;
+import org.apache.tajo.util.CommonTestingUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -67,13 +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("/"));
+ TableDesc people = new TableDescImpl("employee", meta, CommonTestingUtil.getTestDir());
catalog.addTable(people);
- TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV, new Options(), new Path("/"));
+ TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV, new Options(), CommonTestingUtil.getTestDir());
catalog.addTable(student);
- TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV, new Options(), new Path("/"));
+ TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV, new Options(), CommonTestingUtil.getTestDir());
catalog.addTable(score);
FunctionDesc funcDesc = new FunctionDesc("sumtest", SumInt.class, FunctionType.GENERAL,
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/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 e58cd98..d830591 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
@@ -18,7 +18,6 @@
package org.apache.tajo.engine.planner;
-import org.apache.hadoop.fs.Path;
import org.apache.tajo.TajoTestingCluster;
import org.apache.tajo.benchmark.TPCH;
import org.apache.tajo.catalog.*;
@@ -27,6 +26,7 @@ import org.apache.tajo.catalog.statistics.TableStat;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.engine.planner.graph.SimpleDirectedGraph;
import org.apache.tajo.master.TajoMaster;
+import org.apache.tajo.util.CommonTestingUtil;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -34,9 +34,7 @@ import java.util.HashSet;
import java.util.Set;
import static org.apache.tajo.engine.planner.LogicalPlan.BlockType;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
public class TestLogicalPlan {
private static TajoTestingCluster util;
@@ -71,7 +69,7 @@ public class TestLogicalPlan {
TableStat stat = new TableStat();
stat.setNumBytes(tableVolumns[i]);
m.setStat(stat);
- TableDesc d = CatalogUtil.newTableDesc(tpchTables[i], m, new Path("/"));
+ TableDesc d = CatalogUtil.newTableDesc(tpchTables[i], m, CommonTestingUtil.getTestDir());
catalog.addTable(d);
}
planner = new LogicalPlanner(catalog);
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/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 e850d26..d6bd545 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
@@ -20,7 +20,6 @@ package org.apache.tajo.engine.planner;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import org.apache.hadoop.fs.Path;
import org.apache.tajo.TajoTestingCluster;
import org.apache.tajo.algebra.Expr;
import org.apache.tajo.algebra.JoinType;
@@ -35,6 +34,7 @@ import org.apache.tajo.engine.json.CoreGsonHelper;
import org.apache.tajo.engine.parser.SQLAnalyzer;
import org.apache.tajo.engine.planner.logical.*;
import org.apache.tajo.master.TajoMaster;
+import org.apache.tajo.util.CommonTestingUtil;
import org.apache.tajo.util.FileUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -76,13 +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("/"));
+ TableDesc people = new TableDescImpl("employee", meta, CommonTestingUtil.getTestDir());
catalog.addTable(people);
- TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV, new Options(), new Path("/"));
+ TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV, new Options(), CommonTestingUtil.getTestDir());
catalog.addTable(student);
- TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV, new Options(), new Path("/"));
+ TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV, new Options(), CommonTestingUtil.getTestDir());
catalog.addTable(score);
FunctionDesc funcDesc = new FunctionDesc("sumtest", SumInt.class, FunctionType.AGGREGATION,
@@ -99,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("/"));
+ TableDesc d = CatalogUtil.newTableDesc(table, m, CommonTestingUtil.getTestDir());
catalog.addTable(d);
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/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 857c791..b2727b2 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
@@ -18,7 +18,6 @@
package org.apache.tajo.engine.planner;
-import org.apache.hadoop.fs.Path;
import org.apache.tajo.TajoTestingCluster;
import org.apache.tajo.algebra.Expr;
import org.apache.tajo.catalog.*;
@@ -33,6 +32,7 @@ import org.apache.tajo.engine.planner.logical.*;
import org.apache.tajo.storage.Tuple;
import org.apache.tajo.storage.TupleComparator;
import org.apache.tajo.storage.VTuple;
+import org.apache.tajo.util.CommonTestingUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -67,13 +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("/"));
+ TableDesc people = new TableDescImpl("employee", meta, CommonTestingUtil.getTestDir());
catalog.addTable(people);
- TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV, new Options(), new Path("/"));
+ TableDesc student = new TableDescImpl("dept", schema2, StoreType.CSV, new Options(), CommonTestingUtil.getTestDir());
catalog.addTable(student);
- TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV, new Options(), new Path("/"));
+ TableDesc score = new TableDescImpl("score", schema3, StoreType.CSV, new Options(), CommonTestingUtil.getTestDir());
catalog.addTable(score);
FunctionDesc funcDesc = new FunctionDesc("sumtest", SumInt.class, FunctionType.AGGREGATION,
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/query/TestResultSetImpl.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/query/TestResultSetImpl.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/query/TestResultSetImpl.java
index 2b04fef..643d363 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/query/TestResultSetImpl.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/query/TestResultSetImpl.java
@@ -24,6 +24,7 @@ package org.apache.tajo.engine.query;
import org.apache.hadoop.fs.Path;
import org.apache.tajo.IntegrationTest;
import org.apache.tajo.TajoTestingCluster;
+import org.apache.tajo.TpchTestBase;
import org.apache.tajo.catalog.*;
import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.catalog.statistics.TableStat;
@@ -53,8 +54,7 @@ public class TestResultSetImpl {
@BeforeClass
public static void setup() throws Exception {
- util = new TajoTestingCluster();
- util.startMiniCluster(3);
+ util = TpchTestBase.getInstance().getTestingCluster();
conf = util.getConfiguration();
sm = StorageManagerFactory.getStorageManager(conf);
@@ -92,7 +92,7 @@ public class TestResultSetImpl {
@AfterClass
public static void terminate() throws IOException {
- util.shutdownMiniCluster();
+
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/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 b7fe805..51dc8fe 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
@@ -14,7 +14,6 @@
package org.apache.tajo.master;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.yarn.event.AsyncDispatcher;
import org.apache.tajo.LocalTajoTestingUtility;
import org.apache.tajo.TajoTestingCluster;
@@ -37,6 +36,8 @@ import org.apache.tajo.engine.planner.global.MasterPlan;
import org.apache.tajo.engine.query.QueryContext;
import org.apache.tajo.storage.AbstractStorageManager;
import org.apache.tajo.storage.StorageManagerFactory;
+import org.apache.tajo.util.CommonTestingUtil;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -50,6 +51,7 @@ public class TestExecutionBlockCursor {
private static SQLAnalyzer analyzer;
private static LogicalPlanner logicalPlanner;
private static LogicalOptimizer optimizer;
+ private static AsyncDispatcher dispatcher;
@BeforeClass
public static void setUp() throws Exception {
@@ -64,7 +66,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("/"));
+ TableDesc d = CatalogUtil.newTableDesc(table, m, CommonTestingUtil.getTestDir());
catalog.addTable(d);
}
@@ -73,14 +75,16 @@ public class TestExecutionBlockCursor {
optimizer = new LogicalOptimizer();
AbstractStorageManager sm = StorageManagerFactory.getStorageManager(conf);
- AsyncDispatcher dispatcher = new AsyncDispatcher();
+ dispatcher = new AsyncDispatcher();
dispatcher.init(conf);
dispatcher.start();
planner = new GlobalPlanner(conf, sm);
}
+ @AfterClass
public static void tearDown() {
util.shutdownCatalogCluster();
+ dispatcher.stop();
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/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 699bd6b..e85b54a 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
@@ -18,7 +18,6 @@
package org.apache.tajo.master;
-import org.apache.hadoop.fs.Path;
import org.apache.tajo.LocalTajoTestingUtility;
import org.apache.tajo.TajoTestingCluster;
import org.apache.tajo.algebra.Expr;
@@ -35,6 +34,7 @@ import org.apache.tajo.engine.planner.global.GlobalPlanner;
import org.apache.tajo.engine.planner.global.MasterPlan;
import org.apache.tajo.engine.query.QueryContext;
import org.apache.tajo.storage.StorageManagerFactory;
+import org.apache.tajo.util.CommonTestingUtil;
import org.apache.tajo.util.FileUtil;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -77,7 +77,7 @@ public class TestGlobalPlanner {
stat.setNumBytes(volumes[i]);
m.setStat(stat);
- TableDesc d = CatalogUtil.newTableDesc(tables[i], m, new Path("/"));
+ TableDesc d = CatalogUtil.newTableDesc(tables[i], m, CommonTestingUtil.getTestDir());
catalog.addTable(d);
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/storage/TestFragment.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/storage/TestFragment.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/storage/TestFragment.java
index b378727..5ff6844 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/storage/TestFragment.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/storage/TestFragment.java
@@ -20,6 +20,7 @@ package org.apache.tajo.storage;
import com.google.common.collect.Sets;
import org.apache.hadoop.fs.Path;
+import org.apache.tajo.util.CommonTestingUtil;
import org.junit.Before;
import org.junit.Test;
import org.apache.tajo.catalog.CatalogUtil;
@@ -37,6 +38,7 @@ import static org.junit.Assert.assertTrue;
public class TestFragment {
private Schema schema1;
private TableMeta meta1;
+ private Path path;
@Before
public final void setUp() throws Exception {
@@ -44,15 +46,16 @@ public class TestFragment {
schema1.addColumn("id", Type.INT4);
schema1.addColumn("name", Type.TEXT);
meta1 = CatalogUtil.newTableMeta(schema1, StoreType.CSV);
+ path = CommonTestingUtil.getTestDir();
}
@Test
public final void testGetAndSetFields() {
- Fragment fragment1 = new Fragment("table1_1", new Path("/table0"), meta1, 0, 500);
+ Fragment fragment1 = new Fragment("table1_1", new Path(path, "table0"), meta1, 0, 500);
fragment1.setDistCached();
assertEquals("table1_1", fragment1.getName());
- assertEquals(new Path("/table0"), fragment1.getPath());
+ assertEquals(new Path(path, "table0"), fragment1.getPath());
assertEquals(meta1.getStoreType(), fragment1.getMeta().getStoreType());
assertEquals(meta1.getSchema().getColumnNum(),
fragment1.getMeta().getSchema().getColumnNum());
@@ -69,11 +72,11 @@ public class TestFragment {
@Test
public final void testTabletTabletProto() {
- Fragment fragment0 = new Fragment("table1_1", new Path("/table0"), meta1, 0, 500);
+ Fragment fragment0 = new Fragment("table1_1", new Path(path, "table0"), meta1, 0, 500);
Fragment fragment1 = new Fragment(fragment0.getProto());
assertEquals("table1_1", fragment1.getName());
- assertEquals(new Path("/table0"), fragment1.getPath());
+ assertEquals(new Path(path, "table0"), fragment1.getPath());
assertEquals(meta1.getStoreType(), fragment1.getMeta().getStoreType());
assertEquals(meta1.getSchema().getColumnNum(),
fragment1.getMeta().getSchema().getColumnNum());
@@ -92,7 +95,7 @@ public class TestFragment {
final int num = 10;
Fragment [] tablets = new Fragment[num];
for (int i = num - 1; i >= 0; i--) {
- tablets[i] = new Fragment("tablet1_"+i, new Path("tablet0"), meta1, i * 500, (i+1) * 500);
+ tablets[i] = new Fragment("tablet1_"+i, new Path(path, "tablet0"), meta1, i * 500, (i+1) * 500);
}
Arrays.sort(tablets);
@@ -107,7 +110,7 @@ public class TestFragment {
final int num = 1860;
Fragment [] tablets = new Fragment[num];
for (int i = num - 1; i >= 0; i--) {
- tablets[i] = new Fragment("tablet1_"+i, new Path("tablet0"), meta1, (long)i * 6553500, (long)(i+1) * 6553500);
+ tablets[i] = new Fragment("tablet1_"+i, new Path(path, "tablet0"), meta1, (long)i * 6553500, (long)(i+1) * 6553500);
}
SortedSet sortedSet = Sets.newTreeSet();
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/f5a18dbf/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/storage/TestRowFile.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/storage/TestRowFile.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/storage/TestRowFile.java
index 07e6804..d5077c2 100644
--- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/storage/TestRowFile.java
+++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/storage/TestRowFile.java
@@ -23,6 +23,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.tajo.TajoTestingCluster;
+import org.apache.tajo.TpchTestBase;
import org.apache.tajo.catalog.CatalogUtil;
import org.apache.tajo.catalog.Schema;
import org.apache.tajo.catalog.TableMeta;
@@ -51,15 +52,13 @@ public class TestRowFile {
@Before
public void setup() throws Exception {
- cluster = new TajoTestingCluster();
+ cluster = TpchTestBase.getInstance().getTestingCluster();
conf = cluster.getConfiguration();
conf.setInt(ConfVars.RAWFILE_SYNC_INTERVAL.varname, 100);
- cluster.startMiniDFSCluster(1);
}
@After
public void teardown() throws Exception {
- cluster.shutdownMiniDFSCluster();
}
@Test