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/ccd18603 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/ccd18603 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/ccd18603 Branch: refs/heads/TAJO-1730 Commit: ccd1860389724daeb06c30c2aaac7ce51cf02557 Parents: 825e25f 0b59a93 Author: Hyunsik Choi <[email protected]> Authored: Fri Aug 21 09:35:49 2015 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Fri Aug 21 09:35:49 2015 +0900 ---------------------------------------------------------------------- CHANGES | 23 + .../apache/tajo/algebra/ColumnDefinition.java | 9 +- .../org/apache/tajo/algebra/DataTypeExpr.java | 81 ++- .../tajo/catalog/store/HiveCatalogStore.java | 22 +- .../tajo/catalog/store/HiveCatalogUtil.java | 19 +- .../apache/tajo/client/DummyServiceTracker.java | 11 +- .../org/apache/tajo/client/ResultSetUtil.java | 83 ++- .../tajo/client/v2/LegacyClientDelegate.java | 20 +- .../org/apache/tajo/jdbc/MetaDataTuple.java | 200 ++++++ .../apache/tajo/jdbc/TajoMetaDataResultSet.java | 74 +++ .../org/apache/tajo/storage/RowStoreUtil.java | 15 +- tajo-cluster-tests/pom.xml | 7 +- .../java/org/apache/tajo/QueryTestCaseBase.java | 23 +- .../test/java/org/apache/tajo/TpchTestBase.java | 23 +- .../src/test/resources/tpch/customer.tbl | 5 + .../src/test/resources/tpch/empty_orders.tbl | 0 .../src/test/resources/tpch/lineitem.tbl | 5 + .../src/test/resources/tpch/nation.tbl | 25 + .../src/test/resources/tpch/orders.tbl | 3 + .../src/test/resources/tpch/part.tbl | 4 + .../src/test/resources/tpch/partsupp.tbl | 3 + .../src/test/resources/tpch/region.tbl | 5 + .../src/test/resources/tpch/supplier.tbl | 3 + .../org/apache/tajo/datum/TimestampDatum.java | 7 + .../apache/tajo/exception/ExceptionUtil.java | 9 +- .../exception/InvalidDataTypeException.java | 3 +- .../tajo/exception/NotImplementedException.java | 2 +- .../apache/tajo/exception/SQLSyntaxError.java | 2 +- .../tajo/exception/TajoRuntimeException.java | 20 +- .../exception/UnsupportedDataTypeException.java | 2 +- .../tajo/exception/UnsupportedException.java | 10 +- .../java/org/apache/tajo/storage/VTuple.java | 5 +- .../java/org/apache/tajo/util/FileUtil.java | 18 +- tajo-common/src/main/proto/DataTypes.proto | 1 + tajo-core-tests/pom.xml | 4 + .../tajo/cli/tsql/TestTajoCliNegatives.java | 9 - .../org/apache/tajo/client/TestTajoClient.java | 1 - .../apache/tajo/client/v2/TestTajoClientV2.java | 3 + .../apache/tajo/engine/eval/ExprTestBase.java | 1 - .../tajo/engine/eval/TestEvalTreeUtil.java | 6 +- .../tajo/engine/parser/TestSQLAnalyzer.java | 18 + .../engine/query/TestCommonConditionReduce.java | 110 ++++ .../tajo/engine/query/TestCreateTable.java | 5 + .../tajo/engine/query/TestInSubquery.java | 10 +- .../apache/tajo/engine/query/TestJoinQuery.java | 1 - .../tajo/engine/query/TestSelectQuery.java | 46 +- .../org/apache/tajo/jdbc/TestResultSet.java | 224 ------- .../java/org/apache/tajo/jdbc/TestSQLState.java | 91 --- .../tajo/jdbc/TestTajoDatabaseMetaData.java | 504 --------------- .../java/org/apache/tajo/jdbc/TestTajoJdbc.java | 608 ------------------- .../apache/tajo/querymaster/TestKillQuery.java | 6 +- .../dataset/TestTajoJdbc/table1/table1.tbl | 5 - .../TestCreateTable/negative/map_type.sql | 3 + .../TestSQLAnalyzer/create_table_maptype_1.sql | 1 + .../TestSQLAnalyzer/create_table_maptype_2.sql | 1 + .../TestSQLAnalyzer/create_table_maptype_3.sql | 1 + .../datetime_table_timezoned_ddl2.sql | 4 + .../TestSelectQuery/nagative/operations.sql | 1 - .../queries/TestSelectQuery/nagative/tables.sql | 1 - .../TestSelectQuery/negative/operations.sql | 1 + .../queries/TestSelectQuery/negative/tables.sql | 1 + .../testLoadIntoTimezonedTable.sql | 2 + .../TestTajoJdbc/create_table_with_date_ddl.sql | 10 - .../TestCommonConditionReduce/test11.plan | 7 + .../TestCommonConditionReduce/test11.result | 27 + .../TestCommonConditionReduce/test21.plan | 7 + .../TestCommonConditionReduce/test21.result | 27 + .../TestCommonConditionReduce/test31.plan | 7 + .../TestCommonConditionReduce/test31.result | 7 + .../TestCommonConditionReduce/test41.plan | 7 + .../TestCommonConditionReduce/test41.result | 3 + .../TestCommonConditionReduce/test51.plan | 7 + .../TestCommonConditionReduce/test51.result | 3 + .../TestCommonConditionReduce/test61.plan | 7 + .../TestCommonConditionReduce/test61.result | 4 + .../TestCommonConditionReduce/test71.plan | 7 + .../TestCommonConditionReduce/test71.result | 3 + .../TestCommonConditionReduce/test81.plan | 7 + .../TestCommonConditionReduce/test81.result | 6 + .../create_table_maptype_1.result | 38 ++ .../create_table_maptype_2.result | 52 ++ .../create_table_maptype_3.result | 66 ++ .../create_table_nested_1.result | 26 +- .../create_table_nested_2.result | 60 +- .../testSelectWithCommonQuals1.1.plan | 7 - .../testSelectWithCommonQuals1.1.result | 27 - .../testSelectWithCommonQuals2.1.plan | 7 - .../testSelectWithCommonQuals2.1.result | 27 - .../testSelectWithCommonQuals3.1.plan | 7 - .../testSelectWithCommonQuals3.1.result | 7 - .../results/TestTPCH/testQ2FourJoins.plan | 4 +- .../resources/results/TestTPCH/testTPCHQ5.plan | 8 +- .../TestTajoDatabaseMetaData/getSchemas1.result | 3 - .../TestTajoDatabaseMetaData/getSchemas2.result | 3 - .../getTableTypes.result | 3 - .../TestTajoDatabaseMetaData/getTables1.result | 4 - .../TestTajoDatabaseMetaData/getTables2.result | 4 - .../TestTajoJdbc/testSortWithDateTime.result | 7 - .../src/test/resources/tpch/customer.tbl | 5 - .../src/test/resources/tpch/empty_orders.tbl | 0 .../src/test/resources/tpch/lineitem.tbl | 5 - .../src/test/resources/tpch/nation.tbl | 25 - .../src/test/resources/tpch/orders.tbl | 3 - .../src/test/resources/tpch/part.tbl | 4 - .../src/test/resources/tpch/partsupp.tbl | 3 - .../src/test/resources/tpch/region.tbl | 5 - .../src/test/resources/tpch/supplier.tbl | 3 - tajo-core/pom.xml | 12 +- .../org/apache/tajo/engine/parser/SQLLexer.g4 | 1 + .../org/apache/tajo/engine/parser/SQLParser.g4 | 6 + .../java/org/apache/tajo/benchmark/TPCH.java | 8 - .../engine/codegen/TajoGeneratorAdapter.java | 3 +- .../tajo/engine/function/FunctionLoader.java | 11 +- .../apache/tajo/engine/parser/SQLAnalyzer.java | 23 +- .../engine/planner/global/GlobalPlanner.java | 2 +- .../global/builder/DistinctGroupbyBuilder.java | 1 - .../global/rewriter/GlobalPlanRewriteRule.java | 1 - .../rewriter/rules/BroadcastJoinRule.java | 63 +- .../rewriter/rules/GlobalPlanRewriteUtil.java | 40 +- .../planner/physical/ComparableVector.java | 6 +- .../planner/physical/SortIntersectExec.java | 5 +- .../tajo/engine/planner/physical/UnionExec.java | 5 +- .../planner/physical/VectorizedSorter.java | 3 +- .../org/apache/tajo/master/GlobalEngine.java | 32 +- .../apache/tajo/master/exec/DDLExecutor.java | 6 +- .../exec/ExplainPlanPreprocessorForTest.java | 1 - .../NonForwardQueryResultSystemScanner.java | 4 +- .../apache/tajo/master/exec/QueryExecutor.java | 17 +- .../apache/tajo/querymaster/Repartitioner.java | 7 +- .../tajo/session/InvalidSessionException.java | 3 +- tajo-jdbc/pom.xml | 78 +++ .../org/apache/tajo/jdbc/MetaDataTuple.java | 200 ------ .../apache/tajo/jdbc/TajoDatabaseMetaData.java | 1 - .../apache/tajo/jdbc/TajoMetaDataResultSet.java | 74 --- .../org/apache/tajo/jdbc/TestResultSet.java | 224 +++++++ .../java/org/apache/tajo/jdbc/TestSQLState.java | 91 +++ .../tajo/jdbc/TestTajoDatabaseMetaData.java | 504 +++++++++++++++ .../java/org/apache/tajo/jdbc/TestTajoJdbc.java | 607 ++++++++++++++++++ .../tajo/jdbc/util/TestResultSetUtil.java | 179 ++++++ .../dataset/TestTajoJdbc/table1/table1.tbl | 5 + .../TestTajoJdbc/create_table_with_date_ddl.sql | 10 + .../TestTajoDatabaseMetaData/getSchemas1.result | 3 + .../TestTajoDatabaseMetaData/getSchemas2.result | 3 + .../getTableTypes.result | 3 + .../TestTajoDatabaseMetaData/getTables1.result | 4 + .../TestTajoDatabaseMetaData/getTables2.result | 4 + .../TestTajoJdbc/testSortWithDateTime.result | 7 + .../tajo/plan/IllegalQueryStatusException.java | 38 -- .../apache/tajo/plan/InvalidQueryException.java | 35 -- .../org/apache/tajo/plan/PlanningException.java | 30 - .../apache/tajo/plan/expr/AlgebraicUtil.java | 21 +- .../tajo/plan/expr/BasicEvalNodeVisitor.java | 3 +- .../org/apache/tajo/plan/expr/BinaryEval.java | 8 +- .../org/apache/tajo/plan/expr/SubqueryEval.java | 7 +- .../tajo/plan/function/AggFunctionInvoke.java | 3 +- .../tajo/plan/function/FunctionInvoke.java | 3 +- .../function/python/PythonScriptEngine.java | 147 +++-- .../plan/function/stream/CSVLineSerializer.java | 3 +- .../stream/TextFieldSerializerDeserializer.java | 3 +- .../GreedyHeuristicJoinOrderAlgorithm.java | 3 - .../tajo/plan/joinorder/JoinOrderAlgorithm.java | 6 - .../tajo/plan/logical/SetSessionNode.java | 5 +- .../tajo/plan/nameresolver/NameResolver.java | 6 +- .../rules/CommonConditionReduceRule.java | 88 +-- .../plan/rewrite/rules/FilterPushDownRule.java | 3 +- .../plan/serder/LogicalNodeDeserializer.java | 7 +- .../tajo/plan/serder/LogicalNodeSerializer.java | 4 +- .../org/apache/tajo/plan/util/PlannerUtil.java | 6 +- .../tajo/plan/verifier/LogicalPlanVerifier.java | 2 +- .../plan/verifier/PreLogicalPlanVerifier.java | 15 + .../tajo/plan/verifier/VerifyException.java | 27 - .../apache/tajo/storage/AbstractScanner.java | 23 +- .../org/apache/tajo/storage/FrameTuple.java | 17 +- .../java/org/apache/tajo/storage/LazyTuple.java | 3 +- .../org/apache/tajo/storage/MergeScanner.java | 3 +- .../org/apache/tajo/storage/NullScanner.java | 3 +- .../org/apache/tajo/storage/RowStoreUtil.java | 17 +- .../org/apache/tajo/storage/Tablespace.java | 3 +- .../apache/tajo/tuple/offheap/HeapTuple.java | 9 +- .../apache/tajo/tuple/offheap/UnSafeTuple.java | 9 +- .../apache/tajo/storage/hbase/HBaseScanner.java | 2 +- .../java/org/apache/tajo/storage/RawFile.java | 3 +- .../java/org/apache/tajo/storage/RowFile.java | 3 +- .../apache/tajo/storage/avro/AvroScanner.java | 3 +- .../tajo/storage/json/JsonLineDeserializer.java | 4 +- .../tajo/storage/json/JsonLineSerializer.java | 4 +- .../org/apache/tajo/storage/orc/ORCScanner.java | 6 +- .../tajo/storage/parquet/ParquetScanner.java | 3 +- .../org/apache/tajo/storage/rcfile/RCFile.java | 3 +- .../sequencefile/SequenceFileScanner.java | 3 +- .../tajo/storage/text/DelimitedLineReader.java | 6 +- .../tajo/storage/text/DelimitedTextFile.java | 3 +- .../text/TextFieldSerializerDeserializer.java | 4 +- 193 files changed, 3263 insertions(+), 2570 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/ccd18603/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Tablespace.java ----------------------------------------------------------------------
