Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/tajo into
index_support
Conflicts:
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/IndexDesc.java
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/afc2c3eb
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/afc2c3eb
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/afc2c3eb
Branch: refs/heads/index_support
Commit: afc2c3eb3058a0473b7fb2e4808e5b0dbd71df4e
Parents: 375eb1a 0646eda
Author: Jihoon Son <[email protected]>
Authored: Fri Oct 10 13:32:25 2014 +0900
Committer: Jihoon Son <[email protected]>
Committed: Fri Oct 10 13:32:25 2014 +0900
----------------------------------------------------------------------
CHANGES | 56 ++-
pom.xml | 2 +-
.../org/apache/tajo/catalog/AlterTableDesc.java | 14 +-
.../apache/tajo/catalog/CatalogConstants.java | 2 +
.../java/org/apache/tajo/catalog/IndexDesc.java | 7 +-
.../java/org/apache/tajo/catalog/TableDesc.java | 7 +-
.../catalog/partition/PartitionMethodDesc.java | 8 -
.../tajo/catalog/statistics/ColumnStats.java | 8 +-
.../main/java/org/apache/tajo/cli/TajoCli.java | 107 +++--
.../java/org/apache/tajo/client/TajoAdmin.java | 40 +-
.../java/org/apache/tajo/client/TajoClient.java | 1 +
.../apache/tajo/jdbc/TajoResultSetMetaData.java | 8 +-
.../main/java/org/apache/tajo/SessionVars.java | 2 +
.../apache/tajo/common/type/TajoTypeUtil.java | 183 +++++++
.../java/org/apache/tajo/conf/TajoConf.java | 4 +-
.../tajo/util/datetime/DateTimeFormat.java | 182 ++++---
.../eval/AggregationFunctionCallEval.java | 38 +-
.../tajo/engine/eval/SimpleEvalNodeVisitor.java | 3 +
.../optimizer/eval/EvalTreeOptimizer.java | 2 +
.../engine/planner/LogicalPlanPreprocessor.java | 69 +--
.../engine/planner/LogicalPlanVerifier.java | 14 +
.../engine/planner/PhysicalPlannerImpl.java | 56 ++-
.../tajo/engine/planner/TypeDeterminant.java | 17 +
.../tajo/engine/planner/enforce/Enforcer.java | 13 +
.../engine/planner/global/GlobalPlanner.java | 58 +--
.../global/builder/DistinctGroupbyBuilder.java | 329 ++++++++++++-
.../planner/logical/DistinctGroupbyNode.java | 52 +-
.../engine/planner/logical/EvalExprNode.java | 2 +
.../logical/PartitionedTableScanNode.java | 4 +
.../tajo/engine/planner/logical/ScanNode.java | 30 +-
.../DistinctGroupbyFirstAggregationExec.java | 476 +++++++++++++++++++
.../DistinctGroupbySecondAggregationExec.java | 295 ++++++++++++
.../DistinctGroupbyThirdAggregationExec.java | 304 ++++++++++++
.../org/apache/tajo/master/GlobalEngine.java | 4 +
.../java/org/apache/tajo/master/TajoMaster.java | 16 +-
.../apache/tajo/master/querymaster/Query.java | 135 +++++-
.../tajo/master/querymaster/Repartitioner.java | 79 ++-
.../tajo/master/querymaster/SubQuery.java | 28 +-
.../org/apache/tajo/util/JvmPauseMonitor.java | 221 +++++++++
.../java/org/apache/tajo/worker/FetchImpl.java | 16 +-
.../java/org/apache/tajo/worker/TajoWorker.java | 16 +-
.../src/main/proto/TajoWorkerProtocol.proto | 8 +
.../java/org/apache/tajo/QueryTestCaseBase.java | 91 +++-
.../planner/TestPreLogicalPlanVerifier.java | 74 ---
.../engine/planner/TestQueryValidation.java | 52 ++
.../tajo/engine/query/TestGroupByQuery.java | 60 ++-
.../tajo/engine/query/TestJoinBroadcast.java | 195 ++++++++
.../tajo/engine/query/TestTablePartitions.java | 53 ++-
.../tajo/jdbc/TestTajoDatabaseMetaData.java | 111 ++++-
.../apache/tajo/master/TestRepartitioner.java | 85 ++++
.../org/apache/tajo/worker/TestHistory.java | 9 +-
.../testDistinctAggregation8.sql | 9 +
.../testDistinctAggregation_case10.sql | 5 +
.../testDistinctAggregation_case9.sql | 11 +
...tMultipleBroadcastDataFileWithZeroLength.sql | 3 +
...MultipleBroadcastDataFileWithZeroLength2.sql | 5 +
...rtitionedBroadcastDataFileWithZeroLength.sql | 3 +
...titionedBroadcastDataFileWithZeroLength2.sql | 5 +
.../TestQueryValidation/error_groupby_1.sql | 1 +
.../TestQueryValidation/error_groupby_2.sql | 1 +
.../TestQueryValidation/invalid_casewhen_1.sql | 15 +
.../TestQueryValidation/invalid_limit_1.sql | 1 +
.../TestQueryValidation/valid_groupby_1.sql | 1 +
.../TestQueryValidation/valid_limit_1.sql | 1 +
.../testDistinctAggregation8.result | 7 +
.../testDistinctAggregation_case10.result | 3 +
.../testDistinctAggregation_case9.result | 6 +
...castMultiColumnPartitionTableInFilter.result | 0
...ltipleBroadcastDataFileWithZeroLength.result | 2 +
...tipleBroadcastDataFileWithZeroLength2.result | 399 ++++++++++++++++
...tionedBroadcastDataFileWithZeroLength.result | 102 ++++
...ionedBroadcastDataFileWithZeroLength2.result | 399 ++++++++++++++++
.../TestTajoCli/testHelpSessionVars.result | 1 +
tajo-dist/src/main/bin/tajo | 2 +-
tajo-docs/src/main/sphinx/cli.rst | 159 -------
.../sphinx/configuration/ha_configuration.rst | 19 +-
.../functions/datetime_func_and_operators.rst | 409 +++++++++++++++-
.../getting_started/downloading_source.rst | 17 +-
tajo-docs/src/main/sphinx/index.rst | 2 +-
tajo-docs/src/main/sphinx/tsql.rst | 19 +
.../src/main/sphinx/tsql/admin_command.rst | 60 +++
.../src/main/sphinx/tsql/background_command.rst | 29 ++
tajo-docs/src/main/sphinx/tsql/dfs_command.rst | 26 +
tajo-docs/src/main/sphinx/tsql/execute_file.rst | 63 +++
tajo-docs/src/main/sphinx/tsql/intro.rst | 41 ++
tajo-docs/src/main/sphinx/tsql/meta_command.rst | 150 ++++++
.../src/main/sphinx/tsql/single_command.rst | 24 +
tajo-docs/src/main/sphinx/tsql/variables.rst | 66 +++
.../apache/tajo/jdbc/TajoDatabaseMetaData.java | 101 +++-
.../org/apache/tajo/storage/MergeScanner.java | 18 +-
.../java/org/apache/tajo/storage/RawFile.java | 12 +-
.../apache/tajo/storage/TupleComparator.java | 8 +-
.../org/apache/tajo/storage/TestStorages.java | 96 +++-
93 files changed, 5304 insertions(+), 643 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/afc2c3eb/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/IndexDesc.java
----------------------------------------------------------------------
diff --cc
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/IndexDesc.java
index e7cd450,151b919..7dca4eb
---
a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/IndexDesc.java
+++
b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/IndexDesc.java
@@@ -41,14 -37,12 +41,13 @@@ public class IndexDesc implements Proto
private boolean isAscending = false; // optional [default = false]
public IndexDesc() {
- this.builder = IndexDescProto.newBuilder();
}
- public IndexDesc(String idxName, String databaseName, String tableName,
Column column,
+ public IndexDesc(String name, Path indexPath, String databaseName, String
tableName, Column column,
IndexMethod type, boolean isUnique, boolean isClustered,
boolean isAscending) {
this();
- this.indexName = idxName;
+ this.name = name;
+ this.indexPath = indexPath;
this.databaseName = databaseName;
this.tableName = tableName;
this.column = column;
@@@ -162,4 -147,4 +159,4 @@@
Gson gson = new GsonBuilder().setPrettyPrinting().create();
return gson.toJson(this);
}
--}
++}
http://git-wip-us.apache.org/repos/asf/tajo/blob/afc2c3eb/tajo-core/src/main/java/org/apache/tajo/engine/planner/LogicalPlanPreprocessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/afc2c3eb/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/afc2c3eb/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/afc2c3eb/tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java
----------------------------------------------------------------------
