tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject [2/2] tajo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Date Mon, 02 Feb 2015 12:38:37 GMT
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 <jihoonson@apache.org>
Authored: Mon Feb 2 21:38:26 2015 +0900
Committer: Jihoon Son <jihoonson@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());


Mime
View raw message