You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/02/02 13:38:36 UTC
[1/2] tajo git commit: TAJO-1317: Parallel Test Executions on Tajo
Core Project
Repository: tajo
Updated Branches:
refs/heads/index_support 31698f537 -> 291817c83
TAJO-1317: Parallel Test Executions on Tajo Core Project
Closes #362
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/e9cd25a6
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/e9cd25a6
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/e9cd25a6
Branch: refs/heads/index_support
Commit: e9cd25a6cdf9d5359d84703a63600c312688d755
Parents: 58bbb1b
Author: Jihun Kang <ji...@apache.org>
Authored: Mon Feb 2 21:32:43 2015 +0900
Committer: Jihun Kang <ji...@apache.org>
Committed: Mon Feb 2 21:32:43 2015 +0900
----------------------------------------------------------------------
.travis.yml | 3 +-
CHANGES | 2 +
tajo-core/pom.xml | 39 +++++++++++++++
.../org/apache/tajo/TajoTestingCluster.java | 4 +-
.../org/apache/tajo/client/TestTajoClient.java | 2 +
.../planner/global/TestBroadcastJoinPlan.java | 2 +-
.../planner/physical/TestBNLJoinExec.java | 6 +--
.../planner/physical/TestBSTIndexExec.java | 2 +-
.../planner/physical/TestExternalSortExec.java | 2 +-
.../physical/TestFullOuterHashJoinExec.java | 10 ++--
.../physical/TestFullOuterMergeJoinExec.java | 14 +++---
.../planner/physical/TestHashAntiJoinExec.java | 4 +-
.../planner/physical/TestHashJoinExec.java | 6 +--
.../planner/physical/TestHashSemiJoinExec.java | 4 +-
.../physical/TestLeftOuterHashJoinExec.java | 13 ++---
.../physical/TestLeftOuterNLJoinExec.java | 12 ++---
.../planner/physical/TestMergeJoinExec.java | 4 +-
.../engine/planner/physical/TestNLJoinExec.java | 6 +--
.../planner/physical/TestPhysicalPlanner.java | 52 ++++++++++----------
.../physical/TestProgressExternalSortExec.java | 2 +-
.../physical/TestRightOuterHashJoinExec.java | 8 +--
.../physical/TestRightOuterMergeJoinExec.java | 14 +++---
.../engine/planner/physical/TestSortExec.java | 4 +-
.../org/apache/tajo/worker/TestFetcher.java | 3 +-
tajo-project/pom.xml | 5 ++
25 files changed, 138 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 98dea33..0a6eec0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,4 +36,5 @@ notifications:
install: ./dev-support/travis-install-dependencies.sh
-script: mvn clean install -Phcatalog-0.12.0 -DLOG_LEVEL=WARN
+script:
+ mvn clean install -Pparallel-test,hcatalog-0.12.0 -DLOG_LEVEL=WARN -Dmaven.fork.count=3
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 3667991..6b568e3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,8 @@ Release 0.10.0 - unreleased
IMPROVEMENT
+ TAJO-1317: Parallel Test Executions on Tajo Core Project. (jihun)
+
TAJO-1320: HBaseStorageManager need to support Zookeeper Client Port.
(jaehwa)
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-core/pom.xml b/tajo-core/pom.xml
index 05ccf07..c713e09 100644
--- a/tajo-core/pom.xml
+++ b/tajo-core/pom.xml
@@ -34,6 +34,7 @@
<antlr4.visitor>true</antlr4.visitor>
<antlr4.listener>true</antlr4.listener>
<metrics.version>3.0.1</metrics.version>
+ <maven.fork.count>3</maven.fork.count>
</properties>
<repositories>
@@ -440,6 +441,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -690,6 +696,39 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>parallel-test</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration combine.self="override">
+ <forkCount>${maven.fork.count}</forkCount>
+ <reuseForks>true</reuseForks>
+ <argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8</argLine>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <useManifestOnlyJar>true</useManifestOnlyJar>
+ <systemProperties>
+ <tajo.test>TRUE</tajo.test>
+ <tajo.test.data.dir>test-data${surefire.forkNumber}</tajo.test.data.dir>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<reporting>
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java b/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java
index 0d3d660..a93d7f0 100644
--- a/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java
+++ b/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java
@@ -86,7 +86,8 @@ public class TajoTestingCluster {
/**
* Default parent directory for test output.
*/
- public static final String DEFAULT_TEST_DIRECTORY = "target/test-data";
+ public static final String DEFAULT_TEST_DIRECTORY = "target/" +
+ System.getProperty("tajo.test.data.dir", "test-data");
/**
* True If HCatalogStore is used. Otherwise, it is FALSE.
@@ -167,6 +168,7 @@ public class TajoTestingCluster {
Logger.getLogger("org.apache.hadoop").setLevel(Level.toLevel(LOG_LEVEL.toUpperCase(), defaultLevel));
Logger.getLogger("org.apache.zookeeper").setLevel(Level.toLevel(LOG_LEVEL.toUpperCase(), defaultLevel));
Logger.getLogger("BlockStateChange").setLevel(Level.toLevel(LOG_LEVEL.toUpperCase(), defaultLevel));
+ Logger.getLogger("org.mortbay.log").setLevel(Level.toLevel(LOG_LEVEL.toUpperCase(), defaultLevel));
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/client/TestTajoClient.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/client/TestTajoClient.java b/tajo-core/src/test/java/org/apache/tajo/client/TestTajoClient.java
index 63ea8b9..921a136 100644
--- a/tajo-core/src/test/java/org/apache/tajo/client/TestTajoClient.java
+++ b/tajo-core/src/test/java/org/apache/tajo/client/TestTajoClient.java
@@ -18,6 +18,7 @@
package org.apache.tajo.client;
+import net.jcip.annotations.NotThreadSafe;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -57,6 +58,7 @@ import java.util.*;
import static org.junit.Assert.*;
@Category(IntegrationTest.class)
+@NotThreadSafe
public class TestTajoClient {
private static TajoTestingCluster cluster;
private static TajoConf conf;
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/global/TestBroadcastJoinPlan.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/global/TestBroadcastJoinPlan.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/global/TestBroadcastJoinPlan.java
index 3803c7a..eb92bcf 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/global/TestBroadcastJoinPlan.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/global/TestBroadcastJoinPlan.java
@@ -59,7 +59,7 @@ import static org.junit.Assert.assertTrue;
public class TestBroadcastJoinPlan {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestBroadcastJoinPlan";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestBroadcastJoinPlan";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java
index 8dfe1bb..0bfcc22 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertTrue;
public class TestBNLJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestBNLJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestBNLJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -159,7 +159,7 @@ public class TestBNLJoinExec {
new Path(people.getPath()),
Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(empFrags, peopleFrags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testBNLCrossJoin");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testBNLCrossJoin");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -196,7 +196,7 @@ public class TestBNLJoinExec {
Enforcer enforcer = new Enforcer();
enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.BLOCK_NESTED_LOOP_JOIN);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testBNLInnerJoin");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testBNLInnerJoin");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(),
merged, workDir);
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java
index c897461..2ddb4ef 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java
@@ -164,7 +164,7 @@ public class TestBSTIndexExec {
final String QUERY = "select * from employee where managerId = " + rndKey;
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.employee", meta, tablePath, Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testEqual");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testEqual");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), new FileFragment[] { frags[0] }, workDir);
Expr expr = analyzer.parse(QUERY);
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
index 9f40062..2047e41 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertTrue;
public class TestExternalSortExec {
private TajoConf conf;
private TajoTestingCluster util;
- private final String TEST_PATH = "target/test-data/TestExternalSortExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestExternalSortExec";
private CatalogService catalog;
private SQLAnalyzer analyzer;
private LogicalPlanner planner;
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java
index 06f31ab..04117c1 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java
@@ -56,7 +56,7 @@ import static org.junit.Assert.*;
public class TestFullOuterHashJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestFullOuterHashJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestFullOuterHashJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -275,7 +275,7 @@ public class TestFullOuterHashJoinExec {
Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(dep3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestFullOuterHashJoinExec0");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestFullOuterHashJoinExec0");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -314,7 +314,7 @@ public class TestFullOuterHashJoinExec {
Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestFullOuter_HashJoinExec1");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestFullOuter_HashJoinExec1");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -352,7 +352,7 @@ public class TestFullOuterHashJoinExec {
Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestFullOuterHashJoinExec2");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestFullOuterHashJoinExec2");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -391,7 +391,7 @@ public class TestFullOuterHashJoinExec {
Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestFullOuterHashJoinExec3");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestFullOuterHashJoinExec3");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged,
workDir);
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java
index 62a8034..5d2991b 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.*;
public class TestFullOuterMergeJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestFullOuterMergeJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestFullOuterMergeJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -324,7 +324,7 @@ public class TestFullOuterMergeJoinExec {
FileStorageManager.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getPath()), Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(emp3Frags, dep3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin0");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin0");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -361,7 +361,7 @@ public class TestFullOuterMergeJoinExec {
FileStorageManager.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin1");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin1");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -398,7 +398,7 @@ public class TestFullOuterMergeJoinExec {
FileStorageManager.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin2");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin2");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -436,7 +436,7 @@ public class TestFullOuterMergeJoinExec {
FileStorageManager.splitNG(conf, DEP4_NAME, dep4.getMeta(), new Path(dep4.getPath()), Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(emp3Frags, dep4Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin3");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin3");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -477,7 +477,7 @@ public class TestFullOuterMergeJoinExec {
Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin4");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin4");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -516,7 +516,7 @@ public class TestFullOuterMergeJoinExec {
Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(phone3Frags,emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin5");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin5");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
index 64da88b..6085f3d 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertTrue;
public class TestHashAntiJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestHashJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestHashJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -158,7 +158,7 @@ public class TestHashAntiJoinExec {
FileFragment[] merged = TUtil.concat(empFrags, peopleFrags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testHashAntiJoin");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testHashAntiJoin");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java
index 0738316..50d6ca1 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.*;
public class TestHashJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestHashJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestHashJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -159,7 +159,7 @@ public class TestHashJoinExec {
new Path(people.getPath()), Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(empFrags, peopleFrags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testHashInnerJoin");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testHashInnerJoin");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -202,7 +202,7 @@ public class TestHashJoinExec {
new Path(employee.getPath()), Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(empFrags, peopleFrags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testHashInnerJoin");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testHashInnerJoin");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
index 4e218c5..978f635 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
@@ -56,7 +56,7 @@ import static org.junit.Assert.assertTrue;
public class TestHashSemiJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestHashJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestHashJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -163,7 +163,7 @@ public class TestHashSemiJoinExec {
FileFragment[] merged = TUtil.concat(empFrags, peopleFrags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testHashSemiJoin");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testHashSemiJoin");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java
index 67ed358..593c28b 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertTrue;
public class TestLeftOuterHashJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestLeftOuterHashJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuterHashJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -279,7 +279,7 @@ public class TestLeftOuterHashJoinExec {
new Path(emp3.getPath()), Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(dep3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuterHashJoinExec0");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuterHashJoinExec0");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -310,7 +310,7 @@ public class TestLeftOuterHashJoinExec {
FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_HashJoinExec1");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuter_HashJoinExec1");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
@@ -351,7 +351,8 @@ public class TestLeftOuterHashJoinExec {
FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_HashJoinExec2");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY +
+ "/TestLeftOuter_HashJoinExec2");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
@@ -393,7 +394,7 @@ public class TestLeftOuterHashJoinExec {
FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_HashJoinExec3");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuter_HashJoinExec3");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
@@ -435,7 +436,7 @@ public class TestLeftOuterHashJoinExec {
FileFragment[] merged = TUtil.concat(phone3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_HashJoinExec4");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuter_HashJoinExec4");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java
index 8043aa0..72f4ab6 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertNull;
public class TestLeftOuterNLJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestLeftOuterNLJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuterNLJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -264,7 +264,7 @@ public class TestLeftOuterNLJoinExec {
FileFragment[] merged = TUtil.concat(dep3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuterNLJoinExec0");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuterNLJoinExec0");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
@@ -306,7 +306,7 @@ public class TestLeftOuterNLJoinExec {
FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_NLJoinExec1");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuter_NLJoinExec1");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
@@ -350,7 +350,7 @@ public class TestLeftOuterNLJoinExec {
FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_NLJoinExec2");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuter_NLJoinExec2");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
@@ -395,7 +395,7 @@ public class TestLeftOuterNLJoinExec {
FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_NLJoinExec3");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuter_NLJoinExec3");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
@@ -439,7 +439,7 @@ public class TestLeftOuterNLJoinExec {
FileFragment[] merged = TUtil.concat(phone3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_NLJoinExec4");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuter_NLJoinExec4");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java
index ef3f401..65f7799 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java
@@ -59,7 +59,7 @@ import static org.junit.Assert.assertTrue;
public class TestMergeJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestMergeJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestMergeJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -172,7 +172,7 @@ public class TestMergeJoinExec {
Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(empFrags, peopleFrags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testMergeInnerJoin");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testMergeInnerJoin");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java
index 2be438f..ffbf34a 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java
@@ -55,7 +55,7 @@ import static org.junit.Assert.assertTrue;
public class TestNLJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestNLJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestNLJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -153,7 +153,7 @@ public class TestNLJoinExec {
FileFragment[] merged = TUtil.concat(empFrags, peopleFrags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testNLCrossJoin");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testNLCrossJoin");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
@@ -182,7 +182,7 @@ public class TestNLJoinExec {
FileFragment[] merged = TUtil.concat(empFrags, peopleFrags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testNLInnerJoin");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testNLInnerJoin");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan), merged, workDir);
ctx.setEnforcer(new Enforcer());
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
index 6c606b1..0c8fa36 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
@@ -98,7 +98,7 @@ public class TestPhysicalPlanner {
util.startCatalogCluster();
conf = util.getConfiguration();
- testDir = CommonTestingUtil.getTestDir("target/test-data/TestPhysicalPlanner");
+ testDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestPhysicalPlanner");
sm = (FileStorageManager)StorageManager.getFileStorageManager(conf, testDir);
catalog = util.getMiniCatalogCluster().getCatalog();
catalog.createTablespace(DEFAULT_TABLESPACE_NAME, testDir.toUri().toString());
@@ -240,7 +240,7 @@ public class TestPhysicalPlanner {
public final void testCreateScanPlan() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.employee", employee.getMeta(),
new Path(employee.getPath()), Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testCreateScanPlan");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testCreateScanPlan");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -271,7 +271,7 @@ public class TestPhysicalPlanner {
public final void testCreateScanWithFilterPlan() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.employee", employee.getMeta(),
new Path(employee.getPath()), Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testCreateScanWithFilterPlan");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testCreateScanWithFilterPlan");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -300,7 +300,7 @@ public class TestPhysicalPlanner {
public final void testGroupByPlan() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testGroupByPlan");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testGroupByPlan");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -331,8 +331,8 @@ public class TestPhysicalPlanner {
// TODO - currently, this query does not use hash-based group operator.
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir(
- "target/test-data/testHashGroupByPlanWithALLField");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY +
+ "/testHashGroupByPlanWithALLField");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -361,7 +361,7 @@ public class TestPhysicalPlanner {
public final void testSortGroupByPlan() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testSortGroupByPlan");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testSortGroupByPlan");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[]{frags[0]}, workDir);
@@ -424,7 +424,7 @@ public class TestPhysicalPlanner {
public final void testStorePlan() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testStorePlan");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlan");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -470,7 +470,7 @@ public class TestPhysicalPlanner {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score_large", largeScore.getMeta(),
new Path(largeScore.getPath()), Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testStorePlanWithMaxOutputFileSize");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlanWithMaxOutputFileSize");
QueryContext queryContext = new QueryContext(conf, session);
queryContext.setInt(SessionVars.MAX_OUTPUT_FILE_SIZE, 1);
@@ -521,7 +521,7 @@ public class TestPhysicalPlanner {
public final void testStorePlanWithRCFile() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testStorePlanWithRCFile");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlanWithRCFile");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -562,7 +562,7 @@ public class TestPhysicalPlanner {
public final void testEnforceForDefaultColumnPartitionStorePlan() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testStorePlan");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlan");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -589,7 +589,7 @@ public class TestPhysicalPlanner {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testStorePlan");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlan");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -613,7 +613,7 @@ public class TestPhysicalPlanner {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testStorePlan");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlan");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -631,7 +631,7 @@ public class TestPhysicalPlanner {
Integer.MAX_VALUE);
TaskAttemptId id = LocalTajoTestingUtility.newTaskAttemptId(masterPlan);
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), id, new FileFragment[] { frags[0] },
- CommonTestingUtil.getTestDir("target/test-data/testPartitionedStorePlan"));
+ CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testPartitionedStorePlan"));
ctx.setEnforcer(new Enforcer());
Expr context = analyzer.parse(QUERIES[7]);
LogicalPlan plan = planner.createPlan(defaultContext, context);
@@ -699,7 +699,7 @@ public class TestPhysicalPlanner {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score_large", largeScore.getMeta(),
new Path(largeScore.getPath()), Integer.MAX_VALUE);
TaskAttemptId id = LocalTajoTestingUtility.newTaskAttemptId(masterPlan);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testPartitionedStorePlanWithMaxFileSize");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testPartitionedStorePlanWithMaxFileSize");
// Setting session variables
QueryContext queryContext = new QueryContext(conf, session);
@@ -764,8 +764,8 @@ public class TestPhysicalPlanner {
Integer.MAX_VALUE);
TaskAttemptId id = LocalTajoTestingUtility.newTaskAttemptId(masterPlan);
- Path workDir = CommonTestingUtil.getTestDir(
- "target/test-data/testPartitionedStorePlanWithEmptyGroupingSet");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY +
+ "/testPartitionedStorePlanWithEmptyGroupingSet");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
id, new FileFragment[] { frags[0] }, workDir);
ctx.setEnforcer(new Enforcer());
@@ -829,7 +829,7 @@ public class TestPhysicalPlanner {
public final void testAggregationFunction() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testAggregationFunction");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testAggregationFunction");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -860,7 +860,7 @@ public class TestPhysicalPlanner {
public final void testCountFunction() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testCountFunction");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testCountFunction");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -888,7 +888,7 @@ public class TestPhysicalPlanner {
public final void testGroupByWithNullValue() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testGroupByWithNullValue");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testGroupByWithNullValue");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -913,7 +913,7 @@ public class TestPhysicalPlanner {
public final void testUnionPlan() throws IOException, PlanningException, CloneNotSupportedException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.employee", employee.getMeta(),
new Path(employee.getPath()), Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testUnionPlan");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testUnionPlan");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { frags[0] }, workDir);
@@ -941,7 +941,7 @@ public class TestPhysicalPlanner {
@Test
public final void testEvalExpr() throws IOException, PlanningException {
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testEvalExpr");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testEvalExpr");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] { }, workDir);
@@ -978,7 +978,7 @@ public class TestPhysicalPlanner {
public final void testCreateIndex() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.employee", employee.getMeta(),
new Path(employee.getPath()), Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testCreateIndex");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testCreateIndex");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] {frags[0]}, workDir);
@@ -1006,7 +1006,7 @@ public class TestPhysicalPlanner {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(),
new Path(score.getPath()), Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testDuplicateEliminate");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testDuplicateEliminate");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] {frags[0]}, workDir);
@@ -1040,7 +1040,7 @@ public class TestPhysicalPlanner {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.employee", employee.getMeta(),
new Path(employee.getPath()), Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testSortEnforcer");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testSortEnforcer");
Expr context = analyzer.parse(SORT_QUERY[0]);
LogicalPlan plan = planner.createPlan(defaultContext, context);
optimizer.optimize(plan);
@@ -1090,7 +1090,7 @@ public class TestPhysicalPlanner {
public final void testGroupByEnforcer() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()),
Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testGroupByEnforcer");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testGroupByEnforcer");
Expr context = analyzer.parse(QUERIES[7]);
LogicalPlan plan = planner.createPlan(defaultContext, context);
optimizer.optimize(plan);
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java
index a2b407b..29fff7c 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java
@@ -58,7 +58,7 @@ import static org.junit.Assert.assertTrue;
public class TestProgressExternalSortExec {
private TajoConf conf;
private TajoTestingCluster util;
- private final String TEST_PATH = "target/test-data/TestProgressExternalSortExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestProgressExternalSortExec";
private CatalogService catalog;
private SQLAnalyzer analyzer;
private LogicalPlanner planner;
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java
index e4ed595..7578690 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java
@@ -54,7 +54,7 @@ import static org.junit.Assert.assertEquals;
// this is not a physical operator in itself, but it uses the HashLeftOuterJoinExec with switched inputs order
public class TestRightOuterHashJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestRightOuterHashJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestRightOuterHashJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -239,7 +239,7 @@ public class TestRightOuterHashJoinExec {
FileFragment[] merged = TUtil.concat(emp3Frags, dep3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestRightOuter_HashJoinExec0");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestRightOuter_HashJoinExec0");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
@@ -280,7 +280,7 @@ public class TestRightOuterHashJoinExec {
FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestRightOuter_HashJoinExec1");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestRightOuter_HashJoinExec1");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
@@ -321,7 +321,7 @@ public class TestRightOuterHashJoinExec {
FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestRightOuter_HashJoinExec2");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestRightOuter_HashJoinExec2");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java
index 112a341..8a812ea 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java
@@ -56,7 +56,7 @@ import static org.junit.Assert.*;
public class TestRightOuterMergeJoinExec {
private TajoConf conf;
- private final String TEST_PATH = "target/test-data/TestRightOuterMergeJoinExec";
+ private final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestRightOuterMergeJoinExec";
private TajoTestingCluster util;
private CatalogService catalog;
private SQLAnalyzer analyzer;
@@ -323,7 +323,7 @@ public class TestRightOuterMergeJoinExec {
Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(emp3Frags, dep3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuterMergeJoin0");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testRightOuterMergeJoin0");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -360,7 +360,7 @@ public class TestRightOuterMergeJoinExec {
FileStorageManager.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuterMergeJoin1");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testRightOuterMergeJoin1");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -396,7 +396,7 @@ public class TestRightOuterMergeJoinExec {
FileStorageManager.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuterMergeJoin2");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testRightOuterMergeJoin2");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -432,7 +432,7 @@ public class TestRightOuterMergeJoinExec {
FileStorageManager.splitNG(conf, DEP4_NAME, dep4.getMeta(), new Path(dep4.getPath()), Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(emp3Frags, dep4Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuter_MergeJoin3");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testRightOuter_MergeJoin3");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -470,7 +470,7 @@ public class TestRightOuterMergeJoinExec {
Integer.MAX_VALUE);
FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuter_MergeJoin4");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testRightOuter_MergeJoin4");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
@@ -507,7 +507,7 @@ public class TestRightOuterMergeJoinExec {
FileFragment[] merged = TUtil.concat(phone3Frags,emp3Frags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuterMergeJoin5");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testRightOuterMergeJoin5");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(enforcer);
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
index 2e093c1..a42fbac 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
@@ -51,7 +51,7 @@ import static org.junit.Assert.assertTrue;
public class TestSortExec {
private static TajoConf conf;
- private static final String TEST_PATH = "target/test-data/TestPhysicalPlanner";
+ private static final String TEST_PATH = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestPhysicalPlanner";
private static TajoTestingCluster util;
private static CatalogService catalog;
private static SQLAnalyzer analyzer;
@@ -112,7 +112,7 @@ public class TestSortExec {
@Test
public final void testNext() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.employee", employeeMeta, tablePath, Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestSortExec");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestSortExec");
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility
.newTaskAttemptId(), new FileFragment[] { frags[0] }, workDir);
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-core/src/test/java/org/apache/tajo/worker/TestFetcher.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/worker/TestFetcher.java b/tajo-core/src/test/java/org/apache/tajo/worker/TestFetcher.java
index 551610b..b3654f9 100644
--- a/tajo-core/src/test/java/org/apache/tajo/worker/TestFetcher.java
+++ b/tajo-core/src/test/java/org/apache/tajo/worker/TestFetcher.java
@@ -22,6 +22,7 @@ import org.apache.hadoop.fs.*;
import org.apache.tajo.QueryId;
import org.apache.tajo.QueryIdFactory;
import org.apache.tajo.TajoProtos;
+import org.apache.tajo.TajoTestingCluster;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.conf.TajoConf.ConfVars;
import org.apache.tajo.pullserver.TajoPullServerService;
@@ -44,7 +45,7 @@ import java.util.Random;
import static org.junit.Assert.*;
public class TestFetcher {
- private String TEST_DATA = "target/test-data/TestFetcher";
+ private String TEST_DATA = TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestFetcher";
private String INPUT_DIR = TEST_DATA+"/in/";
private String OUTPUT_DIR = TEST_DATA+"/out/";
private TajoConf conf = new TajoConf();
http://git-wip-us.apache.org/repos/asf/tajo/blob/e9cd25a6/tajo-project/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml
index 649eaa1..ad62bba 100644
--- a/tajo-project/pom.xml
+++ b/tajo-project/pom.xml
@@ -1037,6 +1037,11 @@
<artifactId>jline</artifactId>
<version>2.11</version>
</dependency>
+ <dependency>
+ <groupId>com.github.stephenc.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>1.0-1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<profiles>
[2/2] tajo git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo into index_support
Posted by ji...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Conflicts:
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/291817c8
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/291817c8
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/291817c8
Branch: refs/heads/index_support
Commit: 291817c8324e357c306ddcba598113953a409e41
Parents: 31698f5 e9cd25a
Author: Jihoon Son <ji...@apache.org>
Authored: Mon Feb 2 21:38:26 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Mon Feb 2 21:38:26 2015 +0900
----------------------------------------------------------------------
.travis.yml | 3 +-
CHANGES | 2 +
tajo-core/pom.xml | 39 +++++++++++++++
.../org/apache/tajo/TajoTestingCluster.java | 4 +-
.../org/apache/tajo/client/TestTajoClient.java | 2 +
.../planner/global/TestBroadcastJoinPlan.java | 2 +-
.../planner/physical/TestBNLJoinExec.java | 6 +--
.../planner/physical/TestExternalSortExec.java | 2 +-
.../physical/TestFullOuterHashJoinExec.java | 10 ++--
.../physical/TestFullOuterMergeJoinExec.java | 14 +++---
.../planner/physical/TestHashAntiJoinExec.java | 4 +-
.../planner/physical/TestHashJoinExec.java | 6 +--
.../planner/physical/TestHashSemiJoinExec.java | 4 +-
.../physical/TestLeftOuterHashJoinExec.java | 13 ++---
.../physical/TestLeftOuterNLJoinExec.java | 12 ++---
.../planner/physical/TestMergeJoinExec.java | 4 +-
.../engine/planner/physical/TestNLJoinExec.java | 6 +--
.../planner/physical/TestPhysicalPlanner.java | 52 ++++++++++----------
.../physical/TestProgressExternalSortExec.java | 2 +-
.../physical/TestRightOuterHashJoinExec.java | 8 +--
.../physical/TestRightOuterMergeJoinExec.java | 14 +++---
.../engine/planner/physical/TestSortExec.java | 4 +-
.../org/apache/tajo/worker/TestFetcher.java | 3 +-
tajo-project/pom.xml | 5 ++
24 files changed, 137 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/291817c8/tajo-core/src/test/java/org/apache/tajo/engine/planner/global/TestBroadcastJoinPlan.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/291817c8/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
----------------------------------------------------------------------
diff --cc tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
index a64b525,6085f3d..2b55745
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
@@@ -160,8 -158,8 +160,8 @@@ public class TestHashAntiJoinExec
FileFragment[] merged = TUtil.concat(empFrags, peopleFrags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testHashAntiJoin");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testHashAntiJoin");
- TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
+ TaskAttemptContext ctx = new TaskAttemptContext(queryContext,
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
Expr expr = analyzer.parse(QUERIES[0]);
http://git-wip-us.apache.org/repos/asf/tajo/blob/291817c8/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
----------------------------------------------------------------------
diff --cc tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
index 196f3bf,978f635..b01cdfd
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
@@@ -165,8 -163,8 +165,8 @@@ public class TestHashSemiJoinExec
FileFragment[] merged = TUtil.concat(empFrags, peopleFrags);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testHashSemiJoin");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testHashSemiJoin");
- TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
+ TaskAttemptContext ctx = new TaskAttemptContext(queryContext,
LocalTajoTestingUtility.newTaskAttemptId(), merged, workDir);
ctx.setEnforcer(new Enforcer());
Expr expr = analyzer.parse(QUERIES[0]);
http://git-wip-us.apache.org/repos/asf/tajo/blob/291817c8/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
----------------------------------------------------------------------
diff --cc tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
index ab4f767,0c8fa36..311fa16
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
@@@ -979,12 -978,7 +979,12 @@@ public class TestPhysicalPlanner
public final void testCreateIndex() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.employee", employee.getMeta(),
new Path(employee.getPath()), Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/testCreateIndex");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testCreateIndex");
+ Path indexPath = StorageUtil.concatPath(TajoConf.getWarehouseDir(conf), "default/idx_employee");
+ if (sm.getFileSystem().exists(indexPath)) {
+ sm.getFileSystem().delete(indexPath, true);
+ }
+
TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
LocalTajoTestingUtility.newTaskAttemptId(masterPlan),
new FileFragment[] {frags[0]}, workDir);
http://git-wip-us.apache.org/repos/asf/tajo/blob/291817c8/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
----------------------------------------------------------------------
diff --cc tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
index 84abfff,a42fbac..dbf44cf
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
@@@ -114,8 -112,8 +114,8 @@@ public class TestSortExec
@Test
public final void testNext() throws IOException, PlanningException {
FileFragment[] frags = FileStorageManager.splitNG(conf, "default.employee", employeeMeta, tablePath, Integer.MAX_VALUE);
- Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestSortExec");
+ Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestSortExec");
- TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf),
+ TaskAttemptContext ctx = new TaskAttemptContext(queryContext,
LocalTajoTestingUtility
.newTaskAttemptId(), new FileFragment[] { frags[0] }, workDir);
ctx.setEnforcer(new Enforcer());