Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AD5F718D72 for ; Wed, 15 Jul 2015 21:47:49 +0000 (UTC) Received: (qmail 42270 invoked by uid 500); 15 Jul 2015 21:47:49 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 42229 invoked by uid 500); 15 Jul 2015 21:47:49 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 42218 invoked by uid 99); 15 Jul 2015 21:47:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jul 2015 21:47:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 723EEE051A; Wed, 15 Jul 2015 21:47:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: omalley@apache.org To: commits@hive.apache.org Message-Id: <7ee7231673b34820a71a46efb901d424@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-11124. Move OrcRecordUpdater.getAcidEventFields to RecordReaderFactory. Date: Wed, 15 Jul 2015 21:47:49 +0000 (UTC) Repository: hive Updated Branches: refs/heads/master 423269581 -> 240097b78 HIVE-11124. Move OrcRecordUpdater.getAcidEventFields to RecordReaderFactory. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/240097b7 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/240097b7 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/240097b7 Branch: refs/heads/master Commit: 240097b78b70172e1cf9bc37876a566ddfb9e115 Parents: 4232695 Author: Owen O'Malley Authored: Thu Jun 25 22:02:47 2015 -0700 Committer: Owen O'Malley Committed: Wed Jul 15 14:41:42 2015 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java | 5 ----- .../org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/240097b7/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java index e4651b8..2220b8e 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java @@ -207,11 +207,6 @@ public class OrcRecordUpdater implements RecordUpdater { return new OrcStruct.OrcStructInspector(fields); } - public static List getAcidEventFields() { - return Lists.newArrayList("operation", "originalTransaction", "bucket", "rowId", - "currentTransaction", "row"); - } - OrcRecordUpdater(Path path, AcidOutputFormat.Options options) throws IOException { this.options = options; http://git-wip-us.apache.org/repos/asf/hive/blob/240097b7/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java index 8740ee6..23a9af4 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java @@ -72,9 +72,14 @@ public class RecordReaderFactory { } } + static List getAcidEventFields() { + return Lists.newArrayList("operation", "originalTransaction", "bucket", + "rowId", "currentTransaction", "row"); + } + private static boolean checkAcidSchema(List fileSchema) { if (fileSchema.get(0).getKind().equals(OrcProto.Type.Kind.STRUCT)) { - List acidFields = OrcRecordUpdater.getAcidEventFields(); + List acidFields = getAcidEventFields(); List rootFields = fileSchema.get(0).getFieldNamesList(); if (acidFields.equals(rootFields)) { return true;