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 CE0C01802A for ; Tue, 7 Jul 2015 20:51:43 +0000 (UTC) Received: (qmail 38992 invoked by uid 500); 7 Jul 2015 20:51:43 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 38946 invoked by uid 500); 7 Jul 2015 20:51:43 -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 38935 invoked by uid 99); 7 Jul 2015 20:51:43 -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; Tue, 07 Jul 2015 20:51:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 83BADE2F3C; Tue, 7 Jul 2015 20:51:43 +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: X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-11115. Remvoe dependence from WriterImpl to OrcInputFormat. Date: Tue, 7 Jul 2015 20:51:43 +0000 (UTC) Repository: hive Updated Branches: refs/heads/master ac9adfdd3 -> f79059159 HIVE-11115. Remvoe dependence from WriterImpl to OrcInputFormat. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f7905915 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f7905915 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f7905915 Branch: refs/heads/master Commit: f790591590478701699b34c46ce83c23bd065361 Parents: ac9adfd Author: Owen O'Malley Authored: Thu Jun 25 12:44:08 2015 -0700 Committer: Owen O'Malley Committed: Tue Jul 7 13:47:32 2015 -0700 ---------------------------------------------------------------------- ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/f7905915/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java index 61a90dd..ee6110e 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java @@ -76,6 +76,8 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.TimestampObjectIn import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.VarcharTypeInfo; +import org.apache.hadoop.hive.shims.HadoopShims; +import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.Text; @@ -107,6 +109,7 @@ import com.google.protobuf.CodedOutputStream; public class WriterImpl implements Writer, MemoryManager.Callback { private static final Log LOG = LogFactory.getLog(WriterImpl.class); + static final HadoopShims SHIMS = ShimLoader.getHadoopShims(); private static final int HDFS_BUFFER_SIZE = 256 * 1024; private static final int MIN_ROW_INDEX_STRIDE = 1000; @@ -2477,7 +2480,7 @@ public class WriterImpl implements Writer, MemoryManager.Callback { int footLength = writeFooter(rawWriter.getPos() - metaLength); rawWriter.writeByte(writePostScript(footLength, metaLength)); stripesAtLastFlush = stripes.size(); - OrcInputFormat.SHIMS.hflush(rawWriter); + SHIMS.hflush(rawWriter); } return rawWriter.getPos(); }