You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2015/09/02 13:06:51 UTC
[28/39] tajo git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1730
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1730
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/177291d7
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/177291d7
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/177291d7
Branch: refs/heads/TAJO-1730
Commit: 177291d7ece85b9c6ffe6277e48f12895fff4259
Parents: faf12b1 45ca499
Author: Hyunsik Choi <hy...@apache.org>
Authored: Sat Aug 22 00:56:52 2015 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Sat Aug 22 00:56:52 2015 +0900
----------------------------------------------------------------------
CHANGES | 2 +
.../tajo/engine/query/TestHBaseTable.java | 14 +-
.../tajo/engine/query/TestSimpleQuery.java | 179 +++++++++++++++++++
.../results/TestSimpleQuery/testLimit.result | 3 +
.../results/TestSimpleQuery/testNoWhere.result | 7 +
.../testPartitionColumnWhere.result | 4 +
.../results/TestSimpleQuery/testWhere.result | 4 +
.../exec/NonForwardQueryResultFileScanner.java | 94 +++-------
.../exec/NonForwardQueryResultScanner.java | 10 +-
.../apache/tajo/master/exec/QueryExecutor.java | 15 +-
.../ws/rs/resources/QueryResultResource.java | 3 +-
.../org/apache/tajo/plan/expr/EvalTreeUtil.java | 34 +---
.../plan/rewrite/rules/AccessPathRewriter.java | 1 +
.../rewrite/rules/PartitionedTableRewriter.java | 1 +
.../org/apache/tajo/plan/util/PlannerUtil.java | 23 +--
.../org/apache/tajo/storage/Tablespace.java | 12 --
.../tajo/storage/hbase/HBaseTablespace.java | 83 ---------
.../org/apache/tajo/storage/FileTablespace.java | 145 ---------------
18 files changed, 252 insertions(+), 382 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/177291d7/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/177291d7/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Tablespace.java
----------------------------------------------------------------------
diff --cc tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Tablespace.java
index ff7ee47,d131d9e..83ae935
--- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Tablespace.java
+++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Tablespace.java
@@@ -128,21 -128,8 +128,9 @@@ public abstract class Tablespace
* @return The list of input fragments.
* @throws java.io.IOException
*/
- public abstract List<Fragment> getSplits(String fragmentId, TableDesc tableDesc,
- ScanNode scanNode) throws IOException, TajoException;
+ public abstract List<Fragment> getSplits(String inputSourceId,
+ TableDesc tableDesc,
+ @Nullable EvalNode filterCondition) throws IOException, TajoException;
-
- /**
- * It returns the splits that will serve as input for the non-forward query scanner such as 'select * from table1'.
- * The result list should be small. If there is many fragments for scanning, TajoMaster uses the paging navigation.
- * @param tableDesc The table description for the target data.
- * @param currentPage The current page number within the entire list.
- * @param numFragments The number of fragments in the result.
- * @return The list of input fragments.
- * @throws java.io.IOException
- */
- public abstract List<Fragment> getNonForwardSplit(TableDesc tableDesc, int currentPage, int numFragments)
- throws IOException;
/**
* It returns the storage property.
http://git-wip-us.apache.org/repos/asf/tajo/blob/177291d7/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseTablespace.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/177291d7/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileTablespace.java
----------------------------------------------------------------------