Merge branch 'master' of https://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/5866c36d Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/5866c36d Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/5866c36d Branch: refs/heads/index_support Commit: 5866c36defa67ab193251cfb8c537a91ffed289c Parents: a69f7b0 1bf71f6 Author: Jihoon Son <[email protected]> Authored: Thu Jan 15 14:34:04 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Thu Jan 15 14:34:04 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../java/org/apache/tajo/catalog/CatalogUtil.java | 12 +----------- .../apache/tajo/catalog/store/AbstractDBStore.java | 6 ++++-- .../org/apache/tajo/catalog/store/MemStore.java | 2 +- .../tajo/cli/tsql/commands/DescTableCommand.java | 2 +- .../apache/tajo/engine/query/TestCTASQuery.java | 17 +++++++++++++++-- .../queries/TestCTASQuery/CtasWithTextFile.sql | 12 ++++++++++++ .../queries/TestCTASQuery/testCtasWithTextFile.sql | 1 + .../TestCTASQuery/testCtasWithTextFile.result | 5 +++++ .../org/apache/tajo/storage/StorageManager.java | 16 ++++++---------- .../src/main/resources/storage-default.xml | 10 +++++----- .../apache/tajo/storage/hbase/HBaseFragment.java | 3 ++- .../main/java/org/apache/tajo/storage/CSVFile.java | 2 +- .../apache/tajo/storage/fragment/FileFragment.java | 3 ++- .../tajo/storage/text/DelimitedTextFile.java | 2 +- .../src/test/resources/storage-default.xml | 10 +++++----- 16 files changed, 64 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/5866c36d/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/5866c36d/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/5866c36d/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/5866c36d/tajo-client/src/main/java/org/apache/tajo/cli/tsql/commands/DescTableCommand.java ----------------------------------------------------------------------
