Return-Path: X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org Delivered-To: apmail-tajo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A56DA173DD for ; Thu, 15 Jan 2015 05:34:14 +0000 (UTC) Received: (qmail 22501 invoked by uid 500); 15 Jan 2015 05:34:16 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 22409 invoked by uid 500); 15 Jan 2015 05:34:16 -0000 Mailing-List: contact commits-help@tajo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.apache.org Delivered-To: mailing list commits@tajo.apache.org Received: (qmail 22392 invoked by uid 99); 15 Jan 2015 05:34:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jan 2015 05:34:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2C6DEA43885; Thu, 15 Jan 2015 05:34:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jihoonson@apache.org To: commits@tajo.apache.org Date: Thu, 15 Jan 2015 05:34:17 -0000 Message-Id: <660b3d22c2de4e20a7e6274eb2bfbc6c@git.apache.org> In-Reply-To: <9b8b432b76c5406a86f59a3e2b550d94@git.apache.org> References: <9b8b432b76c5406a86f59a3e2b550d94@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] tajo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support 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 Authored: Thu Jan 15 14:34:04 2015 +0900 Committer: Jihoon Son 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 ----------------------------------------------------------------------