Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/tajo into index_support
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/62bd3a34 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/62bd3a34 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/62bd3a34 Branch: refs/heads/index_support Commit: 62bd3a3401476ca88c45b67b8dd07d3f76b3cc8d Parents: 0dc55a8 3e305b1 Author: Jihoon Son <[email protected]> Authored: Mon Nov 10 17:18:51 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Mon Nov 10 17:18:51 2014 +0900 ---------------------------------------------------------------------- CHANGES | 8 + .../org/apache/tajo/catalog/CatalogUtil.java | 12 +- .../src/main/proto/CatalogProtos.proto | 1 + .../tajo/catalog/store/HCatalogStore.java | 16 +- .../apache/tajo/catalog/store/HCatalogUtil.java | 2 +- .../tajo/catalog/store/TestHCatalogStore.java | 18 +- .../main/java/org/apache/tajo/SessionVars.java | 7 +- .../java/org/apache/tajo/conf/TajoConf.java | 2 +- .../org/apache/tajo/storage/EmptyTuple.java | 176 +++++++ .../apache/tajo/storage/StorageConstants.java | 9 + .../java/org/apache/tajo/benchmark/TPCH.java | 2 +- .../apache/tajo/engine/parser/SQLAnalyzer.java | 8 +- .../engine/planner/PhysicalPlannerImpl.java | 2 +- .../planner/physical/PhysicalPlanUtil.java | 41 +- .../apache/tajo/master/querymaster/Query.java | 2 +- .../test/java/org/apache/tajo/TpchTestBase.java | 2 +- .../apache/tajo/cli/tools/TestDDLBuilder.java | 2 +- .../org/apache/tajo/client/TestTajoClient.java | 2 +- .../planner/physical/TestBSTIndexExec.java | 3 - .../apache/tajo/engine/query/TestCTASQuery.java | 2 +- .../tajo/engine/query/TestGroupByQuery.java | 17 +- .../tajo/engine/query/TestJoinBroadcast.java | 4 +- .../apache/tajo/engine/query/TestJoinQuery.java | 16 +- .../tajo/engine/query/TestNullValues.java | 14 +- .../tajo/engine/query/TestSelectQuery.java | 4 +- .../apache/tajo/engine/query/TestSortQuery.java | 12 +- .../tajo/engine/query/TestTablePartitions.java | 4 +- .../org/apache/tajo/jdbc/TestResultSet.java | 2 +- .../results/TestTajoCli/testDescTable.result | 4 +- .../results/TestTajoDump/testDump1.result | 2 +- .../testBuildDDLForBaseTable.result | 2 +- .../testBuildDDLForExternalTable.result | 2 +- .../testBuildDDLQuotedTableName1.result | 2 +- .../testBuildDDLQuotedTableName2.result | 2 +- .../main/sphinx/getting_started/first_query.rst | 2 +- .../sphinx/getting_started/prerequisites.rst | 6 +- tajo-docs/src/main/sphinx/sql_language/ddl.rst | 2 +- .../src/main/sphinx/table_management/csv.rst | 10 +- tajo-docs/src/main/sphinx/tsql/variables.rst | 2 +- tajo-project/pom.xml | 5 + tajo-storage/pom.xml | 4 + .../storage/BinarySerializerDeserializer.java | 1 + .../org/apache/tajo/storage/BufferPool.java | 74 +++ .../tajo/storage/ByteBufInputChannel.java | 76 +++ .../java/org/apache/tajo/storage/CSVFile.java | 23 +- .../storage/FieldSerializerDeserializer.java | 35 ++ .../tajo/storage/SerializerDeserializer.java | 2 +- .../storage/TextSerializerDeserializer.java | 1 + .../tajo/storage/text/ByteBufLineReader.java | 154 ++++++ .../tajo/storage/text/DelimitedLineReader.java | 157 ++++++ .../tajo/storage/text/DelimitedTextFile.java | 483 +++++++++++++++++++ .../tajo/storage/text/FieldSplitProcessor.java | 38 ++ .../tajo/storage/text/LineSplitProcessor.java | 45 ++ .../text/TextFieldSerializerDeserializer.java | 227 +++++++++ .../src/main/resources/storage-default.xml | 59 +-- .../tajo/storage/TestCompressionStorages.java | 76 +-- .../org/apache/tajo/storage/TestLineReader.java | 163 +++++++ .../apache/tajo/storage/TestSplitProcessor.java | 72 +++ .../org/apache/tajo/storage/TestStorages.java | 4 +- .../src/test/resources/storage-default.xml | 18 +- 60 files changed, 1903 insertions(+), 240 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/62bd3a34/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/62bd3a34/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/62bd3a34/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java ----------------------------------------------------------------------
