tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject [3/3] tajo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Date Tue, 03 Feb 2015 08:01:48 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


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

Branch: refs/heads/index_support
Commit: 1c1dfa0ed2568a561ad6b6f2d251a36d544ee416
Parents: 291817c 02c6c26
Author: Jihoon Son <jihoonson@apache.org>
Authored: Tue Feb 3 17:01:37 2015 +0900
Committer: Jihoon Son <jihoonson@apache.org>
Committed: Tue Feb 3 17:01:37 2015 +0900

----------------------------------------------------------------------
 .travis.yml                                     |  2 +-
 CHANGES                                         |  5 +++
 .../java/org/apache/tajo/master/TajoMaster.java |  9 ++----
 .../apache/tajo/querymaster/Repartitioner.java  |  9 ++----
 .../java/org/apache/tajo/querymaster/Stage.java |  3 +-
 .../org/apache/tajo/BackendTestingUtil.java     |  5 ++-
 .../apache/tajo/LocalTajoTestingUtility.java    |  2 +-
 .../org/apache/tajo/TajoTestingCluster.java     | 12 ++++---
 .../planner/physical/TestBNLJoinExec.java       |  2 --
 .../planner/physical/TestExternalSortExec.java  |  2 --
 .../physical/TestFullOuterHashJoinExec.java     |  2 --
 .../physical/TestFullOuterMergeJoinExec.java    |  2 --
 .../planner/physical/TestHashAntiJoinExec.java  |  2 --
 .../planner/physical/TestHashJoinExec.java      |  2 --
 .../planner/physical/TestHashSemiJoinExec.java  |  2 --
 .../physical/TestLeftOuterHashJoinExec.java     |  2 --
 .../physical/TestLeftOuterNLJoinExec.java       |  2 --
 .../planner/physical/TestMergeJoinExec.java     | 11 +++----
 .../engine/planner/physical/TestNLJoinExec.java |  2 --
 .../planner/physical/TestPhysicalPlanner.java   |  2 +-
 .../physical/TestProgressExternalSortExec.java  |  2 --
 .../physical/TestRightOuterHashJoinExec.java    |  2 --
 .../physical/TestRightOuterMergeJoinExec.java   |  2 --
 .../engine/planner/physical/TestSortExec.java   |  2 +-
 .../tajo/engine/query/TestCreateTable.java      |  2 +-
 .../apache/tajo/engine/query/TestSortQuery.java | 34 ++++++++++++++++++++
 .../org/apache/tajo/storage/TestRowFile.java    |  3 +-
 .../queries/TestSortQuery/testSortFirstDesc.sql |  1 +
 .../TestSortQuery/testSortFirstDesc.result      | 10 ++++++
 .../org/apache/tajo/storage/StorageManager.java | 18 +----------
 .../org/apache/tajo/storage/TupleRange.java     |  9 ------
 .../storage/HashShuffleAppenderManager.java     |  4 +--
 .../tajo/storage/TestFileStorageManager.java    |  4 +--
 .../apache/tajo/storage/TestMergeScanner.java   |  2 +-
 34 files changed, 82 insertions(+), 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/1c1dfa0e/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 2b55745,64efa28..359b483
--- 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
@@@ -61,9 -61,7 +61,8 @@@ public class TestHashAntiJoinExec 
    private SQLAnalyzer analyzer;
    private LogicalPlanner planner;
    private LogicalOptimizer optimizer;
-   private StorageManager sm;
    private Path testDir;
 +  private QueryContext queryContext;
  
    private TableDesc employee;
    private TableDesc people;

http://git-wip-us.apache.org/repos/asf/tajo/blob/1c1dfa0e/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 b01cdfd,42a018b..3407972
--- 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
@@@ -62,9 -62,7 +62,8 @@@ public class TestHashSemiJoinExec 
    private SQLAnalyzer analyzer;
    private LogicalPlanner planner;
    private LogicalOptimizer optimizer;
-   private StorageManager sm;
    private Path testDir;
 +  private QueryContext queryContext;
  
    private TableDesc employee;
    private TableDesc people;

http://git-wip-us.apache.org/repos/asf/tajo/blob/1c1dfa0e/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/1c1dfa0e/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
----------------------------------------------------------------------


Mime
View raw message