Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A0189200B29 for ; Fri, 1 Jul 2016 00:00:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9EE73160A75; Thu, 30 Jun 2016 22:00:16 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EBC38160A63 for ; Fri, 1 Jul 2016 00:00:15 +0200 (CEST) Received: (qmail 30517 invoked by uid 500); 30 Jun 2016 22:00:15 -0000 Mailing-List: contact commits-help@orc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@orc.apache.org Delivered-To: mailing list commits@orc.apache.org Received: (qmail 30402 invoked by uid 99); 30 Jun 2016 22:00:15 -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; Thu, 30 Jun 2016 22:00:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DDF20DFF03; Thu, 30 Jun 2016 22:00:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: omalley@apache.org To: commits@orc.apache.org Date: Thu, 30 Jun 2016 22:00:14 -0000 Message-Id: <622166f17acb4e71b380632a69bcea87@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/7] orc git commit: HIVE-14012. Some ColumnVector subclasses are missing ensureSize. archived-at: Thu, 30 Jun 2016 22:00:16 -0000 Repository: orc Updated Branches: refs/heads/master d9d529bcf -> 98c0992ed HIVE-14012. Some ColumnVector subclasses are missing ensureSize. Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/e8c0eb54 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/e8c0eb54 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/e8c0eb54 Branch: refs/heads/master Commit: e8c0eb541c31de500ca0428815347f4595c8e4c1 Parents: 17e14f6 Author: Owen O'Malley Authored: Thu Jun 30 10:23:26 2016 -0700 Committer: Owen O'Malley Committed: Thu Jun 30 14:33:57 2016 -0700 ---------------------------------------------------------------------- .../exec/vector/IntervalDayTimeColumnVector.java | 19 +++++++++++++++++++ .../ql/exec/vector/TimestampColumnVector.java | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/e8c0eb54/java/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/IntervalDayTimeColumnVector.java ---------------------------------------------------------------------- diff --git a/java/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/IntervalDayTimeColumnVector.java b/java/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/IntervalDayTimeColumnVector.java index 39ccea8..c4a6c0f 100644 --- a/java/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/IntervalDayTimeColumnVector.java +++ b/java/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/IntervalDayTimeColumnVector.java @@ -345,4 +345,23 @@ public class IntervalDayTimeColumnVector extends ColumnVector { buffer.append("null"); } } + + @Override + public void ensureSize(int size, boolean preserveData) { + super.ensureSize(size, preserveData); + if (size <= totalSeconds.length) return; + long[] oldTime = totalSeconds; + int[] oldNanos = nanos; + totalSeconds = new long[size]; + nanos = new int[size]; + if (preserveData) { + if (isRepeating) { + totalSeconds[0] = oldTime[0]; + nanos[0] = oldNanos[0]; + } else { + System.arraycopy(oldTime, 0, totalSeconds, 0, oldTime.length); + System.arraycopy(oldNanos, 0, nanos, 0, oldNanos.length); + } + } + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/orc/blob/e8c0eb54/java/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/TimestampColumnVector.java ---------------------------------------------------------------------- diff --git a/java/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/TimestampColumnVector.java b/java/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/TimestampColumnVector.java index 228461a..0948d2d 100644 --- a/java/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/TimestampColumnVector.java +++ b/java/storage-api/src/java/org/apache/hadoop/hive/ql/exec/vector/TimestampColumnVector.java @@ -397,4 +397,23 @@ public class TimestampColumnVector extends ColumnVector { buffer.append("null"); } } + + @Override + public void ensureSize(int size, boolean preserveData) { + super.ensureSize(size, preserveData); + if (size <= time.length) return; + long[] oldTime = time; + int[] oldNanos = nanos; + time = new long[size]; + nanos = new int[size]; + if (preserveData) { + if (isRepeating) { + time[0] = oldTime[0]; + nanos[0] = oldNanos[0]; + } else { + System.arraycopy(oldTime, 0, time, 0, oldTime.length); + System.arraycopy(oldNanos, 0, nanos, 0, oldNanos.length); + } + } + } }